Changeset 636

Timestamp:

07/09/08 21:55:19 (3 months ago)

Author:

aarkerio

Message:

Updates genrali

Location:

trunk/app

Files:

• controllers/comments_controller.php (modified) (3 diffs)
• controllers/discussions_controller.php (modified) (3 diffs)
• controllers/news_controller.php (modified) (2 diffs)
• models/comment.php (modified) (1 diff)
• models/discussion.php (modified) (1 diff)
• views/discussions/admin_listing.ctp (modified) (1 diff)
• views/entries/view.ctp (modified) (1 diff)
• views/news/display.ctp (modified) (2 diffs)
• views/news/view.ctp (modified) (2 diffs)

trunk/app/controllers/comments_controller.php

@@ -23 +23 @@
     $this->Auth->allow(array('view', 'add'));
   }
-  
-  public function view($username=null, $entry_id=null)
-  {    
-    $this->pageTitle = $username . '\'s Comments';
-      
-    $conditions      = array("status"=>1);
-      
-    if ($username != null):
-      $user_id    = $this->User->field('id', array("username"=>$username));
-      $conditions["user_id"] = $user_id;
-    endif;
-      
-    if ($entry_id != null):
-      $conditions["id"] = $entry_id;  
-    endif;
-      
-    $fields     = array("id", "title", "description", "pubdate", "size");
-    $order      = "id DESC";
-    $limit      = 12;
-      
-    $this->set('username',$username);
-    $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit, null, true)); 
-  }
- 
+   
   public function add() 
   {
-    if (!empty($this->data["Comment"]) ):
-         
+    if (!empty($this->data['Comment']) ):
+      
       $this->Sanitize = new Sanitize; 
-      $this->Sanitize->clean($this->data["Comment"]); //Hopefully this is enough
-      $this->Comment->create();
-       
-      if ($this->Comment->save($this->data["Comment"])):
+      $this->Sanitize->clean($this->data['Comment']); //Hopefully this is enough
+      
+      if ($this->Comment->save($this->data)):
            $this->msgFlash(__('Comment added', true), $this->data['Comment']['redirect_to'].'/#comments');
+      else:
+           $this->flash('Problem, please report', $this->data['Comment']['redirect_to'].'/#comments');
       endif;
     endif;
@@ -70 +48 @@
     $this->data['Comment']['id']     = $comment_id;
       
-    if ($this->Comment->save($this->data['Comment'])):
-      $this->msgFlash('Comment status changed', '/admin/entries/comments');
+    if ($this->Comment->save($this->data)):
+        $this->msgFlash('Comment status changed', '/admin/entries/comments');
     endif;
   }
@@ -80 +58 @@
      
     if ( empty( $this->data["Comment"] ) ):
-      $this->data      = $this->Comment->read(null, $id);
+       $this->data      = $this->Comment->read(null, $id);
     else:
-    $this->Sanitize = new Sanitize;
+      $this->Sanitize = new Sanitize;
          
-    $this->Sanitize->html($this->data["Comment"]["comment"]);
+      $this->Sanitize->html($this->data["Comment"]["comment"]);
          
-    if ($this->Comment->save($this->data["Comment"])):  
-      $this->msgFlash('Comment saved!', '/admin/comments/edit/'.$this->data["Comment"]["id"]);
-    endif;
-    endif;
+      if ($this->Comment->save($this->data)):  
+         $this->msgFlash('Comment saved!', '/admin/comments/edit/'.$this->data["Comment"]["id"]);
+      endif;
+   endif;
   }
  
-  public function admin_delete($id)
+  public function admin_delete($comment_id)
   {
-    if ($this->Comment->del($id)):
-      $this->msgFlash('Comment deleted', '/admin/comments/listing');
+    if ($this->Comment->del($comment_id)):
+       $this->msgFlash('Comment deleted', '/admin/comments/listing');
     endif;
   }

trunk/app/controllers/discussions_controller.php

@@ -19 +19 @@
 
  public $components    = array('Captcha', 'Email');
+
+ public $paginate = array('limit' => 10, 'page' => 1, 'order' => array('Discussion.id' => 'DESC'));
 
  public function beforeFilter() 
@@ -58 +60 @@
          $this->data['Discussion']['user_id'] = 0;
      }
-     
-     $this->Discussion->create();
          
-     if ( $this->Discussion->save($this->data['Discussion']) ):  //save the comment
+     if ( $this->Discussion->save($this->data) ):  //save the comment
 
           $user_id  = $this->Discussion->News->field('user_id', array('News.id'=>$this->data['Discussion']['new_id']));
@@ -121 +121 @@
    $conditions  = null;
    
-   $fields = array('Discussion.id','News.id','News.title','Discussion.id','Discussion.comment', 'Discussion.created', 'Discussion.username', 'Discussion.user_id', 'Discussion.status');
+   $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";

trunk/app/controllers/news_controller.php

@@ -32 +32 @@
    $this->layout = 'portal';
         
-   $this->pageTitle = 'Karamelo::Home';
-        
-   $conditions = array("News.status"=>1);
-        
-   $fields     = null;
-        
-   $order      = "News.id DESC";
-                    
-   $limit      = 8;
-        
-   //$this->set('data', $this->News->findAll($conditions, $fields, $order, $limit));
+   $this->pageTitle = 'News';
+    
    $data = $this->paginate('News', array('News.status = 1'));
 
@@ -61 +52 @@
 
   $this->News->User->unbindAll();
-        
+  $this->News->Discussion->unbindModel(array('belongsTo'=>array('News')));      
   $conditions = array('News.status'=>1, 'News.id'=>$new_id);
         

trunk/app/models/comment.php

@@ -25 +25 @@
   
  public $validate = array(
-      'comment' => VALID_NOT_EMPTY,         //'/[a-z0-9\_\-]{3,}$/i',
-      'user_id' => VALID_NOT_EMPTY,
+      'comment'  => VALID_NOT_EMPTY,         //'/[a-z0-9\_\-]{3,}$/i',
+      'user_id'  => VALID_NOT_EMPTY,
       'entry_id' => VALID_NOT_EMPTY,
       'username' => VALID_NOT_EMPTY

trunk/app/models/discussion.php

@@ -11 +11 @@
   public $name = 'Discussion';
   
-  /* public $belongsTo = array('News' =>
-                         array('className'     => 'News',
-                               'conditions'    => null,
-                               'order'         => null,
-                               'limit'         => null,
-                               'foreignKey'    => 'new_id',
-                               'dependent'     => true,
-                               'exclusive'     => false,
-                               'finderQuery'   => ''
-                         )
-                  ); */
+  public $belongsTo = array(
+                           'News' =>
+                            array('className'     => 'News',
+                                  'conditions'    => null,
+                                  'order'         => null,
+                                  'limit'         => null,
+                                  'foreignKey'    => 'new_id',
+                                  'dependent'     => true,
+                                  'exclusive'     => false,
+                                  'finderQuery'   => ''
+                   ),
+                          'User' =>
+                            array('className'     => 'User',
+                                  'conditions'    => null,
+                                  'fields'        => 'id, username',
+                                  'order'         => null,
+                                  'limit'         => null,
+                                  'foreignKey'    => 'user_id',
+                                  'dependent'     => true,
+                                  'exclusive'     => false,
+                                  'finderQuery'   => ''
+                   )
+                  );
 
   public $validate = array(

trunk/app/views/discussions/admin_listing.ctp

@@ -8 +8 @@
 
 foreach ($data as $val):
-   $st   = ( $val['Discussion']['status'] == 1 ) ? 'Published' : 'Non published'; 
+   $st   = ( $val['Discussion']['status'] == 1 ) ? __('Published', true) : __('Non published', true); 
    $tmp  = $html->link($val['News']['title'], '/news/view/'.$val['News']['id']) . '<br />';
-   $tmp .= $val['Discussion']['created'].' <b>'.$val['Discussion']['username'].' wrote:</b><br />';
+   $tmp .= $val['Discussion']['created'].' <b>'.$val['User']['username'].' wrote:</b><br />';
    $tmp .= $html->para(null, $val['Discussion']['comment']);
    $tmp .= $html->para(null, $html->link($st, '/admin/discussions/change/'.$val['Discussion']['id'].'/'.$val['Discussion']['status']));

trunk/app/views/entries/view.ctp

@@ -49 +49 @@
             echo $form->hidden('Comment.user_id',  array('value' => $session->read('Auth.User.id')));
             echo $form->hidden('Comment.username', array('value' => $session->read('Auth.User.username')));
-            echo $session->read('Auth.User.username') . "  writes:";
+            echo $session->read('Auth.User.username') . ' '.  __('writes', true) .' ';
                  
-            echo $form->label('Comment.comment', 'Comment:' );
-            echo $form->textarea('Comment.comment', array("rows" => 10, "cols" => 50)); 
+            echo $form->label('Comment.comment', __('Comment',true)) .'<br />';
+            echo $form->textarea('Comment.comment', array('rows' => 10, 'cols' => 50)); 
             echo $form->error('Comment.comment', 'A comment is required.'); 
          

trunk/app/views/news/display.ctp

@@ -1 +1 @@
 <?php
-// die(debug($_SERVER));
+//die(debug($data));
 
 echo $html->div('title_portal', __('News on Campus', true));
@@ -26 +26 @@
 
   if ($val['News']['comments'] == 1 ):  // comments enabled on this new
-     echo $html->para(null, $html->link(__('Put your comment', true), '/news/view/'.$val['News']['id']));
+     e($html->para(null,$html->link(__('Put your comment', true).' ('. count($val['Discussion']).')','/news/view/'.$val['News']['id'])));
   endif;
 ?>

trunk/app/views/news/view.ctp

@@ -1 +1 @@
 <?php
-// die(debug($data));
+//die(debug($data));
 
 echo $html->div('news_title', $html->link($data['News']['title'], '/news/view/'. $data['News']['id']));
@@ -47 +47 @@
       $bg = ($i%2 == 0) ? "#e2e2e2" : "#fff";
           
-      $tmp  = $html->para(null,$time->timeAgoInWords($v['created']) . ' <b>'. $v['username']    . '</b> wrote:<br />', array('style'=>'font-size:8pt;font-family:Georgia;'));
+      $tmp  = $html->para(null,$time->timeAgoInWords($v['created']) . ' <b>'. $v['User']['username']    . '</b> wrote:<br />', array('style'=>'font-size:8pt;font-family:Georgia;'));
       $tmp .= $html->para(null, $v['comment']);
       echo $html->div('divblock', $tmp, array('style'=>'background-color:'.$bg));