Changeset 322

Timestamp:

03/14/08 09:58:47 (10 months ago)

Author:

aarkerio

Message:

Forums update

Location:

trunk/app

Files:

• app_controller.php (modified) (1 diff)
• config/core.php (modified) (1 diff)
• config/sql/karamelo_postgres.sql (modified) (1 diff)
• controllers/acquaintances_controller.php (modified) (1 diff)
• controllers/catforums_controller.php (modified) (1 diff)
• controllers/forums_controller.php (modified) (6 diffs)
• controllers/topics_controller.php (modified) (7 diffs)
• models/catforum.php (modified) (1 diff)
• models/forum.php (modified) (1 diff)
• models/topic.php (modified) (1 diff)
• views/catforums/display.ctp (modified) (1 diff)
• views/entries/admin_start.ctp (modified) (1 diff)
• views/forums/admin_topics.ctp (modified) (2 diffs)
• views/forums/discussion.ctp (added)
• views/forums/display.ctp (modified) (2 diffs)
• views/topics/display.ctp (modified) (1 diff)
• views/users/portfolio.ctp (modified) (1 diff)
• webroot/css/cpanel/cpanel.css (modified) (1 diff)
• webroot/css/rubyx/rubyx.css (modified) (1 diff)
• webroot/img/blog.png (modified) (previous)
• webroot/img/ecourses.png (modified) (previous)
• webroot/img/ipod.png (modified) (previous)
• webroot/img/karamelo_users.png (modified) (previous)
• webroot/img/phorum.png (modified) (previous)
• webroot/img/quotes.png (modified) (previous)
• webroot/img/static/forums.png (added)
• webroot/img/static_pages.png (modified) (previous)

trunk/app/app_controller.php

@@ -20 +20 @@
      $this->Auth->loginError = 'Invalid e-mail / password combination. Please try again';
      $this->Auth->authorize = 'controller';  
-     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'register', 'insert', 'vote', 'download', 'blog','portfolio', 'about', 'message', 'directory', 'bloggers', 'add', 'rss') );
+     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'register', 'insert', 'vote', 'download', 'blog','portfolio', 'about', 'message', 'directory', 'bloggers', 'add', 'rss', 'discussion') );
      $this->Auth->autoRedirect = true;
      $this->set('cU', $this->Auth->user());  // $cU current user array to use in the views if user logged

trunk/app/config/core.php

@@ -14 +14 @@
  * In development mode, you need to click the flash message to continue.
  */
-    Configure::write('debug', 2);
+    Configure::write('debug', 1);
 /**
  * Application wide charset encoding

trunk/app/config/sql/karamelo_postgres.sql

@@ -224 +224 @@
  forum_id integer NOT NULL REFERENCES forums(id) ON DELETE CASCADE,
  user_id integer NOT NULL REFERENCES users(id) ON DELETE CASCADE,
- status int NOT NULL DEFAULT 0,
+ status int NOT NULL DEFAULT 1,
  level int NOT NULL DEFAULT 0,   --level 0 = topic starts
  topic_id int NOT NULL DEFAULT 1, -- topic id and level 2 giveme answers 

trunk/app/controllers/acquaintances_controller.php

@@ -63 +63 @@
     {
        $this->Sanitize = new Sanitize;
-       
-       $this->Sanitize->clean($this->data["Acquaintance"]); 
+       $this->data['Acquaintance']['url'] = trim($this->data['Acquaintance']['url']);
+       $this->Sanitize->clean($this->data['Acquaintance']); 
        
        $this->data['Acquaintance']['user_id'] = $this->Auth->user('id');

trunk/app/controllers/catforums_controller.php

@@ -41 +41 @@
         
         $this->Edublog->blog($user_id);
-    }
-    
-    /**** 
-        ======= ADMIN SECTION   =======
-    ******/
-    public function admin_listing($admin = null, $order=null)
-    {
+ }
+  
+ /**** 
+        ======= ADMIN METHODS   =======
+ ******/
+ public function admin_listing($admin = null, $order=null)
+ {
         $this->layout = 'admin';
         

trunk/app/controllers/forums_controller.php

@@ -26 +26 @@
  }
 
- public function display($title, $username, $user_id, $forum_id) 
+ public function display($forum_id) 
  {      
-        $this->pageTitle = $title . ' Forum';
-        
         $conditions = array("Forum.id"=>$forum_id);
         
-        $fields     = array("Forum.title", "Forum.id", "Forum.user_id", "Forum.description", "Forum.catforum_id"); 
+        $fields     = array("Forum.title", "Forum.id", "Forum.user_id", "Forum.description", "Forum.catforum_id", "Topic.id"); 
+
+        $data       = $this->Forum->find($conditions, null, null, 2);
+
+        $this->pageTitle = $data['Catforum']['title'] . ' Forum';
+        //die(debug($data));
+        $this->set('data', $data);
         
-        $this->set('data', $this->Forum->find($conditions, $fields, null, 2));
+    $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) 
+ {      
+        $conditions = array("Topic.id = $topic_id OR Topic.topic_id=$topic_id");
+        
+        $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')));
+        
+        $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);
@@ -40 +61 @@
         $this->Edublog->blog($user_id); // blogger elements
  }
- 
+
  public function view($username, $user_id, $forum_id, $topic_id) 
  {      
@@ -87 +108 @@
    if ( !empty( $this->data['Forum'] ) )
    {
-     // die( debug( $this->data ) );
      $this->Sanitize = new Sanitize;
      
@@ -109 +129 @@
   public function admin_edit($id = null)
   {
-    if (empty($this->data["Forum"]))
+    if (empty($this->data['Forum']))
     {   
         $this->layout = 'admin';
@@ -121 +141 @@
         $this->Sanitize = new Sanitize;
     
-    $this->Sanitize->clean($this->data["Forum"]);
+    $this->Sanitize->clean($this->data['Forum']);
      
-        if ($this->Forum->save($this->data["Forum"]))
+        if ($this->Forum->save($this->data['Forum']))
         {
             $this->msgFlash('Forum updated', '/admin/catforums/listing');
@@ -129 +149 @@
         }
     }
-}
-
+ }
+  // change status published/draft
+  public function admin_change($id, $status)
+  {  
+    $this->data['Forum']['status'] = ($status == 0 ) ? 1 : 0;
+     
+    $this->data['Forum']['id']     = $id;
+     
+    if ($this->Forum->save($this->data['Forum']))
+    {
+    $this->msgFlash('Forum status changed', '/admin/catforums/listing/');
+    }
+  }
  public function admin_delete($id)
  {

trunk/app/controllers/topics_controller.php

@@ -42 +42 @@
      $order      = "Topic.created DESC";
      
-     $this->set('data', $this->Topic->findAll($conditions, $fields, $order, null, null, 1));
-   
+     $this->set('data', $this->Topic->findAll($conditions, $fields, $order, null, null, 1));   
    }
 
@@ -53 +52 @@
      
      $this->set('blog', $this->Edublog->blog($user_id));
-     
-     $this->set('topic_id', $topic_id);
-     $this->set('forum_id', $forum_id);
-     
+          
      $conditions = array("Topic.status"=>1, "Topic.id"=>$topic_id);
      $fields     = array("Topic.id", "Topic.subject", "Topic.message", "Topic.created", "Topic.user_id", "Topic.forum_id");
@@ -76 +72 @@
     }
    
-   public function add($username=null, $forum_name=null, $user_id = null, $forum_id = null) 
+   public function add($username=null, $forum_id = null) 
    {
     
@@ -97 +93 @@
     else 
     {
+      $user_id = $this->Topic->User->field('id', array('User.username'=>$username));
+
       $this->layout    = $this->Edublog->layout($user_id);
        
@@ -118 +116 @@
        if ($this->Topic->save($this->data))
        { 
-           $this->flash('New topic had been added.','/topics/view/'.$this->data['Topic']["user_id"].'/'. $this->data['Topic']['forum_id']);
+         $this->flash('New topic had been added.','/topics/view/'.$this->data['Topic']["user_id"].'/'. $this->data['Topic']['forum_id']);
        }
      } 
@@ -132 +130 @@
  
  public function edit($id = null)
-  {
+ {
     if (empty($this->data))
     {
@@ -146 +144 @@
         }
     }
+ }
+
+ // change status published/draft
+ public function admin_change($id, $status, $forum_id)
+ {  
+   //   die(' el intvade del status es '. intval($status));
+    if ( !intval($id) ||  !is_numeric($status)  ||  !intval($forum_id) )
+    { 
+      $this->redirect('/');
+    }
+    
+    $this->data['Topic']['status'] = ($status == 0 ) ? 1 : 0;
+     
+    $this->data['Topic']['id']     = $id;
+     
+    if ($this->Topic->save($this->data['Topic']))
+    {
+    $this->msgFlash('Topic status changed', '/admin/forums/topics/'.$forum_id);
+    }
+ }
+
+ public function delete($topic_id, $forum_id)
+ {
+     if ( $this->Topic->del($topic_id) )
+     {
+        $this->msgFlash('','/admin/forums/topics/'.$forum_id);
+     }
+ }  
 }
-  
-  public function delete($id)
-  {
-        // deletes task from database
-        $this->Topic->del($id);
-        $this->flash('Your virtual classroom  has been updated.','/vclassrooms');
-  }
-  
-}

trunk/app/models/catforum.php

@@ -10 +10 @@
 {
   public $name = 'Catforum';
-  
+
+  public $belongsTo = array('User' =>
+                  array('className'     => 'User')
+                );
+                               
   public $hasMany = array('Forum' =>
                          array('className'     => 'Forum',

trunk/app/models/forum.php

@@ -13 +13 @@
                                      array('className'  => 'Topic', 
                                            'foreignkey' => 'forum_id',
-                                           'conditions' => null,
-                                           'order'      => null,
+                                           'conditions' =>  null,
+                                           'order'      => 'id ASC',
                                            'fields'     => null
                                            ));

trunk/app/models/topic.php

@@ -14 +14 @@
                                            'foreignkey' => 'forum_id'),
                           'User' => 
-                                     array('className' => 'User', 
-                                           'foreignkey' => 'user_id')
+                                     array('className'  => 'User', 
+                                           'foreignkey' => 'user_id',
+                                           'fields'     => 'username, id')
                                            ); 
 

trunk/app/views/catforums/display.ctp

@@ -12 +12 @@
       foreach ( $val['Forum'] as $v)
       {
-         echo '<div style="vertical-align:middle;padding:6px;margin:10px 10px 10px 20px;border:1px solid orange"';
-            echo $html->link($html->image('static/forum.gif', array("alt"=>"Forum: ". $v["description"], "title"=>"Forum: ". $v["description"])), 
-                    '/forums/display/'.$v["title"].'/'.$blog["User"]["username"].'/'.$v["user_id"].'/'.$v["user_id"], null, null, false) . '  ';
-            echo $html->link($v["title"], '/forums/display/'.$v["title"].'/'.$blog["User"]["username"].'/'.$v["user_id"].'/'.$v["id"], array("style"=>"font-weight:bold")) . ' ' . $v["description"] . '<br />';
+         echo '<div style="vertical-align:middle;padding:6px;margin:10px 10px 10px 20px;border:1px solid orange;">';
+            echo $html->link(
+                             $html->image(
+                                          'static/forum.gif', 
+                                          array('alt'=>"Forum: ".$v['description'], 'title'=>"Forum: ".$v['description'])), 
+                             '/forums/display/'.$v["title"].'/'.$v["user_id"], 
+                             null, null, false) . '  ';
+
+        echo $html->link($v['title'], '/forums/display/'.$v['id'], array('style'=>'font-weight:bold'))
+.' '.$v['description'].'<br />';
         echo '</div>';
       }

trunk/app/views/entries/admin_start.ctp

@@ -45 +45 @@
 </div>
 
-<!-- div class="main-item" title="Forums" onclick="document.location.href = '/admin/catforums/listing'">
-  <span class="main-item-icon">
-     <?php echo $html->link($html->image('messages.png', array("title"=>"Forums", "alt"=>"Forums")), '/admin/catforums/listing', null, null, false); ?>
-  </span>
-  <a href="/admin/catphorums/listing" title="Phorums" class="main-item-caption">Forums</a>
-</div -->
+<div class="main-item" title="Forums" onclick="document.location.href = '/admin/catforums/listing'">
+  <span class="main-item-icon">
+     <?php echo $html->link($html->image('static/forums.png', array("title"=>"Forums", "alt"=>"Forums")), '/admin/catforums/listing', null, null, false); ?>
+  </span>
+  <a href="/admin/caforums/listing" title="Phorums" class="main-item-caption">Forums</a>
+</div>
 
 <div class="main-item" title="Glossary" onclick="document.location.href = '/admin/cat/glossaries/list'">

trunk/app/views/forums/admin_topics.ctp

@@ -1 @@
-<?php
-//die( debug($data));
-?>
-
 <div class="title_section">Topics on Forum <?php echo $data['Forum']['title']; ?></div>
 
@@ -22 +18 @@
 -->
 </script>
-
-<p>
-    <?php echo $html->link($html->image('admin/new.gif', array("alt"=>"Add new", "title"=>"Add new")), '#', 
-    array("onclick"=>"hU()"), false, false) ?>
-</p>
-    
-<table class="tbadmin" id="tbl">
 <?php
 foreach ($data['Topic'] as $val)
  {
+   $st =  ($val['status'] == 1 ) ? 'Published' : 'Hidden';
    $t  =  '<b>'.$val['subject']  . '</b><br />';
-   $t .=  $val['message']   . '<br />';
-   $t .=  $val['status']    . '<br />';
-   $t .=  $val['created']   . '<br />';
-
-   echo $html->div('topics', $t);
+   $t .=  $val['message']        . '<br />';
+   $t .=  'Status: ' .   $html->link($st, '/admin/topics/change/'.$val['id'].'/'.$val['status'].'/'.$val['forum_id'], array('title'=>'Change status'))      . '<br />';
+   $t .=  $val['created']         . '<br />';
+   
+   echo $html->div('adminblock', $t);
  }
 ?>

trunk/app/views/forums/display.ctp

@@ -1 +1 @@
 <?php
 //die(print_r($data));
-echo '<p>Foro: '. $html->link($data["Catforum"]["title"], '/catforums/display/'.$blog["User"]["username"].'/'.$blog["User"]["id"].'/'.$data["Catforum"]["id"]) . '</p>';
+echo $html->para(null, 'Foro: '. $html->link($data["Catforum"]["title"], '/catforums/display/'.$blog["User"]["username"].'/'.$blog["User"]["id"].'/'.$data["Catforum"]["id"]));
 
-  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">';
-                echo $data["Forum"]["title"];
-         echo '</div>';
-         echo '<span ="font-size:pt">'. $data["Forum"]["description"] . "</span>";
+ 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->link($html->image('static/new_post.gif', array("alt"=>"Add new topic", "title"=>"Add new topic")), 
+                      '/topics/add/'.$blog["User"]["username"].'/'.$data["Forum"]["id"], 
+                      null, null, false);
+     echo '</div>';
          
-         echo '<div style="width:100px;margin-top:15px">';
-         echo $html->link($html->image('static/new_post.gif', array("alt"=>"Add new topic", "title"=>"Add new topic")), 
-                      '/topics/add/'.$blog["User"]["username"].'/'.$data["Forum"]["title"].'/'.$data["Forum"]["id"].'/'.$data["Forum"]["user_id"], null, null, false);
-         echo '</div>';
-         
-         //Topics
-         echo '<table style="border-collapse:collapse;width:100%">';
-            
-            if ( count($data["Topic"]) == 0)
-            {
+     //Topics
+     echo '<table style="border-collapse:collapse;width:100%">';
+        if ( count($data["Topic"]) == 0)
+        {
                  echo '<tr><td colspan="6"><br /><h4>There is not topic on this forum yet</h4></td></tr>';
-            }
-            else
-            {
+        }
+        else
+        {
                 $th = array('Read', 'Topics', 'Replies', 'Author', 'Views', 'Last Post');
                 echo $html->tableHeaders($th);
-            }
-            //die(print_r($data["Topic"]));
+        }
+        //die(print_r($data["Topic"]));
             
-            foreach ($data["Topic"] as $val)
-            {
-             $tr = array (
-                   $html->image('static/folder.gif'),
-                   $html->link($val['subject'], '/topics/display/'.$Element[0]["User"]["username"].'/'.$Element[0]["User"]["id"].'/'.$data["Forum"]["id"].'/'.$val['id']),
+        foreach ($data["Topic"] as $val)
+        {
+     if ($val['level'] == 0)
+     {
+         $tr = array (
+         $html->image('static/folder.gif'), 
+         $html->link($val['subject'], '/forums/discussion/'.$data['Forum']['user_id'].'/'.$val['forum_id'].'/'.$val['id']),
                    count($data["Topic"]),
                    $val["User"]["username"],
@@ -40 +39 @@
                
                echo $html->tableCells($tr, array("style"=>"border:1px solid gray;padding:6px;background-color:#e8f6fe"), 
-                                           array("style"=>"border:1px solid gray;padding:6px;background-color:#c0c0c0"));
-             }
+                                            array("style"=>"border:1px solid gray;padding:6px;background-color:#c0c0c0"));
+     }
+         }
               
           echo '</table>';

trunk/app/views/topics/display.ctp

@@ -1 +1 @@
 <?php
-//die(var_dump($data));
+die(debug($data));
 echo '<div>';
-echo $html->link($html->image('static/new_topic.gif', array("alt"=>"New topic", "title"=>"New topic")), '/topics/add/'.$blog[0]["User"]["id"].'/'.$phorum_id, false, false, null); 
+
+echo $html->link(
+                 $html->image(
+                              'static/new_topic.gif', array("alt"=>"New topic", "title"=>"New topic")
+                             ),
+                  '/topics/add/'.$blog[0]["User"]["id"].'/'.$phorum_id, 
+                  false, false, null
+                 ); 
 
 echo $html->link($html->image('static/reply.gif', array("alt"=>"Reply", "title"=>"Reply")), '/topics/reply/'.$blog[0]["User"]["id"].'/'.$topic_id, false, false, null); 

trunk/app/views/users/portfolio.ctp

@@ -19 +19 @@
 
 <div class="portfolio" id="forums"  onmouseover="changecolor(this.id, 'yellow');" onMouseOut="changecolor(this.id, '#ffcc00');">
-     <?php echo $html->link($html->image('phorum.png', array("title"=>"Forums", "alt"=>"Forums")), '/catforums/display/'.$blog["User"]["username"] .'/'. $blog["User"]["id"], null, null, false); ?><br />
+     <?php echo $html->link($html->image('static/forums.png', array("title"=>"Forums", "alt"=>"Forums")), '/catforums/display/'.$blog["User"]["username"] .'/'. $blog["User"]["id"], null, null, false); ?><br />
         Forums
 </div>

trunk/app/webroot/css/cpanel/cpanel.css

@@ -1018 +1018 @@
 }
 
+.adminblock{ margin:2px;padding:2px;border:1px dotted gray; }
+

trunk/app/webroot/css/rubyx/rubyx.css

@@ -16 +16 @@
 * {min-height:1px;}
 body {border:0; margin:0; padding:0; background:#fff1f3 url("/css/rubyx/img/bg.gif") 0 0 repeat-x; font:70%/160% "verdana",sans-serif; color:#7f000b; _text-align:center;}
+
+.topic{padding:4px;border:1px dotted gray; margin:3px; }
 
 a {color:#7f000b;}