Changeset 3399 for trunk/modules/auth

Timestamp:

08/29/2008 12:55:45 PM (3 months ago)

Author:

Shadowhand

Message:

Follow up to r3398, fixing some more r3366 stuff

Location:

trunk/modules/auth

Files:

• classes/auth.php (modified) (1 diff)
• classes/auth/driver/orm.php (modified) (4 diffs)
• libraries (deleted)

trunk/modules/auth/classes/auth.php

@@ -59 +59 @@
 
                 // Set the driver class name
-                $driver = 'Auth_'.$config['driver'].'_Driver';
+                $driver = 'Auth_Driver_'.$config['driver'];
 
                 if ( ! Kohana::auto_load($driver))

trunk/modules/auth/classes/auth/driver/orm.php

@@ -37 +37 @@
                 // Checks if a user is logged in and valid
                 if ( ! empty($_SESSION['auth_user']) AND is_object($_SESSION['auth_user'])
-                        AND ($_SESSION['auth_user'] instanceof User_Model) AND $_SESSION['auth_user']->loaded)
+                        AND ($_SESSION['auth_user'] instanceof Model_User) AND $_SESSION['auth_user']->loaded)
                 {
                         // Everything is okay so far
@@ -45 +45 @@
                         {
                                 // Check that the user has the given role
-                                $status = $_SESSION['auth_user']->has(new Role_Model($role));
+                                $status = $_SESSION['auth_user']->has(ORM::factory('role', $role));
                         }
                 }
@@ -61 +61 @@
 
                 // If the passwords match, perform a login
-                if ($user->has(new Role_Model('login')) AND $user->password === $password)
+                if ($user->has(ORM::factory('role', 'login')) AND $user->password === $password)
                 {
                         if ($remember === TRUE)
@@ -175 +175 @@
          * @return  void
          */
-        protected function complete_login(User_Model $user)
+        protected function complete_login(Model_User $user)
         {
                 // Update the number of logins