Changeset 655

Timestamp:

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

Author:

aarkerio

Message:

Update messages

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (5 diffs)
• models/message.php (modified) (3 diffs)
• views/messages/admin_listing.ctp (modified) (5 diffs)
• views/messages/compose.ctp (modified) (1 diff)

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'); 

trunk/app/models/message.php

@@ -48 +48 @@
                                          'User' => array(
                                                               'className'  => 'User',
-                                                              'foreignKey' => 'sender'
+                                                              'foreignKey' => 'sender_id'
                                                              )
                                               )
@@ -54 +54 @@
 
    $conditions      = array("Message.user_id" => $user_id);
-   $fields          = array("Message.id", "Message.title", "Message.body", "Message.created", "Message.sender", "Message.status", "User.id", "User.username");
+   $fields          = array("Message.id", "Message.title", "Message.body", "Message.created", "Message.sender_id", "Message.status", "User.id", "User.username");
    $order           = "Message.id DESC";
    $limit           = 50;
@@ -157 +157 @@
     return $users; 
  }
+
+ function paginateCount($conditions = null, $recursive = null) 
+ {
+   $this->unbindModel(array('belongsTo'=>array('User')));
+   $this->bindModel(array(
+               'belongsTo' => array(
+                         'User' => array(
+                                   'className'  => 'User',
+                                   'foreignKey' => 'sender_id'
+                                   )
+                         )
+               ));
+    return $this->findCount($conditions, $recursive);
+  }
+
+  function paginate($conditions = null, $fields = null, $order = null, $limit = null, $page = 1, $recursive = null) 
+  {
+    $this->unbindModel(array('belongsTo'=>array('User')));
+    $this->bindModel(array(
+               'belongsTo' => array(
+                         'User' => array(
+                                   'className'  => 'User',
+                                   'foreignKey' => 'sender_id',
+                                                               'fields'     => 'id, username, avatar'
+                                   )
+                         )
+               ));
+    return $this->findAll($conditions, $fields, $order, $limit, $page, $recursive);
+  } 
 }
 ?>

trunk/app/views/messages/admin_listing.ctp

@@ -1 @@
-<?php 
+<?php
+//die(debug($data)); 
  echo $html->addCrumb('Control Panel', '/admin/entries/start');  
  echo $html->getCrumbs(' / '); 
@@ -12 +13 @@
 
 echo $form->create('Message', array('action'=>'delete', 'onsubmit'=>'return chkList();', 'name'=>'privmsg_list'));
-
 echo $form->hidden('Message.several', array('value'=>1));
 //exit(print_r($data));
@@ -20 +20 @@
 echo $html->tableHeaders($th);
 
-foreach ($data as $val)
-{
-       switch ($val['Message']['status'])
-       {
+foreach ($data as $val):
+  switch ($val['Message']['status'])
+  {
            case 0:
                 $status = 'New';
@@ -36 +35 @@
                 $img    = 'message_e.gif';
                 break;
-       }
+  }
        
-       $tr = array(
+  $tr = array(
         $html->link($html->image('admin/'.$img, array("alt"=>$status, "title"=>$status)), '/admin/messages/display/'.$val['Message']['id'], null, null, false),
         $html->link($val['Message']['title'], '/admin/messages/display/'.$val['Message']['id']),
@@ -46 +45 @@
         );
        
-    echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), 
+   echo $html->tableCells($tr, array("class"=>"altRow", "onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='altRow'"), 
                                 array('class'=>'evenRow',"onmouseover"=>"this.className='highlight'", "onmouseout"=>"this.className='evenRow'"));
     
-}
+endforeach;
  
  echo '<tr><td colspan="5" style="text-align:right">';

trunk/app/views/messages/compose.ctp

@@ -37 +37 @@
   echo $form->label('Message.body', 'Message:' ) . '<br />';
   echo $form->textarea('Message.body', array('cols'=>50, 'rows'=>10));
-  echo $form->end('Send'); 
+  echo $form->end(__('Send', true)); 
 ?>
 </fieldset>