Changeset 325

Timestamp:

03/19/08 16:27:43 (10 months ago)

Author:

aarkerio

Message:

Little changes on edublog entry and I added replies controller to answer topics

Location:

trunk/app

Files:

• app_controller.php (modified) (1 diff)
• config/core.php (modified) (1 diff)
• config/sql/karamelo_postgres.sql (modified) (3 diffs)
• controllers/catforums_controller.php (modified) (4 diffs)
• controllers/comments_controller.php (modified) (3 diffs)
• controllers/components/edublog.php (modified) (1 diff)
• controllers/forums_controller.php (modified) (2 diffs)
• controllers/replies_controller.php (added)
• controllers/topics_controller.php (modified) (8 diffs)
• views/catforums/admin_edit.ctp (modified) (2 diffs)
• views/catforums/admin_listing.ctp (modified) (1 diff)
• views/catforums/display.ctp (modified) (1 diff)
• views/forums/display.ctp (modified) (2 diffs)
• views/layouts/admin.ctp (modified) (1 diff)
• views/layouts/rubyx.ctp (modified) (1 diff)
• views/topics/display.ctp (modified) (1 diff)
• views/topics/reply.ctp (modified) (1 diff)
• views/topics/view.ctp (modified) (3 diffs)
• views/users/entry.ctp (modified) (2 diffs)

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', 'entry', 'download', 'blog','portfolio', 'about', 'message', 'directory', 'bloggers', 'add', 'rss', 'discussion') );
+     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'reply', 'register', 'insert', 'vote', 'entry', '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

@@ -198 +198 @@
 );
 
---Forums tables
+-- ** Forums tables beggins **
 CREATE TABLE catforums (  -- phorums categories
  id serial PRIMARY KEY,
@@ -217 +217 @@
 );
 
-CREATE TABLE topics ( -- question and aswers in phorums  
+CREATE TABLE topics ( -- question and aswers in forums  
  id serial PRIMARY KEY,
  subject varchar(150) NOT NULL,
@@ -225 +225 @@
  user_id integer NOT NULL REFERENCES users(id) ON DELETE CASCADE,
  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 
  views int NOT NULL DEFAULT 0  -- number of times the topic has been seen
 );
+
+CREATE TABLE replies ( -- replies to topics in forums  
+ id serial PRIMARY KEY,
+ reply text NOT NULL,
+ created timestamp(0) with time zone DEFAULT now() NOT NULL,
+ topic_id integer NOT NULL REFERENCES topics(id) ON DELETE CASCADE,
+ user_id integer NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+ status int NOT NULL DEFAULT 1
+);
+-- ** Forums tables ends **
 
 -- News letters

trunk/app/controllers/catforums_controller.php

@@ -46 +46 @@
         ======= ADMIN METHODS   =======
  ******/
- public function admin_listing($admin = null, $order=null)
+ public function admin_listing()
  {
         $this->layout = 'admin';
@@ -54 +54 @@
         $conditions = array("user_id"=>$this->Auth->user('id'));
         
-        if ($this->Auth->user('group_id') == 1 && $admin != null)
-        {
-            $conditions["website"] = 1;
-        }
+        $fields     = array("id", "title", "description","created", "status");
+        
+        $order      = 'Catforum.id ASC';
         
-        $fields     = array("id", "title", "description","created", "status");
-        
-        $this->set('data', $this->Catforum->findAll($conditions, $fields, $order, null, null, 2)); 
+        $this->set('data', $this->Catforum->findAll($conditions, $fields, $order)); 
     
-    }
-    
-    public function admin_add() 
-    {
-    
-     $this->layout = 'admin';
-        // adds new classroom to database
-     if (!empty($this->data['Catforum']))
-     {     
+ }
+ 
+ public function admin_add() 
+ {
+  
+  $this->layout = 'admin';
+  // adds new classroom to database
+  if (!empty($this->data['Catforum']))
+  {       
           $this->Sanitize = new Sanitize;
           
@@ -108 +105 @@
         }
     }
-  }
-  
-  public function admin_delete($id)
-  {
+ }
+ // change status published/draft
+ public function admin_change($status, $forum_id)
+ {  
+    if ( !is_numeric($status)  ||  !intval($forum_id) )
+    { 
+      $this->redirect('/');
+    }
+    
+    $this->data['Forum']['status'] = ($status == 0 ) ? 1 : 0;
+     
+    $this->data['Forum']['id']     = $id;
+     
+    if ($this->Forum->save($this->data['Forum']))
+    {
+    $this->msgFlash('Status changed', '/admin/catforums/listing');
+    }
+ }
+ 
+ public function admin_delete($id)
+ {
         // deletes task from database
         $this->Catforum->del($id);
@@ -117 +131 @@
                 $this->msgFlash('Forum deleted', '/admin/catforums/listing');
                 exit();
-  }
  }
+}
 ?>

trunk/app/controllers/comments_controller.php

@@ -45 +45 @@
       }
       
-      // print_r($conditions);
-      
       $fields     = array("id", "title", "description", "pubdate", "size");
       $order      = "id DESC";
@@ -57 +55 @@
  public function add() 
  {
-      
       if (!empty($this->data["Comment"]) )
       {
+       
        $this->Sanitize = new Sanitize;
        
-       $this->Sanitize->cleanArray($this->data["Comment"]); //Hopefully this is enough
+       $this->Sanitize->clean($this->data["Comment"]); //Hopefully this is enough
        
        $this->Comment->create();
-        
+       
         if ($this->Comment->save($this->data["Comment"]))
         {
            $this->msgFlash('Comment added', $this->data['Comment']['redirect_to'].'/#comments');
-           exit();
         }
       }
@@ -80 +77 @@
  public function admin_listing()
  {    
-      $this->pageTitle = $this->othAuth->user('username') . '\'s Comments';
+      $this->pageTitle = $this->Auth->user('username') . '\'s Comments';
       
       $this->layout = 'admin';
       
-      $conditions   = array("Comment.user_id"=>$this->othAuth->user('id'));
+      $conditions   = array("Comment.user_id"=>$this->Auth->user('id'));
       $fields       = array("Comment.id", "Comment.created", "Comment.comment", "Comment.user_id", "Comment.username", "Entry.title", "Entry.id");
       $order        = "Comment.id DESC";

trunk/app/controllers/components/edublog.php

@@ -1 +1 @@
 <?php 
 /**
- * Edublog component By Manuel Montoya.
- * comments, bug reports are welcome:     manuel _AT_ mononeurona _DOT_ org
+ * Edublog component By Manuel Montoya. 2002-2008
+ * comments, bug reports are welcome:     manuel _ARROBA_ mononeurona _PUNTO_ org
  * @author aarkerio
  * @version 0.2

trunk/app/controllers/forums_controller.php

@@ -150 +150 @@
     }
  }
-  // change status published/draft
-  public function admin_change($id, $status)
-  {  
+ // change status published/draft
+ public function admin_change($status, $forum_id)
+ {  
+    if ( !is_numeric($status)  ||  !intval($forum_id) )
+    { 
+      $this->redirect('/');
+    }
+    
     $this->data['Forum']['status'] = ($status == 0 ) ? 1 : 0;
      
@@ -159 +164 @@
     if ($this->Forum->save($this->data['Forum']))
     {
-    $this->msgFlash('Forum status changed', '/admin/catforums/listing/');
+    $this->msgFlash('Status changed', '/admin/catforums/listing');
     }
-  }
+ }
+ 
  public function admin_delete($id)
  {

trunk/app/controllers/topics_controller.php

@@ -16 +16 @@
  public function isAuthorized()
  {
-          if (isset($this->params[Configure::read('Routing.admin')]))
-         {
-              if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 )
-              {
-                    return true;
-              }
-         }
+     if (isset($this->params[Configure::read('Routing.admin')]))
+     {
+          if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 )
+          {
+                return true;
+          }
+     }
   return false;
  }
  
- public function view($user_id, $forum_id)
+ public function view($username, $forum_id)
  {
      $this->pageTitle = 'Forums';
-     
+     
+     $user_id = $this->Topic->User->field('id', array('User.username'=>$username));
+     
      $this->layout    = $this->Edublog->layout($user_id);
      
@@ -57 +59 @@
      $order      = "Topic.created DESC";
      
-     $this->set('data', $this->Topic->findAll($conditions, $fields, $order));
+     $this->set('data', $this->Topic->find($conditions, $fields, $order));
  }
  
@@ -73 +75 @@
  public function add($username=null, $forum_id = null) 
  {
-  
    if (!empty($this->data['Topic']))
    { 
-     
      $this->Sanitize = new Sanitize;
      
@@ -87 +87 @@
      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('Topic added', '/forums/display/'.$this->data['Topic']['forum_id']);
      }
    } 
@@ -93 +93 @@
    {
       $user_id = $this->Topic->User->field('id', array('User.username'=>$username));
-
+      
       $this->layout    = $this->Edublog->layout($user_id);
-       
+      
       $this->Edublog->blog($user_id);
-       
+      
       $this->set('forum_id', $forum_id);
     }
@@ -103 +103 @@
  }
  
-  public function reply($user_id = null, $forum_id = null) {
-    
-    // adds new topic to forum
-    if (!empty($this->data["Topic"]))
-    { 
-       // die(print_r($this->data));
-       $this->Sanitize = new Sanitize;
-      
-       $this->Sanitize->cleanArray($this->data["Topic"]);
-      
-       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']);
-       }
-     } 
-     else 
-     {
+ public function reply($user_id, $forum_id, $topic_id) 
+ {
+    // adds new reply to topic
+
        $this->layout    = $this->Edublog->layout($user_id);
        
@@ -125 +112 @@
        
        $this->set('forum_id', $forum_id);
-    }
+       $this->set('topic_id', $topic_id);
  }
  
@@ -160 +147 @@
     if ($this->Topic->save($this->data['Topic']))
     {
-    $this->msgFlash('Topic status changed', '/admin/forums/topics/'.$forum_id);
+       $this->msgFlash('Topic status changed', '/admin/forums/topics/'.$forum_id);
     }
  }

trunk/app/views/catforums/admin_edit.ctp

@@ -1 +1 @@
 <div class="spaced">
 <?php 
-    echo $html->formTag('/admin/catforums/edit/', 'post'); 
-    echo $html->hidden('Catforum/id');
+    echo $form->create('Catforum'); 
+    echo $form->hidden('Catforum.id');
 ?>
 <fieldset>
@@ -8 +8 @@
 
 <?php
-    echo $form->labelTag('Catforum/title', 'Title:') . "<br />";
-    echo $html->input('Catforum/title', array('size'=>60, 'maxlength'=>90));
-    echo $html->tagErrorMsg('Catforum/title','Please enter a title.'); 
+    echo $form->input('Catforum.title', array('size'=>60, 'maxlength'=>90));
+    echo $form->error('Catforum.title','Please enter a title.'); 
 ?>
 <br />
 <br />
 <?php 
-   echo $form->labelTag('Catforum/description', 'Description:') . "<br />"; 
-   echo $html->input('Catforum/description', array("size" => 60, "maxlength" => 90));
-   echo $html->tagErrorMsg('Catforum/description','Please enter a description.');
+   echo $form->input('Catforum.description', array("size" => 60, "maxlength" => 90));
+   echo $form->error('Catforum.description','Please enter a description.');
 ?>
 
 <br /><br />
-<?php echo $form->labelTag('Catforum/status', 'Status:') . "<br />"; ?>
-<?php echo $html->checkbox('Catforum/status'); ?>
+<?php 
+    echo $form->label('Catforum.status', 'Status:') . "<br />";
+    echo $form->checkbox('Catforum.status', array('value'=>1));
+?>
 <br /><br />
-<p style="clear:both"></p>
-<?php echo $html->submit('Update') ?>
-</fieldset>
-</form>
+<p style="clear:both"></p></fieldset>
+<?php echo $form->end('Update'); ?>
+
 </div>
 

trunk/app/views/catforums/admin_listing.ctp

@@ -60 +60 @@
          echo '<tr><td>&nbsp;</td> <td> '.  $gags->sendEdit($v["id"], 'forums') .'</td>';
          echo '<td>' . $html->link($v["title"], '/admin/forums/topics/'.$v['id']) .'</td>  <td colspan="2"> '. $v["description"] .' </td>';
-         echo '<td>' . $gags->setStatus($v['status']).'</td>  <td> ' .  $gags->confirmDel($v['id'], 'forums') . '</td> </tr>';
+         echo '<td>' . $html->link($gags->setStatus($v['status']), '/admin/forums/change/'.$v['status'].'/'.$v['id']).'</td>  <td> ' .  $gags->confirmDel($v['id'], 'forums') . '</td> </tr>';
       }
  }

trunk/app/views/catforums/display.ctp

@@ -27 +27 @@
  }
 ?>
-

trunk/app/views/forums/display.ctp

@@ -5 +5 @@
  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")), 
+    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>';
          
-     //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)
-        {
-     if ($val['level'] == 0)
-     {
-         $tr = array (
+      foreach ($data["Topic"] as $val)
+      {
+         $tr = array (
          $html->image('static/folder.gif'), 
          $html->link($val['subject'], '/topics/display/'.$data['Forum']['user_id'].'/'.$val['forum_id'].'/'.$val['id']),
@@ -40 +38 @@
                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"));
-     }
-         }
+       
+       }
               
-          echo '</table>';
-            
-     echo '</div>';
+       echo '</table>'; 
+       echo '</div>';
  
  

trunk/app/views/layouts/admin.ctp

@@ -50 +50 @@
 
    <div id="footer">
-          <p>Powered by the <a href="http://www.chipotle-software.com/" rel="external">Karamelo Project &copy; GPLv3</a></p>
+          <p>Powered by the <a href="http://www.chipotle-software.com/" rel="external">Karamelo Project &copy; 2002-2008 GPLv3</a> </p>
    </div>
 

trunk/app/views/layouts/rubyx.ctp

@@ -172 +172 @@
                 <p id="createdby">created by <a href="http://www.nuvio.cz">Nuvio | Webdesign</a> <!-- DON?T REMOVE, PLEASE! --></p> 
              
-            <p id="copyright">Chipotle Software &copy; 2002-2007. Creative Commons. Some rights reserved.</p> 
+            <p id="copyright">Chipotle Software &copy; 2002-2008. Creative Commons. Some rights reserved.</p> 
         </div> <!-- /footer --> 
  

trunk/app/views/topics/display.ctp

@@ -1 +1 @@
 <?php
-die(debug($data));
+//die(debug($data));
+
+echo '<h1>'. $data['Forum']['title'] .'</h1>';
+echo '<p>'. $data['User']['username'] . ' write: <b>'.$data['Topic']['subject'] .'</b>  <span class="dates">'.$data['Topic']['created'].'</span></p>';
+
 echo '<div>';
 
-echo $html->link(
+echo $html->link(  // add topic
                  $html->image(
                               'static/new_topic.gif', array("alt"=>"New topic", "title"=>"New topic")
                              ),
-                  '/topics/add/'.$blog[0]["User"]["id"].'/'.$phorum_id, 
+                  '/topics/add/'.$blog["User"]["username"].'/'.$data['Forum']['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); 
+echo $html->link(  // add reply
+                 $html->image(
+                              'static/reply.gif', array("alt"=>"Reply", "title"=>"Reply")), 
+                              '/topics/reply/'.$blog["User"]["id"].'/'.$data['Forum']['id'] .'/'.$data['Topic']['id'], 
+                              false, false, null); 
 
 echo '</div>';
+
 echo '<div style="padding:5px;border:1px dotted black;background-color:#c0c0c0;margin:10px 5px 10px 5px">';
-    
-foreach ($data as $key => $val) {
-    echo '<div> Title:<a href="/topics/display/'.$data[$key]['Topic']['id'].'">'. $data[$key]['Topic']['subject'].'</a><br />';
-    echo $data[$key]['Topic']['message'];
+ 
+ if ( count($data['Reply']) < 1 )
+ {
+     echo '<h2>No replies yet</h2>';
+ }
+ 
+ foreach ($data['Reply'] as $val) 
+ {
+    echo '<div> Title:<a href="/topics/display/'.$val['id'].'">'. $val['subject'].'</a><br />';
+    echo $val['message'];
     
     echo '</div>'; 
-}
+ }
 echo '</div>';
 
 
-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/reply.gif', array("alt"=>"Reply", "title"=>"Reply")), '/topics/reply/'.$blog[0]["User"]["id"].'/'.$topic_id, false, false, null); 
-
-
-echo '</div>';
-
 ?>

trunk/app/views/topics/reply.ctp

@@ -1 +1 @@
 
-<?php echo $javascript->link('myfunctions'); ?>
-
-<div>
-<?php echo $html->addCrumb('Phorums', '/phorums/view/'.$blog[0]["User"]["id"]); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
-</div>
-<div class="title_section">New Topic</div>
+<div class="title_section">Reply</div>
 
 <div class="spaced">
 
-<?php //echo $html->formTag('/topics/add/'. $blog[0]["User"]["id"] .'/'. $phorum_id, 'post'); 
+<?php 
+ if ( isset ($cU) ):
+   echo $form->create('Reply', array('action'=>'add'));
+   echo $form->hidden('Reply.redirect_to', array('value'=>'/topics/display/'.$blog['User']['id'].'/