Added patch from Jan

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index c3a95f49e475fc746b2e1367c511b0ffeb011cb1..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";
    }
 
@@ -62,7 +62,7 @@
 
       if ($target != "")
          $target = " target=\"$target\"";
-
+      
       echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
    }
 
@@ -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=\"70%\">\n";
-      $urlMailbox = $mailbox;
+      echo "      <TD ALIGN=left WIDTH=\"99%\">\n";
+      $urlMailbox = urlencode($mailbox);
       displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right");
       echo "&nbsp;&nbsp;\n";
       displayInternalLink ("src/addressbook.php", _("Addresses"), "right");
@@ -97,13 +98,15 @@
       echo "&nbsp;&nbsp;\n";
       displayInternalLink ("src/options.php", _("Options"), "right");
       echo "&nbsp;&nbsp;\n";
-      displayInternalLink ("src/webmail.php?right_frame=help.php", _("Help"), "Help Me!");
+      displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"), "right");
+      echo "&nbsp;&nbsp;\n";
+      displayInternalLink ("src/help.php", _("Help"), "right");
       echo "&nbsp;&nbsp;\n";
 
       do_hook("menuline");
 
-      echo "      </TD><TD ALIGN=right WIDTH=\"30%\">\n";
-      echo "         <A HREF=\"http://squirrelmail.sourceforge.net/index.php3?from=1\" TARGET=\"_top\">SquirrelMail</A>\n";
+      echo "      </TD><TD ALIGN=right nowrap WIDTH=\"1%\">\n";
+      echo "         <A HREF=\"http://www.squirrelmail.org/index.php3?from=1\" TARGET=\"_top\">SquirrelMail</A>\n";
       echo "      </TD>\n";
       echo "   </TR>\n";
       echo "</TABLE>\n\n";