[SM-CVS] CVS: squirrelmail/src redirect.php,1.69,1.70

[Erin S. <ebu...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27628/src

Modified Files:
	redirect.php 
Log Message:
Fix an odd circular loop in redirect.
If you have compose in new window off:
*  close SquirrelMail session.
*  go directly to webmail.php (causes redirect for login)
*  in redirect.php, url was assigned: webmail.php?right_frame=webmail.php
   which caused nested frameset.


Index: redirect.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/redirect.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -w -r1.69 -r1.70
--- redirect.php	31 Dec 2002 12:49:42 -0000	1.69
+++ redirect.php	28 Jan 2003 17:44:53 -0000	1.70
@@ -154,22 +154,17 @@
 setPref($data_dir, $username, 'javascript_on', $js_pref);
 
 /* Compute the URL to forward the user to. */
-    if (isset($_SESSION['session_expired_location'])) {
-	$session_expired_location= $_SESSION['session_expired_location'];
-    } else {
-	$session_expired_location=false;
-    }
-    if (isset($session_expired_location) && $session_expired_location) {
+$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;
-       } else {
+    } elseif ( strpos($session_expired_location, 'webmail.php') === FALSE ) {
           $redirect_url = 'webmail.php?right_frame='.urldecode($session_expired_location);
        }
-       sqsession_unregister('session_expired_location');
        unset($session_expired_location);
-    } else {
-       $redirect_url = 'webmail.php';
     }
 
 /* Write session data and send them off to the appropriate page. */