X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fadministrator%2Fauth.php;h=c16b17ce13a85154c67df0327dd267f21e4b517a;hb=ae5dddc065f9501f267c4edaf68a066835da915f;hp=138390a7b9f059605b7a77aa02f0efb6bd95057f;hpb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;p=squirrelmail.git

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index 138390a7..c16b17ce 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-2011 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package plugins
  * @subpackage administrator
  */
@@ -17,26 +18,33 @@
  * 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');
-        $auth = in_array("$username\n", $auths);
+        array_walk($auths, 'adm_array_trim');
+        $auth = in_array($username, $auths);
     } else if (file_exists(SM_PATH . 'config/admins')) {
         $auths = file(SM_PATH . 'config/admins');
-        $auth = in_array("$username\n", $auths);
-    } else if ($adm_id = fileowner(SM_PATH . 'config/config.php') &&
+        array_walk($auths, 'adm_array_trim');
+        $auth = in_array($username, $auths);
+    } else if (($adm_id = fileowner(SM_PATH . 'config/config.php')) &&
                function_exists('posix_getpwuid')) {
         $adm = posix_getpwuid( $adm_id );
         $auth = ($username == $adm['name']);
@@ -47,4 +55,13 @@ function adm_check_user() {
     return ($auth);
 }
 
-?>
\ No newline at end of file
+/**
+ * Removes whitespace from array values
+ * @param string $value array value that has to be trimmed
+ * @param string $key array key
+ * @since 1.5.1 and 1.4.5
+ * @access private
+ */
+function adm_array_trim(&$value,$key) {
+    $value=trim($value);
+}