Finished up defines for all current config options. Should be up to date with 1...

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

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index a40852dc862dec28595b500f6f52be9c07fc42d2..f04aa69fa1467a0fa1218fd1badfc302602a2259 100644 (file)
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -8,22 +8,32 @@
  *  
  *  $Id$
  */
-function adm_check_user() {
 
-    GLOBAL $username, $PHP_SELF;
+function adm_check_user() {
+    global $PHP_SELF;
+    require_once(SM_PATH . 'functions/global.php');
+    
+    if ( !sqgetGlobalVar('username',$username,SQ_SESSION) ) {
+        $username = '';
+    }
 
-    if ( substr( $PHP_SELF, -11 ) <> 'options.php' ) {
-    $auth = FALSE;
-    } else if ( file_exists( '../plugins/administrator/admins' ) ) {
-        $auths = file( '../plugins/administrator/admins' );
-        $auth = in_array( "$username\n", $auths );
-    } else if ( $adm_id = fileowner('../config/config.php') ) {
+    /* 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'] );
+        $auth = ($username == $adm['name']);
+    } else {
+        $auth = FALSE;
     }
 
-    return( $auth );
-
+    return ($auth);
 }
 
-?>
\ No newline at end of file
+?>