Changeset 321

Timestamp:

03/12/08 13:35:16 (10 months ago)

Author:

aarkerio

Message:

Changes on Forums

Location:

trunk/app

Files:

• app_controller.php (modified) (1 diff)
• controllers/forums_controller.php (modified) (1 diff)
• controllers/podcasts_controller.php (modified) (9 diffs)
• controllers/topics_controller.php (modified) (4 diffs)
• models/forum.php (modified) (1 diff)
• models/podcast.php (modified) (1 diff)
• views/catforums/admin_listing.ctp (modified) (1 diff)
• views/forums/admin_edit.ctp (modified) (2 diffs)
• views/forums/admin_topics.ctp (added)
• views/forums/display.ctp (modified) (2 diffs)
• views/podcasts/rss.ctp (modified) (3 diffs)
• views/topics/add.ctp (modified) (2 diffs)
• webroot/img/static/logout.gif (added)

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') );
+     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'register', 'insert', 'vote', 'download', 'blog','portfolio', 'about', 'message', 'directory', 'bloggers', 'add', 'rss') );
      $this->Auth->autoRedirect = true;
      $this->set('cU', $this->Auth->user());  // $cU current user array to use in the views if user logged

trunk/app/controllers/forums_controller.php

@@ -66 +66 @@
     $this->set('data', $this->Forum->findAll($conditions));
  }
+
+ public function admin_topics($forum_id) 
+ {  
+    if ( !intval($forum_id) )
+    {
+      $this->redirect('/');
+    }
+
+    $this->layout = 'admin';
+    
+    $conditions   = array("Forum.user_id"=>$this->Auth->user('id'), "Forum.id"=>$forum_id);
+    
+    $this->set('data', $this->Forum->find($conditions));
+ }
  
  public function admin_add($catforum_id = null) 

trunk/app/controllers/podcasts_controller.php

@@ -3 +3 @@
 *  Karamelo E-Learning Platform
 *  Manuel Montoya 2002-2008 
-*  GPLv3 manuel<arroba>mononeurona<punto>org
+*  GPLv3 manuel<at>mononeurona<punto>org
 */ 
 
@@ -10 +10 @@
 
 class PodcastsController extends AppController {
-   
-   public $helpers    = array('Ajax', 'Gags');
-   
-   public $components = array('Edublog');
-   
-   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;
-                 }
-       }
-        return false;
-  }
-                                                            
-  public function index($username=null, $entry_id=null)
-  {   
-       $this->pageTitle = $username . '\'s Podcast';
-        
-       $conditions      = array("status"=>1); // podcast must be actived
-        
-       if ($username != null)
-       {
-            $user_id    = $this->User->field('id', array("username"=>$username));
-            
-            $conditions["user_id"] = $user_id;
-            
-            $this->set('username', $username);
-       }
-         
-       if ($entry_id != null)
-       {
-           $conditions["id"] = $entry_id;  
-        }
-        
-        $fields     = array("id", "title", "description", "created", "lenght", "user_id", "filename");
-        $order      = "id DESC";
-        $limit      = 12;
-        
-        $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit, null, true)); 
-  }
-
- public function display($username, $user_id) 
- { 
-       $this->pageTitle = $username .'\'s Podcast';
-        
-       $conditions      = array("Podcast.status"=>1, "Podcast.user_id"=>$user_id);
-        
-       $fields          = array("Podcast.id", "Podcast.title", "Podcast.created", "Podcast.user_id",  "Podcast.filename",  "Podcast.description");
-        
-       $order           = "Podcast.title";
-        
-       $this->set('data', $this->Podcast->findAll($conditions, $fields, $order)); 
-        
-       $this->layout    = $this->Edublog->layout($user_id);
-        
-       $this->Edublog->blog($user_id); // blogger elements
+      
+ public $helpers    = array('Javascript', 'Ajax', 'User', 'Gags');
+
+ public function rss($username) 
+ {   
+    $this->layout = "rss";
+    
+    if ($username == null)
+    {
+        $this->redirect('/');
+    }
+    
+    $this->Podcast->User->unbindModel(array('hasMany'=>array('Entry', 'Lesson', 'Category', 'Vclassroom', 'Faq', 'Acquaintance')));
+
+    $User =  $this->Podcast->User->find(array("User.username"=>$username));
+    //die(debug($User));
+    $this->set('User', $User);
+
+    // die(debug($User));
+
+    $conditions = array("status"=>1, "user_id"=>$User['User']['id']);
+    
+    $fields     = array("Podcast.id", "Podcast.title", "Podcast.description", "Podcast.created", "Podcast.duration", "Podcast.title", "Podcast.description");
+    
+    $order = "Podcast.created DESC";
+
+    $limit = 12;
+    
+    $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit));
  }
    
@@ -85 +55 @@
         $this->set('data', $this->Podcast->findAll($conditions, $fields));
     }
-  
- public function all($username=null, $entry_id=null) 
- {     
-   $this->layout    = 'portal';
-        
-   $this->pageTitle = $username . '\'s Podcast';
-        
-   $conditions      = array("status"=>1);
-        
-   if ($username != null)
-   {
-     $user_id    = $this->User->field('id', array("username"=>$username));
-            
-     $conditions["user_id"] = $user_id;
-   }
-                
-   if ($entry_id != null)
-   {
-     $conditions["id"] = $entry_id;  
-   }
-        
-   // print_r($conditions);
-        
-   $fields     = array("id", "title", "description", "created", "length", "duration");
-   $order      = "id DESC";
-   $limit      = 12;
-        
-   $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit, null, true)); 
-     
-   $this->set('Element', $this->Portal->statics()); // Using Portal component
- }
- 
- public function rss($username) 
- {   
-
-    $user_id = $this->Podcast->User->field('id', array('User.username'=>$username));
-
-    $this->layout = "rss";
-    
-    if ($username == null)
-    {
-        $this->redirect('/');
-    }
-    
-    $conditions = array("status"=>1, "user_id"=>$user_id);
-    
-    $fields     = array("id", "title", "description", "created", "duration", "title", "description");
-    
-    $order = "Podcast.created DESC";
-    
-    $this->set('data', $this->Podcast->findAll($conditions, $fields, $order));
- }
-   
- /****
-      ====ADMIN SECTION==== 
- ****/    
-
- public function admin_listing()
- {   
-      $this->pageTitle = $this->Auth->user('username') . '\'s Podcasts';
-       
-      $this->layout = 'admin';
-        
-      $conditions   = array("Podcast.user_id"=>$this->Auth->user('id'));
-      $fields       = array("id", "title", "description", "created", "length", "status", "filename");
-      $order        = "Podcast.id DESC";
-      $limit        = 20;
-        
-      $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit)); 
- }
-    
- public function admin_add() 
- {
+    
+/***********
+    ====ADMIN METHODS====
+***/    
+
+    public function admin_listing()
+    {   
+        $this->pageTitle = $this->othAuth->user('username') . '\'s Podcasts';
+        
+        $this->layout = 'admin';
+        
+        $conditions   = array("Podcast.user_id"=>$this->othAuth->user('id'));
+        $fields       = array("id", "title", "description", "created", "length");
+        $order        = "Podcast.id DESC";
+        $limit        = 12;
+        
+        $this->set('data', $this->Podcast->findAll($conditions, $fields, $order, $limit, null, 1)); 
+    }
+    
+public function admin_add() 
+{
     
     $this->layout    = 'admin';
@@ -164 +82 @@
     {
     
+    // echo "tmp_name : ". $this->data['Podcast']['file']['tmp_name'] . "<br />";//
+    
     $this->Sanitize = new Sanitize;
     
-    $this->Sanitize->cleanArray($this->data["Podcast"]); 
+    $this->Sanitize->cleanArray($this->data); //Hopefully this is enough
     
     /* SUBMITTED INFORMATION - use what you need
@@ -179 +99 @@
     $uploaddir    = "../webroot/files/podcasts";
     
-    $maxfilesize  = 20971520; // 20 MB max size
+    $maxfilesize  = 10485760; // 10 MB max size
     
     $podfile_name = $this->data['Podcast']['file']['name'];
@@ -194 +114 @@
     
     if ( $type != "audio/mpeg" ) 
-    {   //Is a valid file ??
+    {   //Es un archivo valido ??
         $ErrMsg   = "<h1>ERROR</h1> the file $podfile_name $podfile is not valid.<br>";
         $ErrMsg  .= "<p>Only .mp3 files<br><br>";
@@ -207 +127 @@
     {
      $ErrMsg  = "<h1>ERROR</h1> The image is too big.<br>";
-         $ErrMsg .= "<p>Bigger than 10.0 MB <br><br>";
-         $ErrMsg .= "The current size: " . $podfile_size ."</p>\n";
+     $ErrMsg .= "<p>Bigger than 10.0 MB <br><br>";
+     $ErrMsg .= "The current size: " . $podfile_size ."</p>\n";
         
-         /** delete uploaded file */
-         unlink($podfile);
-         $this->flash($ErrMsg,'/admin/podcasts/add/');
+        /** delete uploaded file */
+        unlink($podfile);
+        $this->flash($ErrMsg,'/admin/podcasts/add/');
     }
     
     $field       = "id";
     
-    $conditions  = array("user_id" =>  $this->Auth->user('id'));
+    $conditions  = array("user_id" =>  $this->othAuth->user('id'));
     
     $order       = "Podcast.id DESC";
     
-    $current_id  = $this->Podcast->field($field, $conditions, $order);
-    
-    $next_id     = ($current_id + 1);
+     $current_id  = $this->Podcast->field($field, $conditions, $order);
+    
+     $next_id     = ($current_id + 1);
      
-    $extension   = $this->Adds->last3chars($podfile_name);
+    $extension   = $this->get_extension($podfile_name);
     
     if ($extension != 'mp3')
     {
-       die("This does not look like one MP3 file:". $extension);
-    }
-    
-    $Name        = $this->Auth->user('username') . "_" . $next_id . '.'. $extension;
+       die("This does not look like one MP3 file");
+    }
+    
+     $Name        = $this->othAuth->user('username') . "_" . $next_id . '.'. $extension;
      
     /** setup final file location and name */
@@ -244 +164 @@
     {
        /** move file to proper directory ==*/
-       if (!move_uploaded_file($podfile, $newfile))
+       if (!copy($podfile, $newfile))
        {
           /** if an error occurs the file could not
                be written, read or possibly does not exist ==*/
          
-          $this->flash('Error Uploading File.', '/admin/podcasts/listing/');
+         $this->flash('Error Uploading File.', '/admin/podcasts/listing/');
        }
    }
@@ -268 +188 @@
    $this->data['Podcast']['created']     = $created;
    
-   $this->Podcast->create();
-
    if ($this->Podcast->save($this->data))
    {
-       $this->msgFlash('Podcast saved.','/admin/podcasts/listing');
+       $this->flash('Your podcast has been saved.','/podcasts/listing');
    }
- } 
- else
- {
-    $this->set('subjects', $this->Podcast->Subject->generateList(null, 'title'));
- }
-
+   
+    /** delete the temporary uploaded file **/
+   unlink($podfile);
 }
 
- public function admin_edit($id = null)
- {
-   $this->layout = 'admin';
-      
-   if (empty($this->data['Faq']))
-   {
-     $this->set('subjects', $this->Podcast->Subject->generateList(null, 'title'));
-     $this->Podcast->id = $id;
-     $this->data = $this->Podcast->read();
-     
-   }
-   else
-   {
-       $this->Sanitize = new Sanitize;
-    
-       $this->Sanitize->cleanArray($this->data["Podcast"]); 
-
-      if ($this->Podcast->save($this->data['Podcast']))
-      {
-          $this->msgFlash('Podcast saved','/admin/podcasts/listing/'.$this->data['Podcast']['id']);
-      }
-   }
- }
- /*** DELETE  **/
- public function admin_delete($id)
- {
-    $file = $this->Podcast->field("Podcast.filename", array("Podcast.id"=>$id));
-     
-    $this->Podcast->del($id);
-     
-    /** delete podcast from hard disk**/
-    unlink("../webroot/files/podcasts/" . $file);
-    $this->msgFlash('Podcast deleted', '/admin/podcasts/listing');
-  }
-
-  // change user status actived/no actived
-  public function admin_change($id, $status)
-  { 
-    $this->data['Podcast']['status'] = ($status == 0 ) ? 1 : 0;
-     
-    $this->data['Podcast']['id']     = $id;
-      
-    if ($this->Podcast->save($this->data['Podcast']))
-    {
-          $this->msgFlash('Podcast updated', '/admin/podcasts/listing');
-    }
- }
+}
+
 }
 ?>

trunk/app/controllers/topics_controller.php

@@ -18 +18 @@
           if (isset($this->params[Configure::read('Routing.admin')]))
          {
-              if ($this->Auth->user('group_id') != 1)
+              if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2 )
               {
-                    return false;
+                    return true;
               }
          }
-  return true;
+  return false;
   }
                                                             
@@ -45 +45 @@
    
    }
-   public function display($user_id, $forum_id, $topic_id){
-     
+
+   public function display($user_id, $forum_id, $topic_id)
+   {  
      $this->pageTitle = 'Forums';
      
@@ -67 +68 @@
    {
         $this->layout = 'admin';
-        
         $this->pageTitle = 'Forums';
         
-        $conditions = array("user_id"=>$this->othAuth->user('id'));
+        $conditions = array("user_id"=>$this->Auth->user('id'));
         $fields     = array("id", "title", "description", "status");
         
-        //$this->Subject = new Subject;
-        
-        $this->set('data', $this->Topic->findAll($conditions, $fields)); 
-    
+        $this->set('data', $this->Topic->findAll($conditions, $fields));     
     }
    
@@ -87 +84 @@
        $this->Sanitize = new Sanitize;
       
-       $this->Sanitize->cleanArray($this->data['Topic']);
+       $this->Sanitize->clean($this->data['Topic']);
 
-       $this->data['Topic']['user_id'] = $this->othAuth->user('id');
+       $this->data['Topic']['user_id'] = $this->Auth->user('id');
        
        $this->Topic->create();
       
-        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']);
-    }
+       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 

trunk/app/models/forum.php

@@ -13 +13 @@
                                      array('className'  => 'Topic', 
                                            'foreignkey' => 'forum_id',
-                                           'conditions' => 'Topic.topic_id = 1',
-                                           'order'      => 'id',
-                                           'fields'     => 'id, subject, created, user_id, views'
+                                           'conditions' => null,
+                                           'order'      => null,
+                                           'fields'     => null
                                            ));
 public $belongsTo = array('Catforum' => 

trunk/app/models/podcast.php

@@ -7 +7 @@
 
 class Podcast extends AppModel {
-   
-   
+      
        public $belongsTo  = array(
                                   "User" => array(

trunk/app/views/catforums/admin_listing.ctp

@@ -53 +53 @@
         );
        
-       echo $html->tableCells($tr, array("style"=>"border:1px solid gray;background-color:#c0c0c0"), 
+      echo $html->tableCells($tr, array("style"=>"border:1px solid gray;background-color:#c0c0c0"), 
                                    array("style"=>"border:1px solid gray;background-color:#c0c0c0"));
-      foreach ( $val['Forum'] as $v)
+
+      foreach ( $val['Forum'] as $v)  // forum in catforums
       {
          echo '<tr><td>&nbsp;</td> <td> '.  $gags->sendEdit($v["id"], 'forums') .'</td>';
-         echo '<td>' . $v["title"] .'</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($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>';
       }
  }

trunk/app/views/forums/admin_edit.ctp

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

trunk/app/views/forums/display.ctp

@@ -50 +50 @@
  echo '<div style="text-align:center;width:50%;padding:6px">';
  
- if ( !$othAuth->sessionValid() ) 
+ if ( ! isset( $cU ) ) 
  {
             echo $this->renderElement('login');
@@ -63 +63 @@
 <?php echo $html->image('static/new.gif', array("alt"=>"Comentario nuevo", "title"=>"Comentario nuevo")); ?>      Comentario nuevo<br />
 </p>
-
-

trunk/app/views/podcasts/rss.ctp

@@ -1 +1 @@
 <?php
+//die(debug($data));
 /**
-*  2002-2007- MonoNeuorna.org
+*  2002-2008 - MonoNeuorna.org
 *  Manuel Montoya <manuel_ARRROBA_mononeurona_PUNTO_org 
 *  GPLv3 
@@ -9 +10 @@
 ?>
 
-<!-- generator="Centauro 0.5" -->
+<!-- generator="Karamelo 0.2" -->
 <rss version="2.0" 
     xmlns:content="http://purl.org/rss/1.0/modules/content/"
@@ -20 +21 @@
 
   <channel>
-    <title><?php echo $data["User"]["username"]; ?> podcast</title>
-    <link>>http://<?php echo $_SERVER['SERVER_NAME'] ?>/blog/<?php echo $data["User"]["username"];?></link>
-    <description><?php echo $data["User"]["tags"]; ?></description>
+    <title><?php echo $User["User"]["username"]; ?> podcast</title>
+    <link>>http://<?php echo $_SERVER['SERVER_NAME'] ?>/blog/<?php echo $User['User']['username'];?></link>
+    <description><?php echo $User["User"]["tags"]; ?></description>
     <generator>Jedit.org</generator>
     <docs>http://blogs.law.harvard.edu/tech/rss</docs>
     <language>es-mx</language>
-    <copyright><?php echo $data["User"]; ?></copyright>
-    <webMaster><?php echo $data["User"]["email"];?></webMaster>
+    <copyright><?php echo $User["User"]['username']; ?></copyright>
+    <webMaster><?php echo $User["User"]["email"];?></webMaster>
     <pubDate><?php echo $created; ?></pubDate>
     <lastBuildDate><?php echo $last_episode; ?></lastBuildDate>
    
-    <itunes:author><?php echo $data["User"]["username"];?></itunes:author>
+    <itunes:author><?php echo $User["User"]["username"];?></itunes:author>
     <itunes:subtitle><?php echo $subtitle;?></itunes:subtitle>
-    <itunes:keywords><?php echo $data["User"]["tags"];?></itunes:keywords>
+    <itunes:keywords><?php echo $User["User"]["tags"];?></itunes:keywords>
     <itunes:category text="Freedom">
       <itunes:category text="Freedom" />
     </itunes:category>
     <itunes:owner>
-      <itunes:name><?php  echo $data["User"]["name_blog"]; ?></itunes:name>