Changeset 484

Timestamp:

05/13/08 22:44:38 (8 months ago)

Author:

aarkerio

Message:

Messages system

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (12 diffs)
• views/messages/display.ctp (modified) (3 diffs)

trunk/app/controllers/messages_controller.php

@@ -16 +16 @@
  public function beforeFilter() 
  {
-    $this->Auth->allow(array('message', 'deliver', 'listing', 'compose', 'display', 'add'));
+    $this->Auth->allow(array('message', 'deliver', 'listing', 'compose', 'display', 'add', 'send'));
     parent::beforeFilter();
  }
@@ -113 +113 @@
  }
 
+ public function add()
+ {    
+   $this->layout    = 'ajax';
+        
+   if (!empty($this->data['Message']))
+   {
+     $this->Sanitize = new Sanitize;
+          
+     $this->Sanitize->html($this->data['Message']['title']);
+          
+     $this->Sanitize->html($this->data['Message']['body']);
+          
+     if ( isset( $this->data['Message']["message_id"] ) ):
+           $this->Message->change($this->data['Message']["message_id"], 2);  // set "Reply" 
+     endif;
+          
+     $this->Message->create();
+          
+     if ($this->Message->save($this->data['Message'])):
+            $this->__sendMail($this->data['Message']['user_id']);
+            $this->render('sent','ajax');
+     else:
+           die('Error on database');
+     endif;
+   }
+ }
+
  public function display($message_id)
  {
@@ -131 +158 @@
 
   /* == PRIVATE == **/
-  private function __sendMail($email)
-  {   
+  private function __sendMail($user_id)
+  { 
+    $email = $this->Message->User->field('User.email', array('User.id'=>$user_id));  
     $this->layout          = 'default';
     $this->Email->to       = $email;
@@ -184 +212 @@
    $this->layout = 'admin';
     
-   if (!empty($this->data["Message"]))
+   if (!empty($this->data['Message']))
    {
      $this->Sanitize = new Sanitize;
         
-     $this->Sanitize->html($this->data["Message"]["title"]);
-        
-     $this->Sanitize->html($this->data["Message"]["body"]);
+     $this->Sanitize->html($this->data['Message']["title"]);
+        
+     $this->Sanitize->html($this->data['Message']["body"]);
         
      $this->Message->User->unbindModel(
@@ -205 +233 @@
         $j = 0; //counter
         
-        $this->data["Message"]["sender_id"] = $this->Auth->user('id');
+        $this->data['Message']["sender_id"] = $this->Auth->user('id');
         
         //exit(print_r($data));
@@ -214 +242 @@
            //exit(print_r($val));
           
-           $this->data["Message"]["user_id"] = $val["User"]["id"];
-          
-           if ($this->Message->save($this->data["Message"])):
+           $this->data['Message']["user_id"] = $val["User"]["id"];
+          
+           if ($this->Message->save($this->data['Message'])):
                   $j++;
            else:
@@ -268 +296 @@
  public function admin_change($message_id, $message_status)
  {
-    $data["Message"]["id"]     = $message_id;
-    
-    $data["Message"]["status"] = $message_status;
-    
-    $this->Message->save($data["Message"]);    
+    $data['Message']["id"]     = $message_id;
+    
+    $data['Message']["status"] = $message_status;
+    
+    $this->Message->save($data['Message']);    
  }
    
@@ -294 +322 @@
     $this->layout    = 'ajax';
     
-    $this->set('data', $this->data["Message"]);
+    $this->set('data', $this->data['Message']);
     
     $this->set('admin_reply', 'ajax');
@@ -303 +331 @@
    $this->layout    = 'admin';
         
-   if (!empty($this->data["Message"]))
+   if (!empty($this->data['Message']))
    {
      $this->Sanitize = new Sanitize;
           
-     $this->Sanitize->html($this->data["Message"]["title"]);
-          
-     $this->Sanitize->html($this->data["Message"]["body"]);
-          
-     if ( isset( $this->data["Message"]["message_id"] ) )
+     $this->Sanitize->html($this->data['Message']["title"]);
+          
+     $this->Sanitize->html($this->data['Message']["body"]);
+          
+     if ( isset( $this->data['Message']["message_id"] ) )
      {
-              $this->change($this->data["Message"]["message_id"], 2);
+              $this->change($this->data['Message']["message_id"], 2);
      }
           
      $this->Message->create();
           
-     if ($this->Message->save($this->data["Message"]))
+     if ($this->Message->save($this->data['Message']))
      {
-            $this->sendMail($this->data["Message"]["user_id"], $this->data["Message"]["username"], $this->data["Message"]["title"]);
+            $this->sendMail($this->data['Message']["user_id"], $this->data['Message']["username"], $this->data['Message']["title"]);
             $this->render('send','ajax');
      }
@@ -338 +366 @@
       $data            = $this->Message->find($conditions, $fields);
       
-      if ( $data["Message"]["status"] == 0 )  // change from new to readed
+      if ( $data['Message']["status"] == 0 )  // change from new to readed
       {
-         $this->change($data["Message"]["id"], 1);
+         $this->change($data['Message']["id"], 1);
       }
       
@@ -432 +460 @@
  public function admin_delete($id=null)
  {
-   if ( isset($this->data["Message"]["several"]) )
+   if ( isset($this->data['Message']['several']) )
    {   
-            //exit(print_r($this->data["Message"]["id"]));
-            foreach ($this->data["Message"]["id"] as $v)
+            //exit(print_r($this->data['Message']["id"]));
+            foreach ($this->data['Message']['id'] as $v)
             {
                if ( $v != 0)
@@ -447 +475 @@
    else
    {
-           if ( isset( $this->data["Message"]["id"] ) )
-           {
-               $id = $this->data["Message"]["id"];
-           }
+          if ( isset( $this->data['Message']['id'] ) ):
+               $id = $this->data['Message']['id'];
+          endif;
            
        $this->Message->del($id);

trunk/app/views/messages/display.ctp

@@ -1 +1 @@
 <?php
 //die(debug($data));
- echo $html->para(null, $html->link($html->image('admin/compose_on.gif', array('alt'=>'New message','title'=>'New message')), '/messages/add', null, false, false));
+ echo $html->para(null, $html->link($html->image('admin/compose_on.gif', array('alt'=>'New message','title'=>'New message')), 
+'/messages/compose', null, false, false));
 ?>
 <div id="charging" style="display:none;"><?php echo $html->image('static/loading.gif', array("alt"=>"Loading")); ?></div>
@@ -23 +24 @@
   echo $ajax->form(); 
   echo $form->hidden('Message.username',   array("value"=>$cU['User']['username']));
-  echo $form->hidden('Message.sender_id',  array("value"=>$cU['User']['id']));
+  echo $form->hidden('Message.sender',  array("value"=>$cU['User']['id']));
   echo $form->hidden('Message.message_id', array("value"=> $data["Message"]["id"]));
-  echo $form->hidden('Message.user_id',    array("value"=> $data["Message"]["sender_id"]));     // the change was made on admin_display.thtml
+  echo $form->hidden('Message.user_id',    array("value"=> $data["Message"]["sender"])); 
 ?>
 <fieldset>
@@ -33 +34 @@
  
   echo $form->input('Message.title', array("size" => 35, "maxlength" => 50, "value"=> 'Re: ' . $data["Message"]["title"])) . "<br />";
-  echo $form->label('Message.body', 'Message:' );?><br />
-  echo $form->textarea('Message.body', array("cols"=>50, "rows"=>10, "value"=>$data["User"]["username"] . ' wrote: ' . $data["Message"]["body"]));
+  echo $form->label('Message.body', 'Message:').'<br />';
+  echo $form->textarea('Message.body', array("cols"=>50, "rows"=>10, "value"=>"\n\n".'>> '.$data["User"]["username"] . ' wrote: ' . $data["Message"]["body"]));
   echo $fck->load('MessageBody', 'Basic', 600, 160);