Changeset 2386

Timestamp:

03/31/2008 04:27:37 AM (8 months ago)

Author:

Geert

Message:

Some minor Auth tweaks

Files:

• trunk/modules/auth/libraries/Auth.php (modified) (9 diffs)

trunk/modules/auth/libraries/Auth.php

@@ -45 +45 @@
         /**
          * Loads Session and configuration options.
+         *
+         * @return  void
          */
         public function __construct($config = array())
@@ -55 +57 @@
 
                 // Clean up the salt pattern and split it into an array
-                $config['salt_pattern'] = preg_split('/, ?/', Config::item('auth.salt_pattern'));
+                $config['salt_pattern'] = preg_split('/,\s*/', Config::item('auth.salt_pattern'));
 
                 // Save the config in the object
@@ -87 +89 @@
                         $status = TRUE;
 
-                        if ( ! empty($role))
+                        if ($role !== NULL)
                         {
                                 // Check that the user has the given role
@@ -94 +96 @@
                 }
 
-                // Not logged in
                 return $status;
         }
@@ -101 +102 @@
          * Attempt to log in a user by using an ORM object and plain-text password.
          *
-         * @param   object  user model object
-         * @param   string  plain-text password to check against
-         * @param   bool    to allow auto-login, or "remember me" feature
-         * @return  bool
+         * @param   object   user model object
+         * @param   string   plain-text password to check against
+         * @param   boolean  to allow auto-login, or "remember me" feature
+         * @return  boolean
          */
         public function login(User_Model $user, $password, $remember = FALSE)
@@ -112 +113 @@
 
                 // Create a hashed password using the salt from the stored password
-                $password = $this->hash_password($password,  $this->find_salt($user->password));
+                $password = $this->hash_password($password, $this->find_salt($user->password));
 
                 // If the user has the "login" role and the passwords match, perform a login
@@ -143 +144 @@
          * Attempt to automatically log a user in by using tokens.
          *
-         * @return  bool
+         * @return  boolean
          */
         public function auto_login()
@@ -200 +201 @@
                 }
 
-                return TRUE;
+                // Double check
+                return isset($_SESSION['auth_user']);
         }
 
@@ -278 +280 @@
         {
                 $salt = '';
+
                 foreach($this->config['salt_pattern'] as $i => $offset)
                 {