Changeset 653 for trunk/app/controllers

Timestamp:

07/15/08 14:38:50 (4 months ago)

Author:

aarkerio

Message:

Messages and news imprved

Location:

trunk/app/controllers

Files:

• discussions_controller.php (modified) (5 diffs)
• messages_controller.php (modified) (1 diff)
• news_controller.php (modified) (1 diff)

trunk/app/controllers/discussions_controller.php

@@ -14 +14 @@
 class DiscussionsController extends AppController
 {
- public $name          = 'Discussions';
-
  public $helpers       = array('Ajax', 'Gags');
 
@@ -46 +44 @@
      $this->data['Discussion']['comment'] = nl2br($this->data['Discussion']['comment']);
            
-     if ( $this->Auth->user() )
-     {
+     if ( $this->Auth->user() ):
           $this->data['Discussion']['user_id']  = $this->Auth->user('id');
           $this->data['Discussion']['username'] = $this->Auth->user('username');
-     }
-     else
-     {
+     else:
        /*if ($this->data['Discussion']['captcha'] != $this->Session->read('captcha') || strlen($this->data['Discussion']['captcha']) < 3)
        {
@@ -59 +54 @@
                 
          $this->data['Discussion']['user_id'] = 0;
-     }
+     endif;
          
      if ( $this->Discussion->save($this->data) ):  //save the comment
@@ -67 +62 @@
           $this->__sendMail($user_id, $this->data['Discussion']['new_id']);
                 
-          $this->redirect('/news/view/'.$this->data['Discussion']['new_id'].'#cnews');
+          $this->msgFlash(__('Message waiting for approval', true), '/news/view/'.$this->data['Discussion']['new_id'].'#cnews');
      endif;
    }
@@ -115 +110 @@
    $this->layout    = 'admin';
 
-   $this->pageTitle = 'Comments on News';
+   $this->pageTitle = __('Comments on News', true);
 
    $this->Discussion->bindModel(array('belongsTo'=> array('News' =>array('className'=> 'News', 'foreignKey'=> 'new_id' ))));   
+   
+   $this->paginate['fields'] = array('Discussion.id','News.id','News.title','Discussion.id','Discussion.comment', 'Discussion.created', 'Discussion.user_id', 'Discussion.status', 'User.username'); 
+   $this->paginate['conditions']   = null;
+   $this->paginate['order']        = "Discussion.id DESC";
+   $this->paginate['limit']        = 30;
+   $data = $this->paginate('Discussion');
 
-   $conditions  = null;
-   
-   $fields = array('Discussion.id','News.id','News.title','Discussion.id','Discussion.comment', 'Discussion.created', 'Discussion.user_id', 'Discussion.status', 'User.username');
-
-   $order  = "Discussion.id DESC";
-   
-   $limit  = 50;     
+   $this->set(compact('data'));
     
-   $this->set('data', $this->Discussion->findAll($conditions, $fields, $order, $limit));
  }
  

trunk/app/controllers/messages_controller.php

@@ -65 +65 @@
       $this->set('nick', $nick);
  }
- 
+/*
+ * deliver method, used to deliver message in /messages/message and /message/compose  views
+ *
+ */
  public function deliver()
- {
-    
+ {    
     if (!empty($this->data['Message'])):
       
-           $this->Sanitize = new Sanitize;
-           
-           $this->Sanitize->html($this->data['Message']['title']);
-           
-           $this->Sanitize->html($this->data['Message']['body']);
-           
-           $this->data['Message']['sender']   = $this->Auth->user('id'); 
-           $this->data['Message']['username'] = $this->Auth->user('username');
-
-           if ( $this->Message->save($this->data) ):
-                $this->__sendMail($this->data['Message']['user_id']);
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->html($this->data['Message']['title']);
+           
+      $this->Sanitize->html($this->data['Message']['body']);
+           
+      $this->data['Message']['sender']   = $this->Auth->user('id'); 
+           
+      if ( !isset( $this->data['Message']['user_id'] ) ):
+        $this->data['Message']['user_id'] = $this->Message->User->field('User.id',array('User.username'=>trim($this->data['Message']['sender'])));
+      endif;
+
+      if ( $this->Message->save($this->data) ):
+            $this->__sendMail($this->data['Message']['user_id']);
+            if ( isset($this->data['Message']['ajax']) ):
+           $this->render('sent', 'ajax');    
+        else:
             $this->msgFlash(__('Message sent', true), '/messages/listing');
-           endif;
+            endif;
+      endif;
    endif;
  }

trunk/app/controllers/news_controller.php

@@ -119 +119 @@
         
       $this->layout = 'admin';
-        
-      $conditions   = array("News.user_id" => $this->Auth->user('id') );             // only the user's news
-      $fields       = array("id", "title", "body", "created", "reference", "status", "theme_id", "user_id");
-      $order        = "News.id DESC";
-      $limit      = 20;
-        
-      $this->set('data', $this->News->findAll($conditions, $fields, $order, $limit)); 
+      $this->News->unbindModel(array('hasMany'=>array('Discussion')));  
+      $this->paginate['conditions']   = null;
+      $this->paginate['fields']       = array('News.id', 'News.title', 'News.created', 'News.status',  'News.user_id', 'User.username');
+      $this->paginate['order']        = 'News.id DESC';
+      $this->paginate['limit']        = 20;
+      $data = $this->paginate('News');
+
+      $this->set(compact('data'));
   }