Added patch from Jan

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index 7b15f38f860de34b16c8f3089f61c2902f024945..8b1d1d9e531e024177c650f9476a821a57bbcf8c 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -53,7 +53,7 @@
       
       do_hook ("generic_header");
 
-      echo "<TITLE>$title</TITLE>";
+      echo "<TITLE>$title</TITLE>\n";
       echo "</HEAD>\n\n";
    }
 
@@ -75,20 +75,21 @@
 
       /** Here is the header and wrapping table **/
       $shortBoxName = readShortMailboxName($mailbox, ".");
-      $shortBoxName = stripslashes($shortBoxName);
+      $shortBoxName = sqStripSlashes($shortBoxName);
+      echo "<A NAME=pagetop></A>\n";
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
       echo "   <TR BGCOLOR=\"$color[9]\">\n";
       echo "      <TD ALIGN=left WIDTH=\"30%\"><b>\n";
       displayInternalLink ("src/signout.php", _("Sign Out"), "_top");
       echo "      </b></TD><TD ALIGN=right WIDTH=\"70%\">\n";
-      echo "         <div align=right>" . _("Current Folder: ") . "<B>$shortBoxName&nbsp;</B></div>\n";
+      echo "         <div align=right>" . _("Current Folder") . ": <B>$shortBoxName&nbsp;</B></div>\n";
       echo "      </TD>\n";
       echo "   </TR>\n";
       echo "</TABLE>\n\n";
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
       echo "   <TR>\n";
       echo "      <TD ALIGN=left WIDTH=\"99%\">\n";
-      $urlMailbox = $mailbox;
+      $urlMailbox = urlencode($mailbox);
       displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right");
       echo "&nbsp;&nbsp;\n";
       displayInternalLink ("src/addressbook.php", _("Addresses"), "right");
@@ -97,6 +98,8 @@
       echo "&nbsp;&nbsp;\n";
       displayInternalLink ("src/options.php", _("Options"), "right");
       echo "&nbsp;&nbsp;\n";
+      displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"), "right");
+      echo "&nbsp;&nbsp;\n";
       displayInternalLink ("src/help.php", _("Help"), "right");
       echo "&nbsp;&nbsp;\n";