added some fixed mentioned on the mailing list

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index 30c5448879745370866c1beff277695adecb7106..57ba30bc64d6ce3be4577df2a39c335ff4d494af 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  page_header.php
     **
@@ -21,7 +21,7 @@
       // (the default language) or empty.
       $squirrelmail_language = getPref ($data_dir, $username, "language");
       if ($squirrelmail_language != "en" && $squirrelmail_language != "") {
-         putenv("LANG=$squirrelmail_language");
+         putenv("LC_ALL=$squirrelmail_language");
          bindtextdomain("squirrelmail", "../locale/");
          textdomain("squirrelmail");
          $default_charset = $languages[$squirrelmail_language]["CHARSET"];
@@ -43,25 +43,24 @@
       header ("Content-Type: text/html; charset=$default_charset");
 
    function displayPageHeader($color, $mailbox) {
-      global $PHPSESSID;
-
       /** Here is the header and wrapping table **/
       $shortBoxName = readShortMailboxName($mailbox, ".");
       $shortBoxName = stripslashes($shortBoxName);
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 COLS=2 WIDTH=100% CELLSPACING=0 CELLPADDING=2>";
       echo "   <TR BGCOLOR=\"$color[9]\" WIDTH=100%>";
       echo "      <TD ALIGN=left WIDTH=30%>";
-      echo "         <A HREF=\"signout.php?PHPSESSID=$PHPSESSID\" TARGET=_top><B>" . _("Sign Out") . "</B></A>";
+      echo "         <A HREF=\"signout.php\" TARGET=_top><B>" . _("Sign Out") . "</B></A>";
       echo "      </TD><TD ALIGN=right WIDTH=70%>";
       echo "         <div align=right>" . _("Current Folder: ") . "<B>$shortBoxName&nbsp;</div></B>";
       echo "      </TD>";
       echo "   </TR></TABLE>\n";
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 COLS=2 WIDTH=100% CELLSPACING=0 CELLPADDING=2><TR>";
       echo "      <TD ALIGN=left WIDTH=70%>";
-      echo "         <A HREF=\"compose.php?PHPSESSID=$PHPSESSID\">" . _("Compose") . "</A>&nbsp&nbsp";
-      echo "         <A HREF=\"addressbook.php?PHPSESSID=$PHPSESSID\">" . _("Addresses") . "</A>&nbsp&nbsp";
-      echo "         <A HREF=\"folders.php?PHPSESSID=$PHPSESSID\">" . _("Folders") . "</A>&nbsp&nbsp";
-      echo "         <A HREF=\"options.php?PHPSESSID=$PHPSESSID\">" . _("Options") . "</A>&nbsp&nbsp";
+      $urlMailbox = $mailbox;
+      echo "         <A HREF=\"compose.php?mailbox=$urlMailbox\">" . _("Compose") . "</A>&nbsp&nbsp";
+      echo "         <A HREF=\"addressbook.php\">" . _("Addresses") . "</A>&nbsp&nbsp";
+      echo "         <A HREF=\"folders.php\">" . _("Folders") . "</A>&nbsp&nbsp";
+      echo "         <A HREF=\"options.php\">" . _("Options") . "</A>&nbsp&nbsp";
       echo "      </TD><TD ALIGN=right WIDTH=30%>";
       echo "         <A HREF=\"http://squirrelmail.sourceforge.net/index.php3?from=1\" TARGET=_top>SquirrelMail</A>";
       echo "      </TD>";