Changeset 3183

Timestamp:

07/21/2008 11:16:54 PM (4 months ago)

Author:

Shadowhand

Message:

Fixing #499, thanks Stalwart.

Files:

• trunk/modules/auth/controllers/auth_demo.php (modified) (7 diffs)

trunk/modules/auth/controllers/auth_demo.php

@@ -16 +16 @@
         const ALLOW_PRODUCTION = FALSE;
 
-        public function __construct()
-        {
-                parent::__construct();
-
-                // Load auth library
-                $this->auth = new Auth;
-        }
-
         public function index()
         {
@@ -34 +26 @@
                 $form = new Forge(NULL, 'Create User');
 
-                $form->input('email')->label(TRUE)->rules('required|length[4,32]');
+                $form->input('email')->label(TRUE)->rules('required|length[4,32]|valid_email');
                 $form->input('username')->label(TRUE)->rules('required|length[4,32]');
                 $form->password('password')->label(TRUE)->rules('required|length[5,40]');
@@ -42 +34 @@
                 {
                         // Create new user
-                        $user = new User_Model;
+                        $user = ORM::factory('user');
 
-                        if ( ! $user->username_exists($this->input->post('username')))
+                        if ( ! $user->username_exists($form->username->value))
                         {
                                 foreach ($form->as_array() as $key => $val)
@@ -52 +44 @@
                                 }
 
-                                if ($user->save() AND $user->add_role('login'))
+                                if ($user->save() AND $user->add('role', 'login'))
                                 {
+                                        Auth::instance()->login($user, $form->password->value);
+
                                         // Redirect to the login page
                                         url::redirect('auth_demo/login');
@@ -66 +60 @@
         public function login()
         {
-                if ($this->auth->logged_in())
+                if (Auth::instance()->logged_in())
                 {
                         $form = new Forge('auth_demo/logout', 'Log Out');
@@ -86 +80 @@
 
                                 // Attempt a login
-                                if ($this->auth->login($user, $form->password->value))
+                                if (Auth::instance()->login($user, $form->password->value))
                                 {
                                         echo '<h4>Login Success!</h4>';
@@ -106 +100 @@
         public function logout()
         {
-                // Load auth and log out
-                $this->auth->logout(TRUE);
+                // Force a complete logout
+                Auth::instance()->logout(TRUE);
 
                 // Redirect back to the login page