Changed temp file write to from due to leftover file possiblity, At least they...

[squirrelmail.git] / src / signout.php
diff --git a/src/signout.php b/src/signout.php

index 6d3b8cb1876e0f3619dfb26e06ba93b6adb2a991..2219f6af87ecc1549713bfee6af3fb316c662c08 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -7,22 +7,40 @@
          **  Clears the cookie, and logs them out.
          **
          **/
-       
-   // $squirrelmail_language is set by a cookie when the user
-   // selects language
+
+   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 = 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>
@@ -41,9 +59,8 @@
     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>";