Changeset 655 for trunk/app/controllers

Timestamp:

07/15/08 22:08:28 (4 months ago)

Author:

aarkerio

Message:

Update messages

Files:

• trunk/app/controllers/messages_controller.php (modified) (5 diffs)

trunk/app/controllers/messages_controller.php

@@ -79 +79 @@
       $this->Sanitize->html($this->data['Message']['body']);
            
-      $this->data['Message']['sender']   = $this->Auth->user('id'); 
+      $this->data['Message']['sender_id']   = $this->Auth->user('id'); 
            
       if ( !isset( $this->data['Message']['user_id'] ) ):
-        $this->data['Message']['user_id'] = $this->Message->User->field('User.id',array('User.username'=>trim($this->data['Message']['sender'])));
+        $this->data['Message']['user_id'] = $this->Message->User->field('User.id',array('User.username'=>trim($this->data['Message']['sendern'])));
       endif;
-
+      
       if ( $this->Message->save($this->data) ):
             $this->__sendMail($this->data['Message']['user_id']);
             if ( isset($this->data['Message']['ajax']) ):
-           $this->render('sent', 'ajax');    
+                $this->render('sent', 'ajax');    
         else:
             $this->msgFlash(__('Message sent', true), '/messages/listing');
@@ -299 +299 @@
   $messages      = (int) 0;
 
-  $this->data['Message']['sender'] = $this->Auth->user('id');
+  $this->data['Message']['sender_id'] = $this->Auth->user('id');
     
   $users = $this->Message->getUsers($this->data['Message']['vclassroom_id']);
@@ -311 +311 @@
  
     if ($this->Message->save($this->data['Message'])):
-          $this->__sendAll($this->data['Message']['user_id'],$this->data['Message']['vclassroom_id'],$this->data['Message']['sender']);
+          $this->__sendAll($this->data['Message']['user_id'],$this->data['Message']['vclassroom_id'],$this->data['Message']['sender_id']);
           $messages++;
     endif;
@@ -330 +330 @@
  public function admin_listing()
  {
-  $this->layout    = 'admin';
-      
+  $this->layout    = 'admin';     
   $this->pageTitle = __('Messages', true);
-      
+
+
   $this->paginate['conditions'] = array('Message.user_id' => $this->Auth->user('id'));
-  $this->paginate['fields']     = array("Message.id", "Message.title", "Message.body", "Message.created", "Message.sender", "Message.status", "User.username");
+  $this->paginate['fields']     = array('Message.id', 'Message.title', 'Message.body', 'Message.created', 'Message.sender_id', 'Message.status', 'User.id', 'User.username', 'User.avatar');
   $this->paginate['order']      = 'Message.id DESC';
   $this->paginate['limit']      = 20;
   
   $data = $this->paginate('Message');
-     
+  
   $this->set(compact('data'));
  }
@@ -386 +386 @@
            $this->Sanitize->html($this->data['Message']['body']);
 
-           $this->data['Message']['sender']   = $this->Auth->user('id');
+           $this->data['Message']['sender_id']   = $this->Auth->user('id');
            
            $this->data['Message']['username'] = $this->Auth->user('username');