X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fadministrator%2Fauth.php;h=f82f3edb5c81bc12fd484b3816098906edee5222;hp=aab2196d774d52ac3754da507506f6363473d344;hb=786a9741cdff427db9898ce60ab940784240479c;hpb=0bde8324cf275fd572ccf0ca66c2ddb98ad62798

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index aab2196d..f82f3edb 100644
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -1,23 +1,65 @@
 <?php
 
+/**
+ * Administrator plugin - Authentication routines
+ *
+ * This function tell other modules what users have access
+ * to the plugin.
+ *
+ * @author Philippe Mingo
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage administrator
+ */
+
+/**
+ * Check if user has access to administrative functions
+ *
+ * @return boolean
+ */
 function adm_check_user() {
+    global $PHP_SELF, $plugins;
 
-    GLOBAL $username;
+    /* fail if the plugin is not enabled */
+    if ( !in_array('administrator', $plugins) ) {
+        return FALSE;
+    }
 
-    $auth = FALSE;
-    
-    if ( file_exists( '../plugins/administrator/admins' ) ) {
-        $auths = file( '../plugins/administrator/admins' );
-        $auth = in_array( $username, $auths );
-    }else if ( $adm_id = fileowner('../config/config.php') ) {
-        $adm = posix_getpwuid( $adm_id );
-        if ( $username == $adm['name'] ) {
-            $auth = TRUE;
-        } 
+    if ( !sqgetGlobalVar('username',$username,SQ_SESSION) ) {
+        $username = '';
     }
 
-    return( $auth );
+    /* This needs to be first, for all non_options pages */
+    if (strpos('options.php', $PHP_SELF)) {
+        $auth = FALSE;
+    } else if (file_exists(SM_PATH . 'plugins/administrator/admins')) {
+        $auths = file(SM_PATH . 'plugins/administrator/admins');
+        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');
+        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']);
+    } else {
+        $auth = FALSE;
+    }
 
+    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);
+}