took out some debugging code

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index 29cf853fe44119094c692401af5ee215917cfb48..87db53b5a08533421709243031128c7bdb5e6e13 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -17,19 +17,16 @@
 
    // Setting the language to use for gettext if it is not English
    // (the default language) or empty.
-   if (!isset($squirrelmail_language))
-      $squirrelmail_language = getPref ($data_dir, $username, "language");
-
+   $squirrelmail_language = getPref ($data_dir, $username, "language");
    if ($squirrelmail_language != "en" && $squirrelmail_language != "") {
-      putenv("LANG=$use_language");
+      putenv("LANG=$squirrelmail_language");
       bindtextdomain("squirrelmail", "../locale/");
       textdomain("squirrelmail");
 
       // Setting cookie to use on the login screen the next time the
       // same user logs in.
-      if (!isset($HTTP_COOKIE_VARS["squirrelmail_language"]))
-         setcookie("squirrelmail_language", $squirrelmail_language, 
-                   time()+2592000);
+      setcookie("squirrelmail_language", $squirrelmail_language, 
+                time()+2592000);
    }
 
    function displayPageHeader($color, $mailbox) {
@@ -38,19 +35,19 @@
       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 "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"signout.php\" TARGET=_top><B>" . _("Sign Out") . "</B></A></FONT>";
+      echo "         <A HREF=\"signout.php\" TARGET=_top><B>" . _("Sign Out") . "</B></A>";
       echo "      </TD><TD ALIGN=right WIDTH=70%>";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><div align=right>" . _("Current Folder: ") . "<B>$shortBoxName&nbsp;</div></B></FONT>";
+      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 "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"compose.php\">" . _("Compose") . "</A></FONT>&nbsp&nbsp";
-      echo "         <FONT FACE=\"Arial,Helvetica\">". _("Addresses") ."</FONT>&nbsp&nbsp";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"folders.php\">" . _("Folders") . "</A></FONT>&nbsp&nbsp";
-      echo "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"options.php\">" . _("Options") . "</A></FONT>&nbsp&nbsp";
+      echo "         <A HREF=\"compose.php\">" . _("Compose") . "</A>&nbsp&nbsp";
+      echo "         ". _("Addresses") ."&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 "         <FONT FACE=\"Arial,Helvetica\"><A HREF=\"http://squirrelmail.sourceforge.net\" TARGET=_top>SquirrelMail</A></FONT>";
+      echo "         <A HREF=\"http://squirrelmail.sourceforge.net\" TARGET=_top>SquirrelMail</A>";
       echo "      </TD>";
       echo "</TABLE>";
   }