make use of PAGE_NAME constant in plugin, prefix it with the plugin name.

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

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index f82f3edb5c81bc12fd484b3816098906edee5222..85d049c43cb77ad748eea6c3e58a4173cb55f07a 100644 (file)
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -20,7 +20,7 @@
  * @return boolean
  */
 function adm_check_user() {
  * @return boolean
  */
 function adm_check_user() {

-    global $PHP_SELF, $plugins;
+    global $plugins;

 
     /* fail if the plugin is not enabled */
     if ( !in_array('administrator', $plugins) ) {
 
     /* fail if the plugin is not enabled */
     if ( !in_array('administrator', $plugins) ) {


@@ -32,7 +32,7 @@ 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 (strpos('options.php', $PHP_SELF)) {
+    if (defined('PAGE_NAME') && PAGE_NAME='administrator_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');

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index 5d3a1fe1e8454a20a13fead4a6fae801a5e8235a..2baf4ed88f289fb1a99fcb35f4255860bbe2490f 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -14,6 +14,8 @@
  * @subpackage administrator
  */
 
  * @subpackage administrator
  */
 

+define('PAGE_NAME', 'administrator_options');
+

 /**
  * parse the config file
  *
 /**
  * parse the config file
  *