Changeset 480

Timestamp:

05/13/08 00:50:52 (7 months ago)

Author:

aarkerio

Message:

Messages to all class

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (3 diffs)
• controllers/users_controller.php (modified) (3 diffs)
• models/user.php (modified) (2 diffs)
• views/messages/admin_general.ctp (added)
• views/messages/listing.ctp (added)
• views/users/edit.ctp (added)

trunk/app/controllers/messages_controller.php

@@ -14 +14 @@
  public $components    = array('Portal', 'Security', 'Email', 'Session', 'Edublog');
  
-  public function beforeFilter() 
- {
-    $this->Auth->allow(array('message', 'deliver'));
+ public function beforeFilter() 
+ {
+    $this->Auth->allow(array('message', 'deliver', 'listing', 'compose'));
     parent::beforeFilter();
  }
@@ -100 +100 @@
  }
 
+ public function listing()
+ {
+   if ( !$this->Auth->user() ):
+         $this->redirect('/users/login');
+         return false;        
+   endif;
+
+   $this->layout    = 'portal';
+      
+   $this->pageTitle = 'Messages';
+      
+   $conditions      = array("Message.user_id" => $this->Auth->user('id'));
+   fields          = array("Message.id", "Message.title", "Message.body", "Message.created", "Message.sender", "Message.status", "User.username");
+      $order           = "Message.id DESC";
+      $limit           = 20;
+      
+      $this->set('data', $this->Message->findAll($conditions, $fields, $order, $limit));
+
+      $this->Portal->statics(); // Charge Portal components aka Sidebars
+ }
+
+
   /* == PRIVATE == **/
   private function __sendMail($email)
@@ -113 +135 @@
     $this->Email->sendAs   = 'text'; // because we like to send pretty mail
     //Do not pass any args to send()
-    if ( $this->Email->send() )
-    {
+    if ( $this->Email->send() ):
               return true;
-    }
-    else
-    {
-                return false;
-    }
+    else:
+                  return false;
+    endif;
  }
 

trunk/app/controllers/users_controller.php

@@ -19 +19 @@
  public function beforeFilter() 
  {
+   if ( !empty($this->data['User'] ) ): 
+       if ( strlen($this->data['User']['pwd']) < 6):
+         unset($this->data['User']['pwd']);
+       endif;
+   endif;
+
     $this->Auth->allow(array('blog', 'entry','portfolio', 'edit', 'about', 'register', 'directory', 'bloggers', 'insert', 'validate', 'logout'));
-    parent::beforeFilter();
-
-    if ( !empty($this->data['User']['pwd']) )
-    {
-        if ( strlen($this->data['User']['pwd']) < 5)   // only if pwd is big enough
-        {
-                 unset($this->data['User']['pwd']);      
-        }   
-    }
+  
+  parent::beforeFilter();
  }
   
  public function isAuthorized() 
  {      
-    if (isset( $this->params[Configure::read('Routing.admin')] )) 
-    {
-        if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 )  // admin and teachers
-        {
-        return true;
-        } 
-    } 
+    if (isset( $this->params[Configure::read('Routing.admin')] )):
+
+        if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 ):  // admin and teachers
+        return true;
+    endif; 
+
+    endif; 
+
     return false;  // go away !!
  }
@@ -409 +409 @@
   endif;
 
+  $this->User->escapeField('pwd');
+  
   if ( empty($this->data['User']) ):
 
@@ -415 +417 @@
       $this->Portal->statics(); // Using Portal components
         
-      $this->User->unbindModel($this->User->notNow);
-            
+      $this->User->unbindModel($this->User->notNow);        
+      
       $this->data = $this->User->read(null, $this->Auth->user('id'));
 

trunk/app/models/user.php

@@ -54 +54 @@
 
  public $validate = array(
-      'login'    => VALID_NOT_EMPTY,
-      'pwd' => VALID_NOT_EMPTY,
-      'username' => VALID_NOT_EMPTY,
-      'name' => VALID_NOT_EMPTY,
-      'email'    => VALID_EMAIL
-   );
- 
+              'login'    => VALID_NOT_EMPTY,
+              'pwd'      => VALID_NOT_EMPTY,
+              'username' => VALID_NOT_EMPTY,
+              'name'     => VALID_NOT_EMPTY,
+              'email'    => VALID_EMAIL
+               );
+/* 
+I will work on this later
+public $validate = array(
+            'username' => array('rule' => 'alphanumeric',
+                        'required' => true,
+                        'message' => 'Please enter a username'),
+            'pwd' => array('rule' => array('confirmPassword', 'password'),
+                        'message' => 'Passwords do not match'),
+            'pwd_confirm' => array('rule' => 'alphanumeric',
+                            'required' => true)
+            );
+*/
+
+public function confirmPassword($data) 
+{
+  $valid = false;
+        
+  if ($data['password'] == Security::hash(Configure::read('Security.salt') . $this->data['User']['password_confirm'])) 
+  {
+      $valid = true;
+  } 
+        
+  return $valid;
+} 
+
  /*
   * excepts : model you need
@@ -79 +103 @@
     return true;
   }
+
+ /*
+  * Remove pwd if too short
+  *
+  */
+  public function beforeValidate()
+  {
+   
+    if ( !empty($this->data['User']['pwd']) ):
+           die( debug($this->data['User']['pwd']));
+          if ( strlen($this->data['User']['pwd']) < 6):   // only if pwd is big enough
+                 unset($this->data['User']['pwd']);      
+      endif;
+
+    endif;
+
+
+    return true;
+  }
 }
 ?>