Fix login error for users with no theme

[squirrelmail.git] / src / redirect.php

diff --git a/src/redirect.php b/src/redirect.php
index bfa88bef29fb2eb8058864169c7c7cc524b0b729..ae1fedf616353b82afd2d97e8339b91f530a05c3 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -10,7 +10,9 @@
  * @version $Id$
  * @package squirrelmail
  */
-$sInitLocation = 'redirect';
+
+/** This is the redirect page */
+define('PAGE_NAME', 'redirect');
 
 /**
  * Include the SquirrelMail initialization file.
@@ -142,14 +144,14 @@ $redirect_url = $location . '/webmail.php';
 
 if ( sqgetGlobalVar('session_expired_location', $session_expired_location, SQ_SESSION) ) {
     sqsession_unregister('session_expired_location');
-    if ( strpos($session_expired_location, 'compose.php') !== FALSE ) {
+    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 PHP_SELF
+            // do not prefix $location here because $session_expired_location is set to the PAGE_NAME
             // of the last page
-            $redirect_url = $session_expired_location;
+            $redirect_url = $session_expired_location.'.php';
         } else {
-            $redirect_url = $location.'/webmail.php?right_frame='.urlencode($session_expired_location);
+            $redirect_url = $location.'/webmail.php?right_frame='.urlencode($session_expired_location).'php';
         }
     }
     unset($session_expired_location);