XHTML fixes

[squirrelmail.git] / src / redirect.php

diff --git a/src/redirect.php b/src/redirect.php
index 93d61fc6968adb04f59ff57e057910aa8454599f..963ce226781cafde0f8bfcce9405e130f94954c1 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -4,16 +4,19 @@
 * redirect.php
 * Derived from webmail.php by Ralf Kraudelt <kraude@wiwi.uni-rostock.de>
 *
-* Copyright (c) 1999-2003 The SquirrelMail Project Team
+* Copyright (c) 1999-2004 The SquirrelMail Project Team
 * Licensed under the GNU GPL. For full terms see the file COPYING.
 *
 * Prevents users from reposting their form data after a successful logout.
 *
-* $Id$
+* @version $Id$
 * @package squirrelmail
 */
 
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -46,7 +49,6 @@ sqsession_register ($base_uri, 'base_uri');
 /* get globals we me need */
 sqGetGlobalVar('login_username', $login_username);
 sqGetGlobalVar('secretkey', $secretkey);
-sqGetGlobalVar('js_autodetect_results', $js_autodetect_results);
 if(!sqGetGlobalVar('squirrelmail_language', $squirrelmail_language) || $squirrelmail_language == '') {
        $squirrelmail_language = $squirrelmail_default_language;
 }
@@ -94,28 +96,6 @@ if (!sqsession_is_registered('user_is_logged_in')) {
     $username = $login_username;
     sqsession_register ($username, 'username');
     setcookie('key', $key, 0, $base_uri);
-
-    switch ($allow_frames) {
-        case 4:    // if $use_frames unset, fall through to case 2
-            if (isset($_POST['set_use_frames'])) {
-                $use_frames = $_POST['set_use_frames'];
-                break;
-            }
-        case 2:    // Do not use frames
-            $use_frames = 0;
-            break;
-        case 3:    // if $use_frames unset, fall through to case 1
-            if (isset($_POST['set_use_frames'])) {
-                $use_frames = $_POST['set_use_frames'];
-                break;
-            }
-        default:   // default is also to use frames
-        case 1:    // use frames
-            $use_frames = 1;
-            break;
-    }
-
-    setcookie('use_frames', $use_frames, time()+2592000, $base_uri);
     do_hook ('login_verified');
 
 }
@@ -142,23 +122,7 @@ if ( sqgetGlobalVar('HTTP_ACCEPT', $http_accept, SQ_SERVER) &&
 }
 
 /* Complete autodetection of Javascript. */
-$javascript_setting = getPref
-    ($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
-$js_autodetect_results = (isset($js_autodetect_results) ?
-    $js_autodetect_results : SMPREF_JS_OFF);
-/* 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 {
-        $js_pref = SMPREF_JS_OFF;
-    }
-}
-/* Update the prefs */
-setPref($data_dir, $username, 'javascript_on', $js_pref);
+checkForJavascript();
 
 /* Compute the URL to forward the user to. */
 $redirect_url = $location . '/webmail.php';
@@ -209,8 +173,7 @@ function attachment_common_parse($str, $debug) {
             $attachment_common_types[$val] = true;
         }
     }
-    $_SESSION['attachment_common_types'] = $attachment_common_types;
+    sqsession_register($attachment_common_types, 'attachment_common_types');
 }
 
-
 ?>