Happy New Year

[squirrelmail.git] / plugins / administrator / auth.php

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index 3aac1a106499393c974df4f54deb53ff1a51c47a..02314214b1a15154ebdfe27df8388e3483d39fcb 100644 (file)
--- 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-2018 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package plugins
  * @subpackage administrator
  */
@@ -17,18 +18,23 @@
  * Check if user has access to administrative functions
  *
  * @return boolean
- * @access private
  */
 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');
@@ -53,9 +59,9 @@ function adm_check_user() {
  * Removes whitespace from array values
  * @param string $value array value that has to be trimmed
  * @param string $key array key
- * @since 1.5.1
+ * @since 1.5.1 and 1.4.5
+ * @access private
  */
 function adm_array_trim(&$value,$key) {
     $value=trim($value);
 }
-?>
\ No newline at end of file