functions/global.php already strips slashes. Having this here twice would

[squirrelmail.git] / src / redirect.php

diff --git a/src/redirect.php b/src/redirect.php
index 6a11d0e670728f2c97cb64977398709cacda164f..89529f11559359c49168328ac30e9eb5d4dc412d 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -4,7 +4,7 @@
 * redirect.php
 * Derived from webmail.php by Ralf Kraudelt <kraude@wiwi.uni-rostock.de>
 *
-* Copyright (c) 1999-2002 The SquirrelMail Project Team
+* Copyright (c) 1999-2003 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.
@@ -16,6 +16,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/i18n.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'config/config.php');
@@ -24,17 +25,6 @@ require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/constants.php');
 require_once(SM_PATH . 'functions/page_header.php');
-require_once(SM_PATH . 'functions/global.php');
-
-// Remove slashes if PHP added them
-$REQUEST_METHOD = $_SERVER['REQUEST_METHOD'];
-if (get_magic_quotes_gpc()) {
-    if ($REQUEST_METHOD == 'POST') {
-        RemoveSlashes($_POST);
-    } else if ($REQUEST_METHOD == 'GET') {
-        RemoveSlashes($_GET);
-    }
-}
 
 /* Before starting the session, the base URI must be known. Assuming */
 /* that this file is in the src/ subdirectory (or something).        */
@@ -53,22 +43,13 @@ sqsession_unregister ('user_is_logged_in');
 sqsession_register ($base_uri, 'base_uri');
 
 /* get globals we me need */
-if (isset($_POST['login_username'])) {
-    $login_username = $_POST['login_username'];
-}
-if (!isset($_COOKIE['squirrelmail_language']) ||
-    $squirrelmail_language == '' ) {
-    $squirrelmail_language = $squirrelmail_default_language;
-}
-else {
-    $squirrelmail_language = $_COOKIE['squirrelmail_language'];
-}
-if (isset($_POST['secretkey'])) {
-    $secretkey = $_POST['secretkey'];
-}
-if (isset($_POST['js_autodetect_results'])) {
-    $js_autodetect_results = $_POST['js_autodetect_results'];
+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;
 }
+
 /* end of get globals */
 
 set_up_language($squirrelmail_language, true);
@@ -77,7 +58,7 @@ setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000,
           $base_uri);
 
 if (!isset($login_username)) {
-    include_once( '../functions/display_messages.php' );
+    include_once(SM_PATH .  'functions/display_messages.php' );
     logout_error( _("You must be logged in to access this page.") );    
     exit;
 }
@@ -129,9 +110,9 @@ sqsession_register($attachment_common_types_parsed, 'attachment_common_types_par
 
 $debug = false;
 
-if (isset($_SERVER['HTTP_ACCEPT']) &&
-    !isset($attachment_common_types_parsed[$_SERVER['HTTP_ACCEPT']])) {
-    attachment_common_parse($_SERVER['HTTP_ACCEPT'], $debug);
+if ( sqgetGlobalVar('HTTP_ACCEPT', $http_accept, SQ_SERVER) &&
+    !isset($attachment_common_types_parsed[$http_accept]) ) {
+    attachment_common_parse($http_accept, $debug);
 }
 
 /* Complete autodetection of Javascript. */
@@ -154,23 +135,18 @@ if ($javascript_setting != SMPREF_JS_ON){
 setPref($data_dir, $username, 'javascript_on', $js_pref);
 
 /* Compute the URL to forward the user to. */
-    if (isset($_SESSION['session_expired_location'])) {
-       $session_expired_location= $_SESSION['session_expired_location'];
-    } else {
-       $session_expired_location=false;
-    }
-    if (isset($session_expired_location) && $session_expired_location) {
-       $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
-       if ($compose_new_win) {
-          $redirect_url = $session_expired_location;
-       } else {
-          $redirect_url = 'webmail.php?right_frame='.urldecode($session_expired_location);
-       }
-       sqsession_unregister('session_expired_location');
-       unset($session_expired_location);
-    } else {
-       $redirect_url = 'webmail.php';
+$redirect_url = 'webmail.php';
+
+if ( sqgetGlobalVar('session_expired_location', $session_expired_location, SQ_SESSION) ) {
+    sqsession_unregister('session_expired_location');
+    $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
+    if ($compose_new_win) {
+        $redirect_url = $session_expired_location;
+    } elseif ( strpos($session_expired_location, 'webmail.php') === FALSE ) {
+        $redirect_url = 'webmail.php?right_frame='.urldecode($session_expired_location);
     }
+    unset($session_expired_location);
+}
 
 /* Write session data and send them off to the appropriate page. */
 session_write_close();