X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fredirect.php;h=ae1fedf616353b82afd2d97e8339b91f530a05c3;hb=6957d227c096362cdbd66b00982ff2eff01f47b3;hp=d43c8aa49e052d0392e6820c67de9cfd8c524777;hpb=434d41148acadee1282a3a085d04e3ba399aaa36;p=squirrelmail.git diff --git a/src/redirect.php b/src/redirect.php index d43c8aa4..ae1fedf6 100644 --- a/src/redirect.php +++ b/src/redirect.php @@ -5,38 +5,28 @@ * * Derived from webmail.php by Ralf Kraudelt * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail */ +/** This is the redirect page */ +define('PAGE_NAME', 'redirect'); + /** - * Path for SquirrelMail required files. - * @ignore + * Include the SquirrelMail initialization file. */ -define('SM_PATH','../'); +require('../include/init.php'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'functions/global.php'); -require_once(SM_PATH . 'functions/i18n.php'); +require_once(SM_PATH . 'functions/imap_general.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). */ -$base_uri = sqm_baseuri(); header('Pragma: no-cache'); $location = get_location(); -session_set_cookie_params (0, $base_uri); -sqsession_is_active(); +// session_set_cookie_params (0, $base_uri); sqsession_unregister ('user_is_logged_in'); sqsession_register ($base_uri, 'base_uri'); @@ -47,8 +37,8 @@ sqGetGlobalVar('secretkey', $secretkey); if(!sqGetGlobalVar('squirrelmail_language', $squirrelmail_language) || $squirrelmail_language == '') { $squirrelmail_language = $squirrelmail_default_language; } -if (!sqgetGlobalVar('mailto', $mailto)) { - $mailto = ''; +if (!sqgetGlobalVar('mailtodata', $mailtodata)) { + $mailtodata = ''; } /* end of get globals */ @@ -59,17 +49,15 @@ sqsetcookie('squirrelmail_language', $squirrelmail_language, time()+2592000, $base_uri); if (!isset($login_username)) { - include_once(SM_PATH . 'functions/display_messages.php' ); logout_error( _("You must be logged in to access this page.") ); exit; } if (!sqsession_is_registered('user_is_logged_in')) { - do_hook ('login_before'); + do_hook('login_before', $null); $onetimepad = OneTimePadCreate(strlen($secretkey)); $key = OneTimePadEncrypt($secretkey, $onetimepad); - sqsession_register($onetimepad, 'onetimepad'); /* remove redundant spaces */ $login_username = trim($login_username); @@ -80,6 +68,24 @@ if (!sqsession_is_registered('user_is_logged_in')) { } $imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0); + /* From now on we are logged it. If the login failed then sqimap_login handles it */ + + /* regenerate the session id to avoid session hyijacking */ + sqsession_destroy(); + @sqsession_is_active(); + session_regenerate_id(); + /** + * The cookie part. session_start and session_regenerate_session normally set + * their own cookie. SquirrelMail sets another cookie which overwites the + * php cookies. The sqsetcookie function sets the cookie by using the header + * function which gives us full control how the cookie is set. We do that + * to add the HttpOnly cookie attribute which blocks javascript access on + * IE6 SP1. + */ + sqsetcookie(session_name(),session_id(),false,$base_uri); + sqsetcookie('key', $key, false, $base_uri); + + sqsession_register($onetimepad, 'onetimepad'); $sqimap_capabilities = sqimap_capability($imapConnection); @@ -98,14 +104,17 @@ if (!sqsession_is_registered('user_is_logged_in')) { sqsession_register($sqimap_capabilities, 'sqimap_capabilities'); $delimiter = sqimap_get_delimiter ($imapConnection); + if (isset($sqimap_capabilities['NAMESPACE']) && $sqimap_capabilities['NAMESPACE'] == true) { + $namespace = sqimap_get_namespace($imapConnection); + sqsession_register($namespace, 'sqimap_namespace'); + } + sqimap_logout($imapConnection); sqsession_register($delimiter, 'delimiter'); $username = $login_username; sqsession_register ($username, 'username'); - sqsetcookie('key', $key, false, $base_uri); - do_hook ('login_verified'); - + do_hook('login_verified', $null); } /* Set the login variables. */ @@ -122,11 +131,9 @@ $attachment_common_types_parsed = array(); sqsession_register($attachment_common_types, 'attachment_common_types'); sqsession_register($attachment_common_types_parsed, 'attachment_common_types_parsed'); -$debug = false; - if ( sqgetGlobalVar('HTTP_ACCEPT', $http_accept, SQ_SERVER) && !isset($attachment_common_types_parsed[$http_accept]) ) { - attachment_common_parse($http_accept, $debug); + attachment_common_parse($http_accept); } /* Complete autodetection of Javascript. */ @@ -137,32 +144,34 @@ $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); + if ( $session_expired_location == 'compose' ) { + $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 the PAGE_NAME + // of the last page + $redirect_url = $session_expired_location.'.php'; + } else { + $redirect_url = $location.'/webmail.php?right_frame='.urlencode($session_expired_location).'php'; + } } unset($session_expired_location); } -if($mailto != '') { - $redirect_url = $location . '/webmail.php?right_frame=compose.php&mailto='; - $redirect_url .= urlencode($mailto); + +if($mailtodata != '') { + $redirect_url = $location . '/webmail.php?right_frame=compose.php&mailtodata='; + $redirect_url .= urlencode($mailtodata); } /* Write session data and send them off to the appropriate page. */ session_write_close(); header("Location: $redirect_url"); +exit; /* --------------------- end main ----------------------- */ -function attachment_common_parse($str, $debug) { +function attachment_common_parse($str) { 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 @@ -182,6 +191,7 @@ function attachment_common_parse($str, $debug) { } } sqsession_register($attachment_common_types, 'attachment_common_types'); -} -?> \ No newline at end of file + /* mark as parsed */ + $attachment_common_types_parsed[$str] = true; +}