X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fredirect.php;h=89529f11559359c49168328ac30e9eb5d4dc412d;hp=077e0a7ed0d50d17af737b3c69d829fcb936fe91;hb=db479313da9b4405f8744fb9233e08fe57a1a033;hpb=2670726539f57cabdb35a74e74e3031d42c8875f diff --git a/src/redirect.php b/src/redirect.php index 077e0a7e..89529f11 100644 --- a/src/redirect.php +++ b/src/redirect.php @@ -1,78 +1,37 @@ - * - * 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. - * - * $Id$ - */ - -/*****************************************************************/ -/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/ -/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/ -/*** + Base level indent should begin at left margin, as ***/ -/*** the require_once below looks. ***/ -/*** + All identation should consist of four space blocks ***/ -/*** + Tab characters are evil. ***/ -/*** + all comments should use "slash-star ... star-slash" ***/ -/*** style -- no pound characters, no slash-slash style ***/ -/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/ -/*** ALWAYS USE { AND } CHARACTERS!!! ***/ -/*** + Please use ' instead of ", when possible. Note " ***/ -/*** should always be used in _( ) function calls. ***/ -/*** Thank you for your help making the SM code more readable. ***/ -/*****************************************************************/ - -require_once('../functions/i18n.php'); -require_once('../functions/strings.php'); -require_once('../config/config.php'); -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; - - $attachment_common_types_parsed[$str] = true; - $types = explode(', ', $str); - - foreach ($types as $val) { - // Ignore the ";q=1.0" stuff - if (strpos($val, ';') !== false) - $val = substr($val, 0, strpos($val, ';')); - - if (! isset($attachment_common_types[$val])) { - $attachment_common_types[$val] = true; - } - } -} - +* redirect.php +* Derived from webmail.php by Ralf Kraudelt +* +* 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. +* +* $Id$ +*/ + +/* Path for SquirrelMail required files. */ +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'); +require_once(SM_PATH . 'functions/prefs.php'); +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'); /* Before starting the session, the base URI must be known. Assuming */ /* that this file is in the src/ subdirectory (or something). */ -ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs); -$base_uri = $regs[1]; +if (!function_exists('sqm_baseuri')){ + require_once(SM_PATH . 'functions/display_messages.php'); +} +$base_uri = sqm_baseuri(); header('Pragma: no-cache'); $location = get_location(); @@ -80,35 +39,39 @@ $location = get_location(); session_set_cookie_params (0, $base_uri); session_start(); -session_unregister ('user_is_logged_in'); -session_register ('base_uri'); +sqsession_unregister ('user_is_logged_in'); +sqsession_register ($base_uri, 'base_uri'); -if (! isset($squirrelmail_language) || - $squirrelmail_language == '' ) { - $squirrelmail_language = $squirrelmail_default_language; +/* 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; } + +/* end of get globals */ + set_up_language($squirrelmail_language, true); /* Refresh the language cookie. */ -setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000,$base_uri); +setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000, + $base_uri); if (!isset($login_username)) { - displayHtmlHeader( _("You must be logged in to access this page.") ); - echo "\n" . - "
 
\n" . - "
\n" . - '' . _("You must be logged in to access this page.") . "
" . - '' . _("Go to the login page") . "\n" . - "
\n" . - "\n"; + include_once(SM_PATH . 'functions/display_messages.php' ); + logout_error( _("You must be logged in to access this page.") ); exit; } -if (!session_is_registered('user_is_logged_in')) { +if (!sqsession_is_registered('user_is_logged_in')) { do_hook ('login_before'); $onetimepad = OneTimePadCreate(strlen($secretkey)); $key = OneTimePadEncrypt($secretkey, $onetimepad); - session_register('onetimepad'); + sqsession_register($onetimepad, 'onetimepad'); + + /* remove redundant spaces */ + $login_username = trim($login_username); /* Verify that username and password are correct. */ if ($force_username_lowercase) { @@ -116,24 +79,16 @@ if (!session_is_registered('user_is_logged_in')) { } $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0); - if (!$imapConnection) { - displayHtmlHeader( _("There was an error contacting the mail server.") ); - echo "\n". - "

\n". - "
\n". - '' . _("There was an error contacting the mail server.") . "
\n". - _("Contact your administrator for help.") . "\n". - "
\n". - "\n"; - exit; - } else { - $delimiter = sqimap_get_delimiter ($imapConnection); - } + + $sqimap_capabilities = sqimap_capability($imapConnection); + sqsession_register($sqimap_capabilities, 'sqimap_capabilities'); + $delimiter = sqimap_get_delimiter ($imapConnection); + sqimap_logout($imapConnection); - session_register('delimiter'); + sqsession_register($delimiter, 'delimiter'); $username = $login_username; - session_register ('username'); + sqsession_register ($username, 'username'); setcookie('key', $key, 0, $base_uri); do_hook ('login_verified'); @@ -144,48 +99,86 @@ $user_is_logged_in = true; $just_logged_in = true; /* And register with them with the session. */ -session_register ('user_is_logged_in'); -session_register ('just_logged_in'); +sqsession_register ($user_is_logged_in, 'user_is_logged_in'); +sqsession_register ($just_logged_in, 'just_logged_in'); /* parse the accepted content-types of the client */ $attachment_common_types = array(); $attachment_common_types_parsed = array(); -session_register('attachment_common_types'); -session_register('attachment_common_types_parsed'); +sqsession_register($attachment_common_types, 'attachment_common_types'); +sqsession_register($attachment_common_types_parsed, 'attachment_common_types_parsed'); $debug = false; -if (isset($HTTP_SERVER_VARS['HTTP_ACCEPT']) && - !isset($attachment_common_types_parsed[$HTTP_SERVER_VARS['HTTP_ACCEPT']])) - attachment_common_parse($HTTP_SERVER_VARS['HTTP_ACCEPT'], $debug); -if (isset($HTTP_ACCEPT) && - !isset($attachment_common_types_parsed[$HTTP_ACCEPT])) - attachment_common_parse($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); -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)) { - $redirect_url = 'webmail.php?right_frame=compose.php&rcptaddress='; - $redirect_url .= urlencode($rcptemail); -} 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); } -/* Send them off to the appropriate page. */ +/* Write session data and send them off to the appropriate page. */ +session_write_close(); header("Location: $redirect_url"); +/* --------------------- end main ----------------------- */ + +function attachment_common_parse($str, $debug) { + global $attachment_common_types, $attachment_common_types_parsed; + + $attachment_common_types_parsed[$str] = true; + + /* + * 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 + if (strpos($val, ';') !== false) + $val = substr($val, 0, strpos($val, ';')); + + if (! isset($attachment_common_types[$val])) { + $attachment_common_types[$val] = true; + } + } + $_SESSION['attachment_common_types'] = $attachment_common_types; +} + + ?>