on second thought, revise r12527 to use one, generic constant

PAGE_NAME, because that doesn't clutter the namespace as much.

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

diff --git a/include/init.php b/include/init.php
index 916bbcc9b3e3ecd35b79bd701b5cc40dfe1c3a49..fd507d2da75707d2323753d28aaab0e8e0c399e3 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -417,7 +417,7 @@ switch ($sInitLocation) {
             // signout page will deal with users who aren't logged
             // in on its own; don't show error here
             //
-            if ( defined('PAGE_SIGNOUT') ) {
+            if ( defined('PAGE_NAME') && PAGE_NAME == 'signout' ) {
                 return;
             }
 

diff --git a/src/signout.php b/src/signout.php
index 606a050a6906fe40c90499a647fd42976fc30043..2c5dac51e1995444469c2f51975fe6ac4f12ecbe 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -12,7 +12,7 @@
  */
 
 /** This is the signout page */
-define('PAGE_SIGNOUT', 1);
+define('PAGE_NAME', 'signout');
 
 /**
  * Include the SquirrelMail initialization file.