Changeset 3490 for trunk/modules/auth

Timestamp:

09/25/2008 11:05:07 PM (2 months ago)

Author:

Shadowhand

Message:

Follow up to r3489, clean up:

• Fixed some incorrect comments
  
• Created get_user() in the abstract driver
  
• Changed Auth::get_user() to wrap the driver method
  

Location:

trunk/modules/auth/classes

Files:

• auth.php (modified) (1 diff)
• auth/driver (deleted)
• auth/driver.php (modified) (2 diffs)
• auth/file.php (modified) (1 diff)
• auth/orm.php (modified) (1 diff)

trunk/modules/auth/classes/auth.php

@@ -95 +95 @@
         public function get_user()
         {
-                if ($this->logged_in())
-                {
-                        return Session::instance()->get($this->config['session_key'], FALSE);
-                }
-
-                return FALSE;
+                return $this->driver->get_user();
         }
 

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

@@ -42 +42 @@
         {
                 return isset($_SESSION[$this->config['session_key']]);
+        }
+
+        /**
+         * Gets the currently logged in user from the session.
+         * Returns FALSE if no user is currently logged in.
+         *
+         * @return  mixed
+         */
+        public function get_user()
+        {
+                if ($this->logged_in(NULL))
+                {
+                        return $_SESSION[$this->config['session_key']];
+                }
+
+                return FALSE;
         }
 
@@ -124 +140 @@
         }
 
-} // End Auth_Driver Interface
+} // End Auth_Driver

trunk/modules/auth/classes/auth/file.php

@@ -71 +71 @@
         }
 
-} // End Auth_File_Driver Class
+} // End Auth_File

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

@@ -199 +199 @@
         }
 
-} // End Auth_ORM_Driver Class
+} // End Auth_ORM