Changing "NOT DELETED" to "UNDELETED" per Seth and Marc's suggestion.

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

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index ce90d21e0b3249980a49385090e6f663aaf5843b..3aac1a106499393c974df4f54deb53ff1a51c47a 100644 (file)
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -1,32 +1,61 @@
 <?php
+/**
+ * Administrator plugin - Authentication routines
+ *
+ * This function tell other modules what users have access
+ * to the plugin.
+ *
+ * @version $Id$
+ * @author Philippe Mingo
+ * @copyright (c) 1999-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @package plugins
+ * @subpackage administrator
+ */
 
-/*
- *  This function tell other modules what users have access
- *  to the plugin.
- *  
- *  Philippe Mingo
- *  
- *  $Id$
+/**
+ * Check if user has access to administrative functions
+ *
+ * @return boolean
+ * @access private
  */
 function adm_check_user() {
+    global $PHP_SELF;
+    require_once(SM_PATH . 'functions/global.php');
 
-    GLOBAL $username, $PHP_SELF;
+    if ( !sqgetGlobalVar('username',$username,SQ_SESSION) ) {
+        $username = '';
+    }
 
-    if ( strpos( 'options.php', $PHP_SELF ) ) {
+    /* This needs to be first, for all non_options pages */
+    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');
+        array_walk($auths, 'adm_array_trim');
+        $auth = in_array($username, $auths);
+    } else if (file_exists(SM_PATH . 'config/admins')) {
+        $auths = file(SM_PATH . 'config/admins');
+        array_walk($auths, 'adm_array_trim');
+        $auth = in_array($username, $auths);
+    } else if (($adm_id = fileowner(SM_PATH . 'config/config.php')) &&
+               function_exists('posix_getpwuid')) {
         $adm = posix_getpwuid( $adm_id );
-        $auth = ( $username == $adm['name'] );
+        $auth = ($username == $adm['name']);
+    } else {
+        $auth = FALSE;
     }
 
-    return( $auth );
-
+    return ($auth);
 }
 
-?>
+/**
+ * Removes whitespace from array values
+ * @param string $value array value that has to be trimmed
+ * @param string $key array key
+ * @since 1.5.1
+ */
+function adm_array_trim(&$value,$key) {
+    $value=trim($value);
+}
+?>
\ No newline at end of file