add PAGE_NAME constant to every page under src/.

[squirrelmail.git] / src / redirect.php

diff --git a/src/redirect.php b/src/redirect.php
index 389c6a9c7c6575c06678958fe3915e7669ce6b59..39e4488026e338dbe5fa7ec89e93c254dafb7433 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -5,13 +5,16 @@
  *
  * Derived from webmail.php by Ralf Kraudelt <kraude@wiwi.uni-rostock.de>
  *
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 $sInitLocation = 'redirect';
 
+/** This is the redirect page */
+define('PAGE_NAME', 'redirect');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -79,13 +82,9 @@ if (!sqsession_is_registered('user_is_logged_in')) {
      * 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.
-     * sqsetcookieflush is needed to send out the headers. sqsetcookie caches
-     * the cookies to be send. If we don't do that we only can send 1 single cookie
-     * which is not sufficient.
      */
     sqsetcookie(session_name(),session_id(),false,$base_uri);
     sqsetcookie('key', $key, false, $base_uri);
-    sqsetcookieflush();
 
     sqsession_register($onetimepad, 'onetimepad');
 
@@ -133,11 +132,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. */
@@ -155,7 +152,7 @@ if ( sqgetGlobalVar('session_expired_location', $session_expired_location, SQ_SE
             // of the last page
             $redirect_url = $session_expired_location;
         } else {
-            $redirect_url = $location.'/webmail.php?right_frame='.urldecode($session_expired_location);
+            $redirect_url = $location.'/webmail.php?right_frame='.urlencode($session_expired_location);
         }
     }
     unset($session_expired_location);
@@ -173,11 +170,9 @@ 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
@@ -197,4 +192,7 @@ function attachment_common_parse($str, $debug) {
         }
     }
     sqsession_register($attachment_common_types, 'attachment_common_types');
+
+    /* mark as parsed */
+    $attachment_common_types_parsed[$str] = true;
 }