Remove sqsetcookieflush call (not needed)

[squirrelmail.git] / src / redirect.php

diff --git a/src/redirect.php b/src/redirect.php
index d43c8aa49e052d0392e6820c67de9cfd8c524777..c417b76a16dd18fd2c53edc228cc735ab542c9d3 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -10,33 +10,21 @@
  * @version $Id$
  * @package squirrelmail
  */
+$sInitLocation = '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 +35,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 +47,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 +66,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 +102,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. */
@@ -137,24 +144,28 @@ $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 ( strpos($session_expired_location, 'compose.php') !== FALSE ) {
+        $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;
+        } else {
+            $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 .= 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 ----------------------- */
 
@@ -183,5 +194,3 @@ function attachment_common_parse($str, $debug) {
     }
     sqsession_register($attachment_common_types, 'attachment_common_types');
 }
-
-?>
\ No newline at end of file