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 138390a7b9f059605b7a77aa02f0efb6bd95057f..3aac1a106499393c974df4f54deb53ff1a51c47a 100644 (file)
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -32,11 +32,13 @@ function adm_check_user() {
         $auth = FALSE;
     } else if (file_exists(SM_PATH . 'plugins/administrator/admins')) {
         $auths = file(SM_PATH . 'plugins/administrator/admins');
-        $auth = in_array("$username\n", $auths);
+        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');
-        $auth = in_array("$username\n", $auths);
-    } else if ($adm_id = fileowner(SM_PATH . 'config/config.php') &&
+        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']);
@@ -47,4 +49,13 @@ function adm_check_user() {
     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