From 71fd53839430c7fb5171a80cddb72e3f639555bc Mon Sep 17 00:00:00 2001 From: lkehresman Date: Mon, 10 Apr 2000 15:34:04 +0000 Subject: [PATCH] fixed a few places where cookies were still being set git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@399 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/left_main.php | 2 +- src/options_submit.php | 3 ++- src/signout.php | 32 +++++++++++++++----------------- src/webmail.php | 2 +- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/left_main.php b/src/left_main.php index 06f4ecde..d6db5c5e 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -85,7 +85,7 @@ if (isset($left_refresh) && ($left_refresh != "None") && ($left_refresh != "")) { echo ""; echo ""; - echo ""; + echo ""; } echo ""; diff --git a/src/options_submit.php b/src/options_submit.php index 6e439ded..6478a3a1 100644 --- a/src/options_submit.php +++ b/src/options_submit.php @@ -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 ""; echo "\n"; diff --git a/src/signout.php b/src/signout.php index e7e6f20a..00e3de9f 100644 --- a/src/signout.php +++ b/src/signout.php @@ -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(), "/"); @@ -28,16 +26,16 @@ ?> \n"; - echo "

"; - echo " "; + echo "\n"; + echo "

"; + echo " "; echo " "; echo " "; - echo " "; + echo " "; echo " "; echo " "; - echo " "; + echo " "; echo " "; diff --git a/src/webmail.php b/src/webmail.php index 7f225706..09549302 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -17,10 +17,10 @@ # 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(); -- 2.25.1

"; echo " "; echo _("Sign Out"); echo ""; echo "

"; echo "
"; echo _("You have been successfully signed out."); @@ -48,7 +46,7 @@ echo "

"; echo "

"; echo "
"; echo "