projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: d30d79f)
Fixed a few bugs when setting language.
authorgustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 2 Mar 2000 10:29:34 +0000 (10:29 +0000)
committergustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 2 Mar 2000 10:29:34 +0000 (10:29 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@258 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/page_header.php patch | blob | blame | history
src/login.php patch | blob | blame | history
src/options_submit.php patch | blob | blame | history
src/signout.php patch | blob | blame | history
src/webmail.php patch | blob | blame | history

diff --git a/functions/page_header.php b/functions/page_header.php
index 29cf853fe44119094c692401af5ee215917cfb48..3ffe0c311f749ffa26d47314e4cbf029dcb4bc22 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) {
diff --git a/src/login.php b/src/login.php
index 7c185581f476aec24ff551ac29dbe428c2b02cdc..633a868898d4f5c0d8a46c9e7ad0d033d325a9d3 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -14,12 +14,21 @@
       include("../config/config.php");
    if (!isset($strings_php))
       include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
 
-?>
-<HTML>
-<?
+   // $squirrelmail_language is set by a cookie when the user selects
+   // language
+   if (isset($squirrelmail_language)) {
+      if ($squirrelmail_language != "en") {
+         putenv("LANG=".$squirrelmail_language);
+         bindtextdomain("squirrelmail", "../locale/");
+         textdomain("squirrelmail");
+      }
+   }
+
+   echo "<HTML>";
+   echo "<HEAD><TITLE>";
+   echo _("SquirrelMail Login");
+   echo "</TITLE></HEAD>\n";
    echo "<BODY TEXT=000000 BGCOLOR=FFFFFF LINK=0000CC VLINK=0000CC ALINK=0000CC>\n";
  
    // let's check to see if they compiled with gettext support
diff --git a/src/options_submit.php b/src/options_submit.php
index 81ce4aad29a8cf7220a7cafc9ac8ce5dd9bf16e8..af376da7f0392a81db2daedd31a81d8c522001f5 100644 (file)
--- a/src/options_submit.php
+++ b/src/options_submit.php
@@ -28,6 +28,8 @@
 
    setSig($data_dir, $username, stripslashes($signature_edit));
 
+   setcookie("squirrelmail_language", $language, time()+2592000);
+
    echo "<HTML>";
    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");
diff --git a/src/signout.php b/src/signout.php
index 94abb2427293184222b3f30a00990d7dfe32c476..ae78e121efd3d932845d9953b6ae415ac995dc56 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -9,6 +9,16 @@
        $username = "";
        $key = "";
        $logged_in = 0;
+
+        // $squirrelmail_language is set by a cookie when the user
+        // selects language
+        if (isset($squirrelmail_language)) {
+           if ($squirrelmail_language != "en") {
+              putenv("LANG=".$squirrelmail_language);
+              bindtextdomain("squirrelmail", "../locale/");
+              textdomain("squirrelmail");
+           }
+        }
        
        setcookie("username", "", time(), "/");
        setcookie("key", "", time(), "/");
diff --git a/src/webmail.php b/src/webmail.php
index e4faf4662407919ced41016d93c0fd0365f281d7..8070342c30c93bc15f221f6348d6789c03fcda36 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -14,6 +14,10 @@
    setcookie("username", $username, 0, "/");
    setcookie("key", $key, 0, "/");
    setcookie("logged_in", 1, 0, "/");
+   // Refresh the language cookie.
+   if (isset($squirrelmail_language))
+      setcookie("squirrelmail_language", $squirrelmail_language,
+                time()+2592000);
 ?>
 <HTML><HEAD>
 <?
Unnamed repository; edit this file 'description' to name the repository.