Changeset 138

Timestamp:

08/05/09 19:46:04 (13 months ago)

Author:

seanja

Message:

Removed getMessages from classes/scontroller.class.php
Added echo errors to the header
Fixed up the users controller based on what the documentation says

Location:

trunk

Files:

• application/controllers/users.php (modified) (4 diffs)
• application/views/header.php (modified) (1 diff)
• library/classes/scontroller.class.php (modified) (1 diff)

trunk/application/controllers/users.php

@@ -20 +20 @@
                 }
         }
-
+        
         function login() {
                 if($_POST) {
-                        $validate['username'] = 'minLen:1';
-                        $validate['password'] = 'minLen:1|callback_passwordCheck';
-                        if($this->validate($validate)){
+                        $validation['username'] = 'minLen:1';
+                        $validation['password'] = 'minLen:1|callback_passwordCheck';
+                        $fields['username'] = 'Username';
+                        $fields['password'] = 'Password';
+                        $this->setValidation($validation);
+                        $this->setValidationFields($fields);
+                        if($this->validate()) {
+                                echo 'validated';
                                 try {
                                         $this->user->login($this->post('username'), $this->post('password'));
@@ -32 +37 @@
                                         $this->data['error'] = $e->getMessage();
                                 }
+                        } else {
+                                $this->data['errors'] = $this->getValidationErrors();
                         }
-
-                } else {
-                        $this->data['errors'] = $this->getValidationErrors();
                 }
                 $this->template->render('login', $this->data);
@@ -48 +52 @@
 
         function edit($id='') {
-                if(!$this->user->loggedIn()){
+                if(!$this->user->loggedIn()) {
                         redirect('users/login');
                 }
-                if($_POST){
-                        
+                if($_POST) {
+
                 }
-                if(!$id){
+                if(!$id) {
                         $this->data['editUser'] = $this->user->getUserData();
                 } else {
-                        if($this->user->level == 'admin'){
+                        if($this->user->level == 'admin') {
                                 $tempUser = new sUser($id);
                                 $this->data['editUser'] = $tempUser->getUserData();
@@ -64 +68 @@
                         }
                 }
-                if($this->user->level == 'admin'){
+                if($this->user->level == 'admin') {
                         $this->data['levels'] = $this->user->getUserLevels();
                 }
                 $this->template->render('edit', $this->data);
         }
-        protected function passwordCheck($password){
-                if($password === 'password'){
-                        return false;
+        protected function passwordCheck($password) {
+                $return['valid'] = true;
+                $return['error'] = '';
+                if($password === 'password') {
+                        $return['valid'] = false;
+                        $return['error'] = ' is password';
                 }
-                return true;
+                return $return;
         }
 }

trunk/application/views/header.php

@@ -43 +43 @@
         <?php echo isset($message) ? '<p class="message">'.$message.'</p>' : ''; ?>
         <?php echo isset($error) ? '<p class="error">'.$error.'</p>' : ''; ?>
+        <?php 
+        if(!empty($errors)){
+                foreach($errors as $error){
+                        echo '<p class="error">'.sEscape::html($error).'</p>';
+                }
+        }
+
+        ?>

trunk/library/classes/scontroller.class.php

@@ -135 +135 @@
                 return $this->validationErrors;
         }
-        public function getMessages($errors){
-                var_dump($errors);
-        }
 }