fixed a few places where cookies were still being set
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 10 Apr 2000 15:34:04 +0000 (15:34 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 10 Apr 2000 15:34:04 +0000 (15:34 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@399 7612ce4b-ef26-0410-bec9-ea0150e637f0

src/left_main.php
src/options_submit.php
src/signout.php
src/webmail.php

index 06f4ecdeee645dc5e1ee4ba4470902d83f768f39..d6db5c5ea62c6333e0c524b7f94b674ec7432387 100644 (file)
@@ -85,7 +85,7 @@
    if (isset($left_refresh) && ($left_refresh != "None") && ($left_refresh != "")) {
       echo "<META HTTP-EQUIV=\"Expires\" CONTENT=\"Thu, 01 Dec 1994 16:00:00 GMT\">";
       echo "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">"; 
-      echo "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php\">";
+      echo "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php?PHPSESSID=$PHPSESSID\">";
    }
    
    echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">";
index 6e439dedaa52042b6b8933b91654005db245e744..6478a3a11330f0e049e9378e32356f0ff3df17f9 100644 (file)
@@ -32,7 +32,8 @@
 
    setSig($data_dir, $username, stripslashes($signature_edit));
 
-   setcookie("squirrelmail_language", $language, time()+2592000);
+   #setcookie("squirrelmail_language", $language, time()+2592000);
+   $squirrelmail_language = $language;
 
    echo "<HTML>";
    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
index e7e6f20a0dfad9ffb32d634eaed2fd870c9505cc..00e3de9f9bd2ecf565b182b0fce011b5c7be7a79 100644 (file)
@@ -8,19 +8,17 @@
         **
         **/
        
-       $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");
+      }
+   }
 
-        // $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");
-           }
-        }
+   include ("../src/load_prefs.php");
        
 #      setcookie("username", "", time(), "/");
 #      setcookie("key", "", time(), "/");
 ?>
 <HTML>
 <?
-   echo "<BODY TEXT=000000 BGCOLOR=#FFFFFF LINK=0000CC VLINK=0000CC ALINK=0000CC>\n";
-   echo "<BR><BR><TABLE BGCOLOR=#FFFFFF BORDER=0 COLS=1 WIDTH=50% CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>";
-   echo "   <TR BGCOLOR=#DCDCDC WIDTH=100%>";
+   echo "<BODY TEXT=000000 BGCOLOR=$color[4] LINK=$color[7] VLINK=$color[7] ALINK=$color[7]>\n";
+   echo "<BR><BR><TABLE BGCOLOR=FFFFFF BORDER=0 COLS=1 WIDTH=50% CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>";
+   echo "   <TR BGCOLOR=$color[0] WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
    echo "         <B>";
    echo _("Sign Out");
    echo "</B>";
    echo "      </TD>";
    echo "   </TR>";
-   echo "   <TR BGCOLOR=#FFFFFF WIDTH=100%>";
+   echo "   <TR BGCOLOR=$color[4] WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
    echo "         <BR>";
    echo _("You have been successfully signed out.");
@@ -48,7 +46,7 @@
    echo "</A><BR><BR>";
    echo "      </TD>";
    echo "   </TR>";
-   echo "   <TR BGCOLOR=#DCDCDC WIDTH=100%>";
+   echo "   <TR BGCOLOR=$color[0] WIDTH=100%>";
    echo "      <TD ALIGN=CENTER>";
    echo "         <BR>";
    echo "      </TD>";
index 7f225706f8796ae3e9d9ba00f8924a8ed35c9e72..095493020d1b52f36a6ce148cdef0bfd269cfc06 100644 (file)
 #   setcookie("key", $key, 0, "/");
 #   setcookie("logged_in", 1, 0, "/");
    
+   $logged_in = 1;
    session_register("username");
    session_register("key");
    session_register("logged_in");
-   $logged_in = 1;
 
    $PHPSESSID = session_id();