sets redirection location to the recovered session location

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3210 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/redirect.php b/src/redirect.php
index f5eb22e9f8f54f9ad5d8a479a28753c3605bcbd0..883d5291535aad13a37462aa3b5128c61bba5c04 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -86,11 +86,13 @@ if (!session_is_registered('user_is_logged_in')) {
         logout_error( _("You must be logged in to access this page.") );            
         exit;
     } else {
         logout_error( _("You must be logged in to access this page.") );            
         exit;
     } else {

+        $sqimap_capabilities = sqimap_capability($imapConnection);
+       session_register('sqimap_capabilities');

         $delimiter = sqimap_get_delimiter ($imapConnection);
     }
     sqimap_logout($imapConnection);
     session_register('delimiter');
         $delimiter = sqimap_get_delimiter ($imapConnection);
     }
     sqimap_logout($imapConnection);
     session_register('delimiter');

-
+    global $username;    

     $username = $login_username;
     session_register ('username');
     setcookie('key', $key, 0, $base_uri);
     $username = $login_username;
     session_register ('username');
     setcookie('key', $key, 0, $base_uri);


@@ -146,9 +148,20 @@ if(isset($rcptemail)) {
     $redirect_url = 'webmail.php?right_frame=compose.php&rcptaddress=';
     $redirect_url .= $rcptemail;
 } else {
     $redirect_url = 'webmail.php?right_frame=compose.php&rcptaddress=';
     $redirect_url .= $rcptemail;
 } else {

-    $redirect_url = 'webmail.php';
+    global $session_expired_location, $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);
+       }
+       session_unregister('session_expired_location');
+       unset($session_expired_location);
+    } else {
+       $redirect_url = 'webmail.php';
+    }

 }
 }

-

 /* Send them off to the appropriate page. */
 header("Location: $redirect_url");
 
 /* Send them off to the appropriate page. */
 header("Location: $redirect_url");