Changeset 483

Timestamp:

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

Author:

aarkerio

Message:

Messages system

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (5 diffs)
• models/message.php (modified) (1 diff)
• views/messages/display.ctp (added)
• views/messages/listing.ctp (modified) (3 diffs)
• webroot/img/static/mailgray.png (added)

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"]);    
  }
    

trunk/app/models/message.php

@@ -18 +18 @@
       'sender_id' => VALID_NOT_EMPTY
       );
-  /* return 
-   *
+
+ public function inbox($user_id) 
+ {
+  $this->unbindModel(array('belongsTo'=>array('User')));
+
+  $this->bindModel(array('belongsTo'=>array(
+                                         'User' => array(
+                                                              'className'  => 'User',
+                                                              'foreignKey' => 'sender'
+                                                             )
+                                              )
+                  ) ); 
+
+   $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");
+   $order           = "Message.id DESC";
+   $limit           = 50;
+     
+   $data = $this->findAll($conditions, $fields, $order, $limit);
+
+   return $data;
+ }
+
+ public function display($message_id, $user_id) 
+ {
+  $this->unbindModel(array('belongsTo'=>array('User')));
+
+  $this->bindModel(array('belongsTo'=>array(
+                                         'User' => array(
+                                                              'className'  => 'User',
+                                                              'foreignKey' => 'sender'
+                                                             )
+                                              )
+                  ) ); 
+
+   $conditions      = array("Message.user_id" => $user_id, "Message.id"=>$message_id);
+   $fields          = array("Message.id", "Message.title", "Message.body", "Message.created", "Message.sender", "Message.status", "User.id", "User.username");
+        
+   $data = $this->find($conditions, $fields);
+
+   if ( $data['Message']['status'] == 0 ):  // change from new to readed
+             $this->change($data['Message']['id'], 1);
+   endif;
+
+   return $data;
+ }
+
+  /*
+   * Change message status 
+   * int 
+   * int 
    */
+ public function change($message_id, $message_status)
+ {
+    $data['Message']['id']     = $message_id;
+    
+    $data['Message']['status'] = $message_status;
+    
+    $this->save($data["Message"]);
+    
+    return true;
+ }
+
+ /* 
+  *  return 
+  *  $vclassroom_id int
+ */
  public function getUsers($vclassroom_id)
  {

trunk/app/views/messages/listing.ctp

@@ -1 +1 @@
 <?php 
-echo $html->link($html->image('admin/compose_on.gif', array("alt"=>"Compose New Message", "title"=>"Compose New Message")), '/admin/messages/add', null, false, false);
+// die(debug($data));
+echo $html->link($html->image('admin/compose_on.gif', array("alt"=>"Compose New Message", "title"=>"Compose New Message")), '/messages/add', null, false, false);
 
-if ( $cU['User']['group_id'] == 1) // if user belongs to admin group
-{
-   echo '<div style="position:absolute;right:300px;top:35px;">';
-   echo $html->link($html->image('admin/message_board.gif', array("alt"=>"General Message", "title"=>"General Message")), '/admin/messages/general', null, false, false);
-   echo '</div>';
-}
-
-echo $form->create('Message', array('admin_delete', 'onsubmit'=>'return chkList();', 'name'=>'privmsg_list'));
+echo $form->create('Message', array('delete', 'onsubmit'=>'return chkList();', 'name'=>'privmsg_list'));
 
 echo $form->hidden('Message.several', array("value"=>1));
@@ -15 +9 @@
 
 $th = array('Flag', 'Subject', 'From', 'Date', 'Mark');
-echo '<table class="tbadmin">';
+
+e('<table style="width:100%;border:1px dotted orange;padding:3px;">');
+
 echo $html->tableHeaders($th);
 
@@ -38 +34 @@
        $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']),
-        $val['User']['username'],
+        $html->link($val['Message']['title'], '/messages/display/'.$val['Message']['id']),
+        $html->link($val['User']['username'], '/vclassrooms/aboutme/'.$val['User']['username']),
         $val['Message']['created'] . "\n",
         $form->checkbox('Message.id', array('value'=>$val['Message']['id'], 'id'=>'fieldid'.$val['Message']['id'])) . "\n"