Changeset 319

Timestamp:

03/11/08 17:33:34 (10 months ago)

Author:

aarkerio

Message:

New images an changes in forums

Location:

trunk/app

Files:

• app_controller.php (modified) (1 diff)
• controllers/catforums_controller.php (modified) (5 diffs)
• views/catforums/admin_listing.ctp (modified) (3 diffs)
• views/elements/admin_menu.ctp (modified) (1 diff)
• webroot/img/admin/add-forum.jpg (added)
• webroot/img/admin/message_board.gif (added)
• webroot/img/admin/message_e.gif (added)
• webroot/img/admin/message_n.gif (added)
• webroot/img/admin/message_r.gif (added)
• webroot/img/admin/new.gif (added)
• webroot/img/admin/progress.png (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') );
+     $this->Auth->allow( array('view', 'display', 'subscribe', 'recover', 'register', 'insert', 'vote', 'download', 'blog','portfolio', 'about', 'message') );
      $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/catforums_controller.php

@@ -3 +3 @@
 *  Chipotle Software TM
 *  Manuel Montoya 2002-2008
-*  GPL v3 manuel<at>mononeurona<punto>org
+*  GPL v3 manuel<arroba>mononeurona<punto>org
 */ 
  
@@ -13 +13 @@
     
  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 )  // admin and teachers
+        {
+               return true;
+    }
+    }
+    return false;  // go away !!
+ }
  
-  public function isAuthorized() 
-  {
-    if ($this->action == 'delete') 
-      {
-    if ($this->Auth->user('group_id') == 1) 
-          {
-        return true;
-          } else {
-        return false;
-          }
-      }
- 
-    return true;
-  }   
-
  public function display($username, $user_id) 
  { 
@@ -55 +52 @@
         $this->pageTitle = 'Forums';
         
-        $conditions = array("user_id"=>$this->othAuth->user('id'));
+        $conditions = array("user_id"=>$this->Auth->user('id'));
         
-        if ($this->othAuth->user('group_id') == 1 && $admin != null)
+        if ($this->Auth->user('group_id') == 1 && $admin != null)
         {
             $conditions["website"] = 1;
@@ -73 +70 @@
      $this->layout = 'admin';
         // adds new classroom to database
-     if (!empty($this->data["Catforum"]))
+     if (!empty($this->data['Catforum']))
      {     
           $this->Sanitize = new Sanitize;
           
-          $this->Sanitize->cleanArray($this->data); //Hopefully this is enough
+          $this->Sanitize->clean($this->data['Catforum']); 
           
-          $this->data["Catforum"]["user_id"] = $this->othAuth->user('id');
+          $this->data['Catforum']['user_id'] = $this->Auth->user('id');
           
-          if ($this->Catforum->save($this->data["Catforum"]))
-           {
+          $this->Catforum->create();
+          
+          if ($this->Catforum->save($this->data['Catforum']))
+      {
                   $this->msgFlash('Forum category added', '/admin/catforums/listing');
           }
-     }
+    }
  }
  
@@ -102 +101 @@
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->cleanArray($this->data["Catforum"]); //Hopefully this is enough
+        $this->Sanitize->clean($this->data['Catforum']);
         
-        if ($this->Catforum->save($this->data["Catforum"]))
+        if ($this->Catforum->save($this->data['Catforum']))
         {
             $this->msgFlash('Forum category saved', '/admin/catforums/listing');

trunk/app/views/catforums/admin_listing.ctp

@@ -18 +18 @@
 </script>
 
-<?php echo $html->link($html->image('admin/new.gif', array("alt"=>"Add new", "title"=>"Add new")), '#', array("onclick"=>"hU()"), false, false) ?>
+<?php echo $html->link($html->image('actions/new.png', array("alt"=>"Add new forum", "title"=>"Add new forum")), '#', array("onclick"=>"hU()"), false, false) ?>
 
 <table class="tbadmin" id="tbl">
 <tr style="text-align:left;display:none;border:1px dotted grey;padding:6px" id="trh">
 <td colspan="7">
-  <?php echo $html->formTag('/admin/catforums/add/','post'); ?>
+  <?php echo $form->create('Catforum', array('action'=>'admin_add')); ?>
   <fieldset>
      <legend>Add new Category Forum</legend>
      <?php 
-           echo $form->labelTag('Catforum/title', 'Title:') . $html->input('Catforum/title', array("size"=>60, "maxlength"=>150));
-           echo $form->labelTag('Catforum/description', 'description:' );
-           echo $html->input('Catforum/description', array("size"=>60, "maxlength"=>150));
-           echo $form->labelTag('Catforum/status', 'Actived:') . $html->checkbox('Catforum/status', 1);
-           echo '<div style="clear:both"></div>';
-           echo $html->submit('Send'); 
+           echo $form->input('Catforum.title', array("size"=>50, "maxlength"=>150));  
+           echo $form->input('Catforum.description', array("size"=>70, "maxlength"=>150));
+           echo $form->label('Catforum.status', 'Actived:') . $form->checkbox('Catforum.status');
+           echo '<div style="clear:both"></div></fieldset>';
+           echo $form->end('Save'); 
      ?>
-</fieldset>
-</form>
 </td>
 </tr>
@@ -47 +44 @@
             
        $tr = array ( 
-               $gags->sendEdit($val['Catforum']['id'], 'catforums'),
+               $gags->sendEdit($val['Catforum']['id'], 'Catforum'),
                 $html->link($html->image('admin/add-forum.jpg', array("alt"=>"Add Forum", "title"=>"Add Forum")), '/admin/forums/add/'.$val['Catforum']['id'], null, null, false),
                $val['Catforum']['title'],
                $val['Catforum']['description'],
                $gags->setStatus($val['Catforum']['status']),
-               $gags->confirmDel($val['Catforum']['id'], 'catforums'),
+               $gags->confirmDel($val['Catforum']['id'], 'Catforum'),
                '&nbsp;'
         );
@@ -60 +57 @@
       foreach ( $val['Forum'] as $v)
       {
-         echo '<tr><td>&nbsp;</td> <td> '.  $gags->sendEdit($v["id"], 'forums') .'</td>  <td> '. $v["title"] .'</td>  <td colspan="2"> '. $v["description"] .' </td>';
+         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>';
       }

trunk/app/views/elements/admin_menu.ctp

@@ -29 +29 @@
        </ul>
   </li>
-  <li><a href="/admin/catglossaries/listing">Glossaries</a>
+  <li><?php echo $html->link('Glossaries', '/admin/catglossaries/listing'); ?>
        <ul>
-          <li><a href="/admin/catglossaries/add">New Glossarie</a> </li>
+          <li><?php echo $html->link('New Glossary', '/admin/catglossaries/add'); ?></li>
        </ul>
   </li>
-  <li><a href="/admin/tests/listing">Tests</a>
+  <li><?php echo $html->link('Tests', '/admin/tests/listing'); ?>
        <ul>
-          <li><a href="/admin/tests/add">New Test</a> </li>
+          <li><?php echo $html->link('New Test', '/admin/tests/add'); ?></li>
+       </ul>
+  </li>
+  <li><?php echo $html->link('Forums', '/admin/catforums/listing'); ?>
+       <ul>
+       <li> <?php echo $html->link('New forum', '/admin/catforums/add'); ?>
        </ul>
   </li>