X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fadministrator%2Fauth.php;h=edfca36fcdcd8b9b1d2972287246c6398a4e6ce4;hb=16dd8736f68b753f06df30ff39892ef18579e2ce;hp=472beaf8a00a868f6558c79494e1d9efb45d7797;hpb=63ed9ceb85e5bcda308323c25ab2e47f43d9113e;p=squirrelmail.git

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index 472beaf8..edfca36f 100644
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -1,14 +1,15 @@
 <?php
+
 /**
  * Administrator plugin - Authentication routines
  *
  * This function tell other modules what users have access
  * to the plugin.
  *
- * @version $Id$
  * @author Philippe Mingo
- * @copyright (c) 1999-2005 The SquirrelMail Project Team
+ * @copyright 1999-2012 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package plugins
  * @subpackage administrator
  */
@@ -19,15 +20,21 @@
  * @return boolean
  */
 function adm_check_user() {
-    global $PHP_SELF;
-    require_once(SM_PATH . 'functions/global.php');
+    global $plugins;
+
+    /* fail if the plugin is not enabled */
+    if ( !in_array('administrator', $plugins) ) {
+        return FALSE;
+    }
 
     if ( !sqgetGlobalVar('username',$username,SQ_SESSION) ) {
         $username = '';
     }
 
     /* This needs to be first, for all non_options pages */
-    if (strpos('options.php', $PHP_SELF)) {
+    //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');
@@ -58,4 +65,3 @@ function adm_check_user() {
 function adm_array_trim(&$value,$key) {
     $value=trim($value);
 }
-?>
\ No newline at end of file