Default memory search is original behaviour

[squirrelmail.git] / src / redirect.php

diff --git a/src/redirect.php b/src/redirect.php
index 3ac885d45557f89fc606390fdf4716d345ec12b2..b05b1e21da4018c9c9885a57d109bf092615b5eb 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -37,6 +37,20 @@ require_once('../functions/plugin.php');
 require_once('../functions/constants.php');
 require_once('../functions/page_header.php');
 
+// Remove slashes if PHP added them
+if (get_magic_quotes_gpc()) {
+    global $REQUEST_METHOD;
+    
+    if ($REQUEST_METHOD == "POST") {
+        global $HTTP_POST_VARS;
+        RemoveSlashes($HTTP_POST_VARS);
+    } else if ($REQUEST_METHOD == "GET") {
+        global $HTTP_GET_VARS;
+        RemoveSlashes($HTTP_GET_VARS);
+    }
+}
+
+
 function attachment_common_parse($str, $debug) {
     global $attachment_common_types, $attachment_common_types_parsed;
 
@@ -122,7 +136,6 @@ if (!session_is_registered('user_is_logged_in')) {
     session_register ('username');
     setcookie('key', $key, 0, $base_uri);
     do_hook ('login_verified');
-    checkForPrefs( $data_dir, $username);
 
 }
 
@@ -154,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)) {