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

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index aab2196d..afbd8719 100644
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -1,23 +1,44 @@
 <?php
 
-function adm_check_user() {
-
-    GLOBAL $username;
+/**
+ *  This function tell other modules what users have access
+ *  to the plugin.
+ *  
+ *  Philippe Mingo
+ *  
+ *  $Id$
+ * @package plugins
+ * @subpackage administrator
+ */
 
-    $auth = FALSE;
+/**
+*
+*/
+function adm_check_user() {
+    global $PHP_SELF;
+    require_once(SM_PATH . 'functions/global.php');
     
-    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');
+        $auth = in_array("$username\n", $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')) {
+        $adm = posix_getpwuid( $adm_id );
+        $auth = ($username == $adm['name']);
+    } else {
+        $auth = FALSE;
+    }
 
+    return ($auth);
 }
 
-?>
\ No newline at end of file
+?>