projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d10eeaf)
Fixed translations in signout.php. Moved setting of language cookie
authorgustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 20 Jun 2000 08:33:07 +0000 (08:33 +0000)
committergustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 20 Jun 2000 08:33:07 +0000 (08:33 +0000)
from page_header.php to signout.php.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@549 7612ce4b-ef26-0410-bec9-ea0150e637f0

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

diff --git a/functions/page_header.php b/functions/page_header.php
index 3145a306efdf6ee7dae63f37d03dfa4eb618c49b..663c369fd3fc4f16a2a71e8c156ba2624891c143 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -25,12 +25,6 @@
          bindtextdomain("squirrelmail", "../locale/");
          textdomain("squirrelmail");
          $default_charset = $languages[$squirrelmail_language]["CHARSET"];
-         
-         // Setting cookie to use on the login screen the next time the
-         // same user logs in.
-         #setcookie("squirrelmail_language", $squirrelmail_language, 
-         #          time()+2592000);
-         $squirrelmail_language = $language;
       }
    } else {
       function _($string) {
diff --git a/src/signout.php b/src/signout.php
index d3b542d8bde3f788c70953d536448b8d554c32a7..2219f6af87ecc1549713bfee6af3fb316c662c08 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -8,28 +8,39 @@
         **
         **/
 
-       // Quick Fix for Gettext in LogOut Screen
-if (!function_exists("_")) {
+   include ("../src/load_prefs.php");
+
+   if (!isset($i18n_php))
+      include("../functions/i18n.php");
+   if (!isset($prefs_php))
+      include ("../functions/prefs.php");
+
+   // Quick Fix for Gettext in LogOut Screen
+   if (!function_exists("_")) {
       function _($string) {
          return $string;
       }
    }
 
-   // $squirrelmail_language is set by a cookie when the user
-   // selects language
+   $squirrelmail_language = getPref ($data_dir, $username, "language");
    if (isset($squirrelmail_language)) {
-      if ($squirrelmail_language != "en") {
-         putenv("LANG=".$squirrelmail_language);
+      if ($squirrelmail_language != "en" && $squirrelmail_language != "") {
+         putenv("LC_ALL=".$squirrelmail_language);
          bindtextdomain("squirrelmail", "../locale/");
          textdomain("squirrelmail");
+         header ("Content-Type: text/html; charset=".$languages[$squirrelmail_language]["CHARSET"]);
+
+         // Setting cookie to use on the login screen the next time the
+         // same user logs in.
+         setcookie("squirrelmail_language", $squirrelmail_language, 
+                   time()+2592000);
+
       }
    }
 
-   include ("../src/load_prefs.php");
-       
-       setcookie("username", "", time(), "/");
-       setcookie("key", "", time(), "/");
-       setcookie("logged_in", 0, time(), "/");
+   setcookie("username", "", time(), "/");
+   setcookie("key", "", time(), "/");
+   setcookie("logged_in", 0, time(), "/");
    session_destroy();
 ?>
 <HTML>
@@ -48,9 +59,8 @@ if (!function_exists("_")) {
    echo "         <BR>";
    echo _("You have been successfully signed out.");
    echo "<BR>";
-   echo _("Click here to ");
    echo "<A HREF=\"login.php\" TARGET=_top>";
-   echo _("log back in.");
+   echo _("Click here to log back in.");
    echo "</A><BR><BR>";
    echo "      </TD>";
    echo "   </TR>";
Unnamed repository; edit this file 'description' to name the repository.