Changeset 639

Timestamp:

07/10/08 18:56:32 (3 months ago)

Author:

aarkerio

Message:

Litle changes

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (7 diffs)
• views/messages/admin_listing.ctp (modified) (2 diffs)

trunk/app/controllers/messages_controller.php

@@ -13 +13 @@
  
  public $components    = array('Portal', 'Email', 'Session', 'Edublog');
+
+ public $paginate = array('limit' => 20, 'page' => 1);
  
  public function beforeFilter() 
@@ -130 +132 @@
  public function add()
  {    
-   $this->layout    = 'ajax';
-        
-   if (!empty($this->data['Message']))
-   {
+  $this->layout    = 'ajax';
+        
+  if (!empty($this->data['Message'])):
+
      $this->Sanitize = new Sanitize;
           
@@ -146 +148 @@
      $this->Message->create();
           
-     if ($this->Message->save($this->data['Message'])):
+     if ($this->Message->save($this->data)):
             $this->__sendMail($this->data['Message']['user_id']);
             $this->render('sent','ajax');
@@ -152 +154 @@
            die('Error on database');
      endif;
-   }
+  endif;
  }
 
@@ -231 +233 @@
  public function admin_general()  // send a general message to all commnunity
  {
-   if ($this->Auth->user('group_id') != 1)
-   {
+   if ($this->Auth->user('group_id') != 1):
         $this->redirect('/admin/messages/listing');
-   }
+   endif;
     
    $this->layout = 'admin';
@@ -246 +247 @@
      $this->Sanitize->html($this->data['Message']["body"]);
         
-     $this->Message->User->unbindModel(
-                                 array(
-                                       "hasMany"=>array(
-                                                        "Entry", "News", "Category", "Lesson", "Podcast", "Bookmark")));
-        
-        $conditions = array("active"=>1);
-        
-        $fields     = array("id");
-        
-        $data = $this->User->findAll($conditions, $fields);
+     $this->Message->User->unbindAll();
+        
+     $conditions = array("active"=>1);
+        
+     $fields     = array("id");
+        
+     $data = $this->User->findAll($conditions, $fields);
         
         $j = 0; //counter
@@ -331 +329 @@
  public function admin_listing()
  {
-      $this->layout    = 'admin';
-      
-      $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->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['order']      = 'Message.id DESC';
+  $this->paginate['limit']      = 20;
+  
+  $data = $this->paginate('Entry', $conditions);
+     
+  $this->set(compact('data'));
  }
 

trunk/app/views/messages/admin_listing.ctp

@@ -1 +1 @@
 <?php 
- echo $html->addCrumb('Control Tools', '/admin/entries/start');  
+ echo $html->addCrumb('Control Panel', '/admin/entries/start');  
  echo $html->getCrumbs(' / '); 
 
- echo $html->link($html->image('admin/compose_on.gif', array("alt"=>"Compose New Message", "title"=>"Compose New Message")), '/admin/messages/add', null, false, false);
+ echo $html->div(null,$html->link($html->image('admin/compose_on.gif', array("alt"=>"Compose New Message", "title"=>"Compose New Message")), '/admin/messages/add', null, false, false));
 
 if ( $session->read('Auth.User.group_id') == 1): // if user belongs to admin group
@@ -53 +53 @@
  echo '<tr><td colspan="5" style="text-align:right">';
  
- if ( count($data) > 0 )
- {
+ if ( count($data) > 0 ):
     echo $html->link('Mark all', "javascript:select_switch(true)", array("style"=>"font-size:7pt")) . ' ';
     echo $html->link('Unmark all', "javascript:select_switch(false)", array("style"=>"font-size:7pt")) . '<br />';
     
-    echo $form->end('Deleted marked');
- }
+    echo $form->end(__('Deleted marked', true));
+ endif;
 ?>
 </form>