X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fredirect.php;h=a5ac323cd692a9dbcf91be62d7e47760450cc2d8;hb=039fee5795aa76ba12beff9b8b3e7489c3ea381e;hp=85a653cd002044256744bfa4f3f052a533aabbae;hpb=be46073ae4264157a43cb83425a7e19ce5713df8;p=squirrelmail.git diff --git a/src/redirect.php b/src/redirect.php index 85a653cd..a5ac323c 100644 --- a/src/redirect.php +++ b/src/redirect.php @@ -4,18 +4,23 @@ * redirect.php * Derived from webmail.php by Ralf Kraudelt * -* Copyright (c) 1999-2002 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. */ +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 +29,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). */ @@ -47,38 +41,31 @@ header('Pragma: no-cache'); $location = get_location(); session_set_cookie_params (0, $base_uri); -session_start(); +sqsession_is_active(); 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 == '' ) { +sqGetGlobalVar('login_username', $login_username); +sqGetGlobalVar('secretkey', $secretkey); +if(!sqGetGlobalVar('squirrelmail_language', $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']; +if (!sqgetGlobalVar('mailto', $mailto)) { + $mailto = ''; } + /* end of get globals */ set_up_language($squirrelmail_language, true); /* Refresh the language cookie. */ -setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000, +setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000, $base_uri); if (!isset($login_username)) { - include_once( '../functions/display_messages.php' ); - logout_error( _("You must be logged in to access this page.") ); + include_once(SM_PATH . 'functions/display_messages.php' ); + logout_error( _("You must be logged in to access this page.") ); exit; } @@ -98,18 +85,11 @@ if (!sqsession_is_registered('user_is_logged_in')) { } $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0); - if (!$imapConnection) { - $errTitle = _("There was an error contacting the mail server."); - $errString = $errTitle . "
\n". - _("Contact your administrator for help."); - include_once( '../functions/display_messages.php' ); - logout_error( $errString, $errTitle ); - exit; - } else { - $sqimap_capabilities = sqimap_capability($imapConnection); - sqsession_register($sqimap_capabilities, 'sqimap_capabilities'); - $delimiter = sqimap_get_delimiter ($imapConnection); - } + + $sqimap_capabilities = sqimap_capability($imapConnection); + sqsession_register($sqimap_capabilities, 'sqimap_capabilities'); + $delimiter = sqimap_get_delimiter ($imapConnection); + sqimap_logout($imapConnection); sqsession_register($delimiter, 'delimiter'); @@ -136,52 +116,33 @@ 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 (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. */ -$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. */ - $session_expired_location= $_SESSION['session_expired_location']; - $session_expired_post= $_SESSION['session_expired_post']; - - 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 = $location . '/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) { + // do not prefix $location here because $session_expired_location is set to PHP_SELF + // of the last page + $redirect_url = $session_expired_location; + } elseif ( strpos($session_expired_location, 'webmail.php') === FALSE ) { + $redirect_url = $location.'/webmail.php?right_frame='.urldecode($session_expired_location); } + unset($session_expired_location); +} +if($mailto != '') { + $redirect_url = $location . '/webmail.php?right_frame=compose.php&mailto='; + $redirect_url .= $mailto; +} /* Write session data and send them off to the appropriate page. */ session_write_close(); @@ -193,7 +154,15 @@ function attachment_common_parse($str, $debug) { global $attachment_common_types, $attachment_common_types_parsed; $attachment_common_types_parsed[$str] = true; - $types = explode(', ', $str); + + /* + * Replace ", " with "," and explode on that as Mozilla 1.x seems to + * use "," to seperate whilst IE, and earlier versions of Mozilla use + * ", " to seperate + */ + + $str = str_replace( ', ' , ',' , $str ); + $types = explode(',', $str); foreach ($types as $val) { // Ignore the ";q=1.0" stuff @@ -204,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'); } - -?> +?> \ No newline at end of file