Fix test that was never working, and was further confused by the change to the PAGE_N...

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

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index d387f8c53ced715acea0f2f91432ba34cff267ff..aad9344131138a660d175359e12f630311c53c1d 100644 (file)
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -32,7 +32,9 @@ function adm_check_user() {
     }
 
     /* This needs to be first, for all non_options pages */
     }
 
     /* This needs to be first, for all non_options pages */

-    if (defined('PAGE_NAME') && PAGE_NAME=='administrator_options') {
+    //if (!defined('PAGE_NAME') || strpos(PAGE_NAME, 'options') === FALSE) {
+    if (!defined('PAGE_NAME') 
+     || (PAGE_NAME != 'administrator_options' && PAGE_NAME != 'options')) {

         $auth = FALSE;
     } else if (file_exists(SM_PATH . 'plugins/administrator/admins')) {
         $auths = file(SM_PATH . 'plugins/administrator/admins');
         $auth = FALSE;
     } else if (file_exists(SM_PATH . 'plugins/administrator/admins')) {
         $auths = file(SM_PATH . 'plugins/administrator/admins');