Changeset 2391 for trunk/modules/auth/libraries/Auth.php

Timestamp:

03/31/2008 03:06:27 PM (8 months ago)

Author:

Shadowhand

Message:

Removed the $user->has_role('login') check from Auth::login(). This check needs to be done by the developer, rather than by Auth.

Files:

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

trunk/modules/auth/libraries/Auth.php

@@ -109 +109 @@
                 $password = $this->hash_password($password, $this->find_salt($user->password));
 
-                // If the user has the "login" role and the passwords match, perform a login
-                if ($user->has_role('login') AND $user->password === $password)
+                // If the passwords match, perform a login
+                if ($user->password === $password)
                 {
                         if ($remember === TRUE)
@@ -148 +148 @@
                         $user = new User_Model($token->user_id);
 
-                        if ($token->id != 0 AND $user->id != 0)
+                        if ($token->id > 0 AND $user->id > 0)
                         {
                                 if ($token->user_agent === sha1(Kohana::$user_agent))