- fixed bug with word wrapping deleting last word

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index 57282df07dabeae9fe088965f8031728bbe7382f..ee5c66524ef17fe94074723d093ab4d913c03d41 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -62,7 +62,7 @@
 
       if ($target != "")
          $target = " target=\"$target\"";
 
       if ($target != "")
          $target = " target=\"$target\"";

-
+      

       echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
    }
 
       echo '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
    }
 


@@ -76,19 +76,20 @@
       /** Here is the header and wrapping table **/
       $shortBoxName = readShortMailboxName($mailbox, ".");
       $shortBoxName = stripslashes($shortBoxName);
       /** Here is the header and wrapping table **/
       $shortBoxName = readShortMailboxName($mailbox, ".");
       $shortBoxName = stripslashes($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 "<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";
       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");
       displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right");
       echo "&nbsp;&nbsp;\n";
       displayInternalLink ("src/addressbook.php", _("Addresses"), "right");


@@ -97,7 +98,9 @@
       echo "&nbsp;&nbsp;\n";
       displayInternalLink ("src/options.php", _("Options"), "right");
       echo "&nbsp;&nbsp;\n";
       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 "&nbsp;&nbsp;\n";
 
       do_hook("menuline");