Changeset 333

Timestamp:

03/23/08 20:16:44 (10 months ago)

Author:

aarkerio

Message:

Forums fixes

Location:

trunk/app

Files:

• app_controller.php (modified) (1 diff)
• config/core.php (modified) (2 diffs)
• config/sql/karamelo_postgres.sql (modified) (1 diff)
• controllers/forums_controller.php (modified) (4 diffs)
• controllers/replies_controller.php (modified) (3 diffs)
• controllers/topics_controller.php (modified) (1 diff)
• controllers/users_controller.php (modified) (2 diffs)
• models/topic.php (modified) (1 diff)
• views/forums/display.ctp (modified) (5 diffs)
• views/lessons/admin_add.ctp (modified) (2 diffs)
• views/topics/admin_listing.ctp (modified) (1 diff)

trunk/app/app_controller.php

@@ -17 +17 @@
      $this->Auth->loginAction = array('controller' => 'users', 'action' => 'login');
      $this->Auth->loginRedirect = array('controller' => 'news', 'action' => 'display');
-     $this->Auth->logoutRedirect = '/';
+     $this->Auth->logoutRedirect = '/news/display';
      $this->Auth->loginError = 'Invalid e-mail / password combination. Please try again';
      $this->Auth->authorize = 'controller';  

trunk/app/config/core.php

@@ -75 +75 @@
  *
  */
-    Configure::write('Session.save', 'cake');
+    Configure::write('Session.save', 'database');
 /**
  * The name of the table used to store CakePHP database sessions.
@@ -120 +120 @@
  * 'Security.level' is set to 'high'.
  */
-    Configure::write('Security.level', 'low');
+    Configure::write('Security.level', 'medium');
 /**
  * A random string used in security hashing methods.

trunk/app/config/sql/karamelo_postgres.sql

@@ -237 +237 @@
  status int NOT NULL DEFAULT 1
 );
+
+CREATE TABLE visitors ( --save user id visitors on topics 
+  id serial PRIMARY KEY,
+  user_id   int NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+  topic_id int NOT NULL REFERENCES topics(id) ON DELETE CASCADE,
+  UNIQUE (user_id, topic_id)  -- constraint
+); 
+
 -- ** Forums tables ends **
 

trunk/app/controllers/forums_controller.php

@@ -3 +3 @@
 *  Chipotle Software TM
 *  Manuel Montoya 2002-2008 
-*  GPLv3 manuel<arroba>mononeurona<punto>org ASMO
+*  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
  
@@ -35 +35 @@
         
         $this->pageTitle = $data['Catforum']['title'] . ' Forum';
-        //die(debug($data));
+        
         $this->set('data', $data);
         
-        $this->layout    = $this->Edublog->layout($data['Forum']['user_id']);
+        $this->layout    = $this->Edublog->layout($data['Forum']['user_id']);
         
         $this->Edublog->blog($data['Forum']['user_id']); // blogger elements
  }
  
- public function discussion($user_id, $forum_id, $topic_id) 
+ public function discussion($user_id, $forum_id, $topic_id)
  {      
         $conditions = array("Topic.id = $topic_id OR Topic.topic_id=$topic_id");
@@ -49 +49 @@
         $fields     = null; //array("Forum.title", "Forum.id", "Forum.user_id", "Forum.description", "Forum.catforum_id");
  
-        $this->Forum->Topic->User->unbindModel(array('belongsTo'=>array('Group'),'hasMany'=>array('Lesson', 'Entry', 'Comment', 'Bookmark', 'Podcast', 'Quote', 'Test', 'Webquest', 'Ecourse', 'Vclassroom', 'Acquaintance','Confirm')));
+        $this->Forum->Topic->User->unbindModel($this->Forum->User->notNow);
         
         $data = $this->Forum->Topic->findAll($conditions, $fields);
-        //die(debug($data));
+        
         $this->pageTitle = $data[0]['Forum']['title'] . ' Forum';
         
         $this->set('data', $data);
         
-        $this->layout    = $this->Edublog->layout($user_id);
+    $this->layout    = $this->Edublog->layout($user_id);
         
         $this->Edublog->blog($user_id); // blogger elements
@@ -74 +74 @@
         $this->set('data', $this->Forum->find($conditions, $fields, null, 2));
         
-        $this->layout    = $this->Edublog->layout($user_id);
+    $this->layout    = $this->Edublog->layout($user_id);
         
         $this->Edublog->blog($user_id); // blogger elements

trunk/app/controllers/replies_controller.php

@@ -64 +64 @@
  **/
  
- public function admin_listing()
- {
-        $this->layout = 'admin';
-        $this->pageTitle = 'Forums';
-        
-        $conditions = array("user_id"=>$this->Auth->user('id'));
-        $fields     = array("id", "title", "description", "status");
-        
-        $this->set('data', $this->Reply->findAll($conditions, $fields));     
- }
- 
  public function admin_edit($id = null)
  {
@@ -87 +76 @@
         if ($this->Reply->save($this->data['Reply']))
         {
-            $this->flash('Your virtual classroom  has been updated.','/vclassrooms');
+            $this->flash('Reply updated.','/admin/topics/listing/'.$topic_id);
         }
     }
@@ -93 +82 @@
 
  // change status published/draft
- public function admin_change($id, $status, $forum_id)
+ public function admin_change($topic_id, $status, $reply_id)
  {  
-   //   die(' el intvade del status es '. intval($status));
-    if ( !intval($id) ||  !is_numeric($status)  ||  !intval($forum_id) )
-    { 
-      $this->redirect('/');
-    }
-    
     $this->data['Reply']['status'] = ($status == 0 ) ? 1 : 0;
      
-    $this->data['Reply']['id']     = $id;
+    $this->data['Reply']['id']     = $reply_id;
      
     if ($this->Reply->save($this->data['Reply']))
     {
-       $this->msgFlash('Reply status changed', '/admin/forums/topics/'.$forum_id);
+       $this->msgFlash('Reply status changed', '/admin/topics/listing/'.$topic_id);
     }
  }
 
- public function admin_delete($topic_id, $forum_id)
+ public function admin_delete($topic_id, $reply_id)
  {
-     if ( $this->Reply->del($topic_id) )
+     if ( $this->Reply->del($reply_id) )
      {
-        $this->msgFlash('','/admin/forums/topics/'.$forum_id);
+        $this->msgFlash('Reply deleted','/admin/topics/listing/'.$topic_id);
      }
- }  
+ }
 }

trunk/app/controllers/topics_controller.php

@@ -28 +28 @@
  public function display($user_id, $forum_id, $topic_id)
  {  
-     $this->pageTitle = 'Discussion';
+   $this->pageTitle = 'Discussion';
      
-     $this->layout    = $this->Edublog->layout($user_id);
+   $this->layout    = $this->Edublog->layout($user_id);
      
-     $this->Edublog->blog($user_id);
+   $this->Edublog->blog($user_id);
      
-     $conditions = array("Topic.status"=>1, "Topic.id"=>$topic_id);
-     $fields     = null;
-     $order      = "Topic.created DESC";
+   $conditions = array("Topic.status"=>1, "Topic.id"=>$topic_id);
+   $fields     = null;
+   $order      = "Topic.created DESC";
      
-     $this->Topic->User->unbindModel(array('hasMany'=>array('Category', 'Faq', 'Lesson', 'Entry', 'Acquaintance', 'Vclassroom')));
-     $this->Topic->Forum->unbindModel(array('hasMany'=>array('Topic')));
-     $this->set('data', $this->Topic->find($conditions, $fields, $order, 2));
+   $this->Topic->User->unbindModel(array('hasMany'=>array('Category', 'Faq', 'Lesson', 'Entry', 'Acquaintance', 'Vclassroom')));
+   $this->Topic->Forum->unbindModel(array('hasMany'=>array('Topic')));
+   $data =  $this->Topic->find($conditions, $fields, $order, 2);
+   $this->set('data',$data);
+
+   if ( $this->Auth->user('id') )
+   { 
+        $this->Topic->addVisitor($data['Visitor'],  $this->Auth->user('id'), $data['Topic']['id']);
+   }
  }
   

trunk/app/controllers/users_controller.php

@@ -302 +302 @@
  public function logout() 
  {
-     $this->Session->setFlash("You've successfully logged out.");
-     $this->redirect($this->Auth->logout());
- }
- public function admin_login() 
- {
-    $this->redirect('/users/login'); 
- }
+   $this->Cookie->del('User');
+   
+   $this->Session->setFlash('Logout');
+
+   $this->redirect($this->Auth->logout());
+ }
+
  public function register()
  {
@@ -445 +445 @@
   }
   
- /** === ADMIN SECTION ==***/
-    /***
-    ===== ADMIN METHODS====
-    ****/
-    public function admin_edit() 
-    {
+ /***    ===== ADMIN METHODS====   ****/
+ public function admin_login() 
+ {
+    $this->redirect('/users/login'); 
+ }
+
+ public function admin_edit() 
+ {
     
     $this->layout    = 'admin';

trunk/app/models/topic.php

@@ -22 +22 @@
                                      array('className'  => 'Reply', 
                                            'foreignkey' => 'topic_id',
-                                           'order'      => 'created ASC'
-                                           ));
-                                           
- public $validate = array(
+                           'order'      => 'created ASC'
+                       ),
+                         'Visitor' => 
+                                     array('className'  => 'Visitor', 
+                                           'foreignkey' => 'topic_id',
+                           'order'      => null
+                       ),
+      );
+  /* public $hasAndBelongsToMany = array(
+        'Topic' =>
+    array('className'            => 'Topic',
+          'joinTable'              => 'topics_users',
+          'foreignKey'             => 'topic_id',
+          'associationForeignKey'  => 'user_id',
+          'conditions'             => '',
+          'order'                  => '',
+          'limit'                  => '',
+          'uniq'                   => true,
+          'finderQuery'              => '',
+          'deleteQuery'            => '',
+                'insertQuery'             => ''
+          )
+        ); */
+
+  public function addVisitor($users = array(), $user_id, $topic_id)  
+  { // this is just to set a flag to indicate user is visiting topic for first time
+    
+    $ids = array();
+    //die(var_dump( $users  ));
+    foreach ($users as $v)
+    { 
+       array_push($ids, $v['id']);
+    }
+    
+    if ( in_array($user_id, $ids) )
+    {
+      return false;
+    }
+    else
+    {
+        $this->data['Visitor']['topic_id'] = $topic_id; 
+        $this->data['Visitor']['user_id']  = $user_id;
+        $this->Visitor->create();
+
+        if ( $this->Visitor->save( $this->data['Visitor'] ) )
+        {
+          return true;
+        }
+        else
+        {
+          die('Error on addVisitor function');
+        }
+    }
+    return true;
+  }
+
+  public $validate = array(
       'subject' => VALID_NOT_EMPTY,
       'message' => VALID_NOT_EMPTY,

trunk/app/views/forums/display.ctp

@@ -1 +1 @@
 <?php
-//die(print_r($data));
+//die(debug($data));
 echo $html->para(null, 
                  'Foro: '.$html->link($data["Catforum"]["title"], 
@@ -7 +7 @@
                );
 
- echo '<div style="padding:6px;border:1px dotted gray;margin:15px 0 15px 0">';
-   echo '<div style="padding:6px;border:1px solid orange;font-size:17pt;color:orange;font-weight:bold">'.$data["Forum"]["title"].'</div>';
-    echo '<span ="font-size:pt">'. $data["Forum"]["description"] . "</span>";       
-    echo '<div style="width:100px;margin-top:15px">';
+    echo  $html->div('titentry', $data["Forum"]["title"]);
+    echo  $html->para(null, $data["Forum"]["description"]);
 
-    echo $html->div('space', 
+    echo $html->div(null, 
                     $html->link($html->image('static/new_post.gif', array("alt"=>"Add new topic", "title"=>"Add new topic")), 
                       '/topics/add/'.$blog["User"]["username"].'/'.$data["Forum"]["id"], 
@@ -18 +16 @@
               );
   
-         
     //Topics
     echo '<table style="border-collapse:collapse;width:100%">';
@@ -34 +31 @@
       foreach ($data["Topic"] as $val)
       {
-         $tr = array (
+        
+       $tr = array (
          $html->image('static/folder.gif'), 
          $html->link($val['subject'], '/topics/display/'.$data['Forum']['user_id'].'/'.$val['forum_id'].'/'.$val['id']),
-                   count($data["Topic"]),
+                   count($val['Reply']),
                    $val["User"]["username"],
                    $val['views'],
@@ -49 +47 @@
               
        echo '</table>'; 
-       echo '</div>';
- 
- 
- echo '<div style="text-align:center;width:50%;padding:6px">';
  
  if ( ! isset( $cU ) ) 
  {
-            echo $this->renderElement('login');
+         echo $html->div(null, $this->renderElement('login'));
  }
- echo '</div>';
+
+echo $html->para(null, 'Leyenda del Tema');
+
+$tmp  = $html->image('static/board.gif', array("alt"=>"Tema normal", "title"=>"Tema normal")) . ' Tema normal <br />';
+$tmp .= $html->image('static/locked.gif', array("alt"=>"Tema bloqueado", "title"=>"Tema bloqueado")) . ' Tema bloqueado<br />';
+$tmp .= $html->image('static/new.gif', array("alt"=>"Comentario nuevo", "title"=>"Comentario nuevo")). ' Comentario nuevo<br />';
+
+echo $html->para(null, $tmp);
 ?>
-
-<p style="padding:3px;border:1px dotted gray;font-size:9pt;font-weight:bold">Leyenda del Tema:</p>
-<p> 
-<?php echo $html->image('static/board.gif', array("alt"=>"Tema normal", "title"=>"Tema normal")); ?>    Tema normal<br />
-<?php echo $html->image('static/locked.gif', array("alt"=>"Tema bloqueado", "title"=>"Tema bloqueado")); ?>       Tema bloqueado<br />
-<?php echo $html->image('static/new.gif', array("alt"=>"Comentario nuevo", "title"=>"Comentario nuevo")); ?>      Comentario nuevo<br />
-</p>

trunk/app/views/lessons/admin_add.ctp

@@ -1 +1 @@
 <?php
-echo $javascript->link('myfunctions');
-echo $javascript->link('fckeditor/fckeditor'); 
+ echo $javascript->link('myfunctions');
+ echo $javascript->link('fckeditor/fckeditor'); 
+ echo $form->create('Lesson'); 
 ?>
 
-<?php echo $html->formTag('/admin/lessons/add/','post'); ?>
 <fieldset>
 <legend>Add Lesson</legend>
 <table>
 <tr><td>
-  <?php 
-     echo $form->labelTag( 'Lesson/title', 'Title:' );
-     echo $html->input('Lesson/title', array("size" => 50, "maxlength" => 120, "class"=>"formas"));
-     echo $html->tagErrorMsg('Lesson/title', 'Title is required.'); 
+  <?php
+     echo $form->input('Lesson.title', array("size" => 50, "maxlength" => 120));
+     echo $form->error('Lesson.title', 'Title is required.'); 
   ?>
   </td>
@@ -22 +21 @@
   <td colspan="2">
   <?php 
-      echo $form->labelTag( 'Lesson/body', 'Body:' );
-      echo $html->textarea('Lesson/body', array("class"=>"formas", "cols"=>80, "rows"=>45));
-      echo $fck->load('Lesson/body', 'Karamelo');
-      echo $html->tagErrorMsg('Lesson/body', 'Body is required.'); 
+      echo $form->label('Lesson.body', 'Body:' );
+      echo $form->textarea('Lesson.body', array("cols"=>80, "rows"=>45));
+      echo $fck->load('LessonBody', 'Karamelo');
+      echo $form->error('Lesson.body', 'Body is required.'); 
   ?>
   </td></tr>
   <tr><td>
   <?php 
-     echo $form->labelTag( 'Lesson/status', 'Published:' );
-     echo $html->checkbox('Lesson/status'); 
+     echo $form->label('Lesson.status', 'Published:' );
+     echo $form->checkbox('Lesson.status', array('value'=>1)); 
   ?>
   </td><td>
-  <?php 
-      echo $form->labelTag( 'Lesson/disc', 'Comments allowed to this Lesson:' );
-      echo $html->checkbox('Lesson/disc'); 
+  <?Php 
+      Echo $form->label('Lesson.disc', 'Comments allowed to this Lesson:' );
+      echo $form->checkbox('Lesson.disc', array('value'=>1)); 
   ?>
   </td></tr>
-  <tr><td colspan="2"> 
-  <?php echo $html->submit('Save'); ?>
+  <tr><td colspan="2"> </fieldset>
+  <?php echo $form->end('Save'); ?>
 </td></tr>
 </table>
-</fieldset>
-</form>

trunk/app/views/topics/admin_listing.ctp

@@ -7 +7 @@
 {
    $st  = ($val['status'] == 1) ? 'Published' : 'Hidden';
-   $stl = $html->link($st, '/admin/replies/change/'.$val['id'].'/'.$val['status']);
+   $stl = $html->link($st, '/admin/replies/change/'.$val['topic_id'].'/'.$val['status'].'/'.$val['id']);
    $tmp  = $val['User']['username'] . $html->image('avatars/'.$val['User']['avatar'], array('alt'=>$val['User']['username'], 'title'=>$val['User']['username']));
    $tmp .= $html->para(null, $val['reply']);
    $tmp .= $html->para('news_date', $val['created']);
-   $tmp .= $html->link('Delete', '/admin/replies/delete/'.$val['id']) . ' ' . $stl . ' '. $html->link('Edit', '/admin/replies/edit/'.$val['id']);
+   $tmp .= $html->link('Delete', '/admin/replies/delete/'.$val['topic_id'].'/'.$val['id']).'  ';
+   $tmp .= $stl. ' '. $html->link('Edit', '/admin/replies/edit/'.$val['id']);
    echo $html->div('adminblock', $tmp);
 }