Changeset 529 for trunk/app/controllers/discussions_controller.php

Timestamp:

05/20/08 12:57:16 (7 months ago)

Author:

aarkerio

Message:

Login box fixed

Files:

• trunk/app/controllers/discussions_controller.php (modified) (7 diffs)

trunk/app/controllers/discussions_controller.php

@@ -12 +12 @@
 uses('sanitize');
 
-App::import('Model','User');
-
 class DiscussionsController extends AppController
 {
@@ -25 +23 @@
  {
     parent::beforeFilter();
-    $this->Auth->allow(array('captcha', 'add'));
+
+    if ( $this->Auth->user() ):
+         $this->Auth->allow(array('captcha', 'add'));
+    endif;
  }
 
@@ -70 +71 @@
      $this->Discussion->create();
          
-     if ( $this->Discussion->save($this->data['Discussion']) )  //save the comment
-     {
+     if ( $this->Discussion->save($this->data['Discussion']) ):  //save the comment
+
           $user_id  = $this->Discussion->News->field('user_id', array('News.id'=>$this->data['Discussion']['new_id']));
                 
@@ -77 +78 @@
                 
           $this->redirect('/news/view/'.$this->data['Discussion']['new_id'].'#cnews');
-     }
+     endif;
    }
  }
@@ -86 +87 @@
    $this->User = new User;
 
-   $this->User->unbindModel(array("hasMany"=>array('Entry', 'Lesson', 'Faq', 'Vclassroom', 'Acquaintance')));                
+   $this->User->unbindAll();                
                                                                               
    $val = $this->User->find(array('User.id'=>$user_id), array("User.name", "User.email"));
@@ -119 +120 @@
 
 /*****#### ADMIN METHODS  #####*****/
- public function admin_listing($limit=20)
+
+ public function admin_listing($paginate=0, $limit=20)
  {
    $this->layout    = 'admin';
@@ -127 +129 @@
    $conditions  = null;
 
-   $fields = array("Discussion.id", "News.title", "Discussion.id", "Discussion.comment", "Discussion.created", "Discussion.name", "Discussion.user_id");
+   $fields = array("Discussion.id", "News.title", "Discussion.id", "Discussion.comment", "Discussion.created", "Discussion.username", "Discussion.user_id");
    $order           = "Discussion.id DESC";
        
-   $this->set('data', $this->Discussion->findAll($conditions, $fields, $order, $limit, null, 2));
+   $this->set('data', $this->Discussion->findAll($conditions, $fields, $order, $limit));
  }