X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fredirect.php;h=b05b1e21da4018c9c9885a57d109bf092615b5eb;hb=beafd24ea7d30446ae5044d1def79237438c69e2;hp=4d0a02ea75dcd67ef0b34b56557c966155c366cc;hpb=5c3b0995850de5ec0702783f6c3f174b8001d090;p=squirrelmail.git diff --git a/src/redirect.php b/src/redirect.php index 4d0a02ea..b05b1e21 100644 --- a/src/redirect.php +++ b/src/redirect.php @@ -4,7 +4,7 @@ * redirect.php * Derived from webmail.php by Ralf Kraudelt * - * Copyright (c) 1999-2001 The Squirrelmail Development Team + * Copyright (c) 1999-2002 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. @@ -35,6 +35,21 @@ require_once('../functions/prefs.php'); require_once('../functions/imap.php'); 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; @@ -42,8 +57,7 @@ function attachment_common_parse($str, $debug) { $attachment_common_types_parsed[$str] = true; $types = explode(', ', $str); - foreach ($types as $val) - { + foreach ($types as $val) { // Ignore the ";q=1.0" stuff if (strpos($val, ';') !== false) $val = substr($val, 0, strpos($val, ';')); @@ -78,7 +92,8 @@ set_up_language($squirrelmail_language, true); setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000,$base_uri); if (!isset($login_username)) { - echo "\n" . + displayHtmlHeader( _("You must be logged in to access this page.") ); + echo "\n" . "

\n" . "\n" . '' . _("You must be logged in to access this page.") . "
" . @@ -102,7 +117,8 @@ if (!session_is_registered('user_is_logged_in')) { $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0); if (!$imapConnection) { - echo "\n". + displayHtmlHeader( _("There was an error contacting the mail server.") ); + echo "\n". "

\n". "\n". '' . _("There was an error contacting the mail server.") . "
\n". @@ -147,18 +163,23 @@ if (isset($HTTP_ACCEPT) && /* Complete autodetection of Javascript. */ -checkForPrefs($data_dir, $username); -$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); +$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 { - 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)) {