From: thomppj <thomppj@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 21 Oct 2002 23:01:06 +0000 (+0000)
Subject: Blah.
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=52a6105d7cd49f6fca10187959674bc96ffb0624;hp=4bfa71b6016ba60675783b5f406a49fd7663808c

Blah.


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3925 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index 2271582c..4026aaf6 100644
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -8,28 +8,26 @@
  *  
  *  $Id$
  */
-function adm_check_user() {
 
+function adm_check_user() {
     GLOBAL $username, $PHP_SELF;
 
-    if ( strpos( 'options.php', $PHP_SELF ) ) {
+    if (strpos('options.php', $PHP_SELF)) {
         $auth = FALSE;
-    } else if ( file_exists( '../plugins/administrator/admins' ) ) {
-        $auths = file( '../plugins/administrator/admins' );
-        $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') ) {
+    } 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 = ($username == $adm['name']);
+    } else {
         $auth = FALSE;
     }
 
-    return( $auth );
-
+    return ($auth);
 }
 
 ?>
diff --git a/plugins/administrator/setup.php b/plugins/administrator/setup.php
index 45b0c875..98a99b96 100644
--- a/plugins/administrator/setup.php
+++ b/plugins/administrator/setup.php
@@ -11,7 +11,7 @@
  * $Id$
  */
 
-require_once('../plugins/administrator/auth.php');
+require_once(SM_PATH . 'plugins/administrator/auth.php');
 
 function squirrelmail_plugin_init_administrator() {
     global $squirrelmail_plugin_hooks, $username;
@@ -33,4 +33,4 @@ function squirrelmail_administrator_optpage_register_block() {
         'js'   => false
     );
 }
-?>
\ No newline at end of file
+?>