X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fadministrator%2Fauth.php;h=4026aaf666a87bd1f0d42631288262d988ebdc80;hp=a40852dc862dec28595b500f6f52be9c07fc42d2;hb=52a6105d7cd49f6fca10187959674bc96ffb0624;hpb=2d977280b841146cda14191d232ba55ce74ce5fc

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index a40852dc..4026aaf6 100644
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -8,22 +8,26 @@
  *  
  *  $Id$
  */
-function adm_check_user() {
 
+function adm_check_user() {
     GLOBAL $username, $PHP_SELF;
 
-    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') ) {
+    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
+?>