X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=8b1d1d9e531e024177c650f9476a821a57bbcf8c;hp=1af6a86f32de62f0b4baad6b7e156204d13ce1d6;hb=76e6ff644da9490671c2142a042165730ea6c0ea;hpb=7b086a8035ee92e3afe42857f6877522c13f2c76

diff --git a/functions/page_header.php b/functions/page_header.php
index 1af6a86f..8b1d1d9e 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -53,10 +53,19 @@
       
       do_hook ("generic_header");
 
-      echo "<TITLE>$title</TITLE>";
+      echo "<TITLE>$title</TITLE>\n";
       echo "</HEAD>\n\n";
    }
 
+   function displayInternalLink ($path, $text, $target="") {
+      global $base_uri;
+
+      if ($target != "")
+         $target = " target=\"$target\"";
+      
+      echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
+   }
+
    function displayPageHeader($color, $mailbox) {
       displayHtmlHeader ($color);
 
@@ -66,30 +75,38 @@
 
       /** 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%\">\n";
-      echo "         <A HREF=\"signout.php\" TARGET=\"_top\"><B>" . _("Sign Out") . "</B></A>\n";
-      echo "      </TD><TD ALIGN=right WIDTH=\"70%\">\n";
-      echo "         <div align=right>" . _("Current Folder: ") . "<B>$shortBoxName&nbsp;</B></div>\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 "      </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 "         <A HREF=\"compose.php?mailbox=$urlMailbox\">" . _("Compose") . "</A>&nbsp;&nbsp;\n";
-      echo "         <A HREF=\"addressbook.php\">" . _("Addresses") . "</A>&nbsp;&nbsp;\n";
-      echo "         <A HREF=\"folders.php\">" . _("Folders") . "</A>&nbsp;&nbsp;\n";
-      echo "         <A HREF=\"options.php\">" . _("Options") . "</A>&nbsp;&nbsp;\n";
-      echo "         <A HREF=\"webmail.php?right_frame=help.php\" TARGET=\"Help Me!\">" . _("Help") . "</A>&nbsp&nbsp";
+      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");
+      echo "&nbsp;&nbsp;\n";
+      displayInternalLink ("src/folders.php", _("Folders"), "right");
+      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";
 
       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";