From 18f734b9756b8b9b62ccab1a66ccf69abc0ff73e Mon Sep 17 00:00:00 2001
From: graf25 <graf25@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 31 Dec 2001 23:23:26 +0000
Subject: [PATCH] Smpref fixes for bug #497688

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2070 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/redirect.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/redirect.php b/src/redirect.php
index 077e0a7e..b05b1e21 100644
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -167,15 +167,19 @@ $javascript_setting = getPref
     ($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
 $js_autodetect_results = (isset($js_autodetect_results) ?
     $js_autodetect_results : SMPREF_JS_OFF);
-if ($javascript_setting == SMPREF_JS_AUTODETECT) {
-    if ($js_autodetect_results == SMPREF_JS_ON) {
-        setPref($data_dir, $username, 'javascript_on', SMPREF_JS_ON);
+/* See if it's set to "Always on" */
+$js_pref = SMPREF_JS_ON;
+if ($javascript_setting != SMPREF_JS_ON){
+    if ($javascript_setting == SMPREF_JS_AUTODETECT) {
+        if ($js_autodetect_results == SMPREF_JS_OFF) {
+            $js_pref = SMPREF_JS_OFF;
+        }
     } else {
-        setPref($data_dir, $username, 'javascript_on', SMPREF_JS_OFF);
+        $js_pref = SMPREF_JS_OFF;
     }
-} else {
-    setPref($data_dir, $username, 'javascript_on', SMPREF_JS_OFF);
 }
+/* Update the prefs */
+setPref($data_dir, $username, 'javascript_on', $js_pref);
 
 /* Compute the URL to forward the user to. */
 if(isset($rcptemail)) {
-- 
2.25.1