Changeset 483 for trunk/app/controllers/messages_controller.php

Timestamp:

05/13/08 21:45:10 (8 months ago)

Author:

aarkerio

Message:

Messages system

Files:

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

trunk/app/controllers/messages_controller.php

@@ -10 +10 @@
 class MessagesController extends AppController
 {
- public $helpers       = array('Javascript', 'Ajax', 'Fck', 'Time');
+ public $helpers       = array('Javascript', 'Ajax', 'Fck', 'Time', 'Gags');
  
  public $components    = array('Portal', 'Security', 'Email', 'Session', 'Edublog');
@@ -16 +16 @@
  public function beforeFilter() 
  {
-    $this->Auth->allow(array('message', 'deliver', 'listing', 'compose'));
+    $this->Auth->allow(array('message', 'deliver', 'listing', 'compose', 'display', 'add'));
     parent::beforeFilter();
  }
@@ -84 +84 @@
            $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"]);
                 
-                if ( isset($this->data["Message"]["admin"]))
-                {
+         if ( isset($this->data["Message"]["admin"])):
                       $this->render('sentadmin','ajax');
-                }
-                else
-                {
-                    $this->render('sent', 'ajax');
-        }
-        }
-     }
+             else:
+                        $this->render('sent', 'ajax');
+         endif;
+     endif;
+     }
  }
 
@@ -110 +107 @@
       
    $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
- }
-
+   
+   $this->set('data', $this->Message->inbox($this->Auth->user('id')));    
+ 
+   $this->Portal->statics(); // Charge Portal components aka Sidebars
+ }
+
+ public function display($message_id)
+ {
+
+   if ( !$this->Auth->user() ):
+         $this->redirect('/users/login');
+         return false;        
+   endif;
+
+   $this->layout    = 'portal';
+
+   $this->pageTitle = 'Messages';
+      
+   $this->set('data', $this->Message->display($message_id, $this->Auth->user('id')));
+
+   $this->Portal->statics(); // Charge Portal components aka Sidebars
+  }
 
   /* == PRIVATE == **/
@@ -264 +272 @@
     $data["Message"]["status"] = $message_status;
     
-    $this->Message->save($data["Message"]);
-    
+    $this->Message->save($data["Message"]);    
  }