Changed timeout from 0 seconds (died for me constantly) to 15 seconds.

[squirrelmail.git] / functions / page_header.php
diff --git a/functions/page_header.php b/functions/page_header.php

index 8b1d1d9e531e024177c650f9476a821a57bbcf8c..3aeae3363c5f490d56f3852274fa689069bd36e5 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -18,21 +18,7 @@
        include ("../functions/plugin.php");
  
     // Check to see if gettext is installed
-   if (function_exists("_")) {
-      // Setting the language to use for gettext if it is not English
-      // (the default language) or empty.
-      $squirrelmail_language = getPref ($data_dir, $username, "language");
-      if ($squirrelmail_language != "en" && $squirrelmail_language != "") {
-         putenv("LC_ALL=$squirrelmail_language");
-         bindtextdomain("squirrelmail", "../locale/");
-         textdomain("squirrelmail");
-         $default_charset = $languages[$squirrelmail_language]["CHARSET"];
-      }
-   } else {
-      function _($string) {
-         return $string;
-      }
-   }
+   set_up_language(getPref($data_dir, $username, "language"));
  
     // This is done to ensure that the character set is correct.
     if ($default_charset != "")
@@ -67,7 +53,7 @@
     }
  
     function displayPageHeader($color, $mailbox) {
-      displayHtmlHeader ($color);
+      displayHtmlHeader ();
  
        printf('<BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
               $color[8], $color[4], $color[7], $color[7], $color[7]);
@@ -106,7 +92,7 @@
        do_hook("menuline");
  
        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 "         <A HREF=\"http://www.squirrelmail.org/\" TARGET=\"_top\">SquirrelMail</A>\n";
        echo "      </TD>\n";
        echo "   </TR>\n";
        echo "</TABLE>\n\n";