Changeset 656

Timestamp:

07/15/08 22:35:55 (3 months ago)

Author:

aarkerio

Message:

Update messages

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (7 diffs)
• views/messages/admin_display.ctp (modified) (2 diffs)
• views/messages/listing.ctp (modified) (1 diff)

trunk/app/controllers/messages_controller.php

@@ -100 +100 @@
    $this->layout    = 'portal';
       
-   $this->pageTitle = 'Messages';
+   $this->pageTitle = __('Messages', true);
    
-   $this->set('data', $this->Message->inbox($this->Auth->user('id')));    
+   
+  $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_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')); 
  
    $this->Portal->statics(); // Charge Portal components aka Sidebars
@@ -230 +238 @@
     endif;
  }
+
+ public function change($message_id, $message_status)
+ {
+    $data['Message']["id"]     = $message_id;
+    
+    $data['Message']["status"] = $message_status;
+    
+    $this->Message->save($data['Message']);    
+ }
  
  /**=== ADMIN METHODS ===**/  
@@ -269 +286 @@
            $this->data['Message']["user_id"] = $val["User"]["id"];
           
-           if ($this->Message->save($this->data['Message'])):
+           if ($this->Message->save($this->data)):
                   $j++;
            else:
@@ -310 +327 @@
     $this->Message->create();
  
-    if ($this->Message->save($this->data['Message'])):
+    if ($this->Message->save($this->data)):
           $this->__sendAll($this->data['Message']['user_id'],$this->data['Message']['vclassroom_id'],$this->data['Message']['sender_id']);
           $messages++;
@@ -407 +424 @@
    $this->layout    = 'admin';
         
-   if (!empty($this->data['Message']))
-   {
+   if (!empty($this->data['Message'])):
      $this->Sanitize = new Sanitize;
           
@@ -415 +431 @@
      $this->Sanitize->html($this->data['Message']["body"]);
           
-     if ( isset( $this->data['Message']["message_id"] ) )
-     {
+     if ( isset( $this->data['Message']["message_id"] ) ):
               $this->change($this->data['Message']["message_id"], 2);
-     }
-          
-     $this->Message->create();
-          
-     if ($this->Message->save($this->data['Message']))
-     {
-            $this->sendMail($this->data['Message']["user_id"], $this->data['Message']["username"], $this->data['Message']["title"]);
-            $this->render('send','ajax');
-     }
-   }
+     endif;
+          
+     if ($this->Message->save($this->data)):
+            $this->__sendMail($this->data['Message']["user_id"], $this->data['Message']["username"], $this->data['Message']["title"]);
+            $this->render('sent','ajax');
+      endif;
+   endif;
  }
    
@@ -438 +450 @@
       $conditions      = array("Message.id"=>$message_id, "Message.user_id"=>$this->Auth->user('id'));
       
-      $fields          = array("Message.id", "Message.user_id", "Message.title", "Message.created", "Message.body", "Message.sender", "Message.status", "User.username");
+      $fields          = array("Message.id", "Message.user_id", "Message.title", "Message.created", "Message.body", "Message.sender_id", "Message.status", "User.username");
       
       $data            = $this->Message->find($conditions, $fields);

trunk/app/views/messages/admin_display.ctp

@@ -1 +1 @@
 <?php
  echo $javascript->link('fckeditor/fckeditor');  
- echo $html->addCrumb('Control Tools', '/admin/entries/start');
- echo $html->addCrumb('Messages', '/admin/messages/listing'); 
+ echo $html->addCrumb('Control Panel', '/admin/entries/start');
+ echo $html->addCrumb(__('Messages', true), '/admin/messages/listing'); 
  echo $html->getCrumbs(' / '); 
  echo $html->para(null, $html->link($html->image('admin/compose_on.gif', array("alt"=>'Add new page','title'=>"Add new page")), '/admin/messages/add', null, false, false));
@@ -35 +35 @@
   echo $form->hidden('Message.sender_id',  array('value'=>$session->read('Auth.User.id')));
   echo $form->hidden('Message.message_id', array('value'=> $data['Message']['id']));
-  echo $form->hidden('Message.user_id',    array('value'=> $data['Message']['sender']));     // the change was made on admin_display.thtml
+  echo $form->hidden('Message.user_id',    array('value'=> $data['Message']['sender_id']));     // the change was made on admin_display.thtml
 ?>
 <fieldset>
-<legend>Reply</legend>
+<legend><?php __('Reply'); ?></legend>
   <?php 
-  echo $session->read('Auth.User.username') . __('write', true) .': <br />';
-  echo $form->label('Message.title', 'Asunto:' ) . "<br />";
+  echo $session->read('Auth.User.username') .'  '. __('write', true) .': <br />';
   echo $form->input('Message.title', array("size" => 35, "maxlength" => 50, "value"=> 'Re: ' . $data["Message"]["title"])) . "<br />";
   echo $form->error('Message.title', 'Asunto is required.'); 

trunk/app/views/messages/listing.ctp

@@ -66 +66 @@
 </td></tr>
 </table>
+<?php
+$t  = $html->div(null,$paginator->prev('« '.__('Previous', true),null,null,array('class'=>'disabled')),array('style'=>'width:100px;float:left'));
+$t .= $html->div(null,$paginator->next(__('Next', true).' »', null, null, array('class' => 'disabled')),array('style'=>'width:100px;float:right'));
+$t .= $html->div(null,$paginator->counter(), array('style'=>'width:200px;float:center'));
+ echo  $html->div(null,$t, array('style'=>'font-size:9pt;width:400px;margin:15px auto;'));
+?>
 <script language="Javascript" type="text/javascript">
     //