Bugfix

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

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index aab2196d774d52ac3754da507506f6363473d344..ce90d21e0b3249980a49385090e6f663aaf5843b 100644 (file)
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -1,23 +1,32 @@
 <?php
 
+/*
+ *  This function tell other modules what users have access
+ *  to the plugin.
+ *  
+ *  Philippe Mingo
+ *  
+ *  $Id$
+ */
 function adm_check_user() {
 
-    GLOBAL $username;
+    GLOBAL $username, $PHP_SELF;
 
-    $auth = FALSE;
-    
-    if ( file_exists( '../plugins/administrator/admins' ) ) {
+    if ( strpos( 'options.php', $PHP_SELF ) ) {
+        $auth = FALSE;
+    } else if ( file_exists( '../plugins/administrator/admins' ) ) {
         $auths = file( '../plugins/administrator/admins' );
-        $auth = in_array( $username, $auths );
-    }else if ( $adm_id = fileowner('../config/config.php') ) {
+        $auth = in_array( "$username\n", $auths );
+    } else if ( file_exists( '../config/admins' ) ) {
+        $auths = file( '../config/admins' );
+        $auth = in_array( "$username\n", $auths );
+    } else if ( $adm_id = fileowner('../config/config.php') ) {
         $adm = posix_getpwuid( $adm_id );
-        if ( $username == $adm['name'] ) {
-            $auth = TRUE;
-        } 
+        $auth = ( $username == $adm['name'] );
     }
 
     return( $auth );
 
 }
 
-?>
\ No newline at end of file
+?>