Changeset 307

Timestamp:

03/05/08 00:56:26 (10 months ago)

Author:

aarkerio

Message:

Rewrite hepers

Location:

trunk/app

Files:

• controllers/acquaintances_controller.php (modified) (7 diffs)
• controllers/glossaries_controller.php (modified) (6 diffs)
• controllers/quotes_controller.php (modified) (5 diffs)
• controllers/users_controller.php (modified) (1 diff)
• views/acquaintances/admin_edit.ctp (modified) (1 diff)
• views/acquaintances/admin_listing.ctp (modified) (2 diffs)
• views/entries/admin_edit.ctp (modified) (1 diff)
• views/quotes/admin_edit.ctp (modified) (1 diff)
• views/quotes/admin_listing.ctp (modified) (2 diffs)
• views/vclassrooms/admin_edit.ctp (modified) (4 diffs)

trunk/app/controllers/acquaintances_controller.php

@@ -24 +24 @@
     return false;  // go away !!
  }
-
+ 
  public function display($username, $user_id)
  {
@@ -36 +36 @@
   
        $this->set('data', $this->Acquaintance->findAll($conditions));
-  }
+ }
  
  /** ADMIN METHODS***/
@@ -43 +43 @@
       $this->layout    = 'admin';
       
-      $conditions   = array("user_id" => $this->othAuth->user('id'));
+      $conditions   = array("user_id" => $this->Auth->user('id'));
       
       //$fields     = array("id", "title", "description", "pubdate", "size");
@@ -64 +64 @@
        $this->Sanitize = new Sanitize;
        
-       $this->Sanitize->cleanArray($this->data["Acquaintance"]); 
+       $this->Sanitize->clean($this->data["Acquaintance"]); 
        
-       $this->data['Acquaintance']['user_id'] = $this->othAuth->user('id');
+       $this->data['Acquaintance']['user_id'] = $this->Auth->user('id');
           
        $this->Acquaintance->create();
@@ -85 +85 @@
         $this->Acquaintance->id = $id;
         
-        $this->Subject     = new Subject;
-        
-        $this->set('subjects', $this->Subject->generateList());         
-        
         $this->data = $this->Acquaintance->read();
     }
@@ -95 +91 @@
        $this->Sanitize = new Sanitize;
        
-       $this->Sanitize->cleanArray($this->data["Acquaintance"]); //Hopefully this is enough
+       $this->Sanitize->clean($this->data["Acquaintance"]); 
        
        if ($this->Acquaintance->save($this->data['Acquaintance']))
@@ -114 +110 @@
            $this->flash('Error, call support', '/admin/acquaintances/listing');
       }
-  }}
+  }
+}
 ?>

trunk/app/controllers/glossaries_controller.php

@@ -3 +3 @@
 *  Karamelo E-Learning Platform
 *  Manuel Montoya 2002-2008 
-*  GPL manuel<at>mononeurona.org
+*  GPLv3 manuel<at>mononeurona.org
 */ 
  
@@ -10 +10 @@
 class GlossariesController extends AppController
 {
- public $helpers       = array('Ajax', 'User', 'Fck', 'Gags');
+ public $helpers      = array('Ajax', 'User', 'Fck', 'Gags');
     
  public $components   = array('Edublog');
  
  public function isAuthorized() 
- {
-    if ($this->action == 'delete') 
-      {
-    if ($this->Auth->user('group_id') == 1) 
-          {
+ {      
+    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;
-          } else {
-        return false;
-          }
-      }
- 
-    return true;
+        } 
+    } 
+    return false;  // go away !!
  }
     
@@ -48 +45 @@
         $this->Edublog->blog($user_id); // blogger elements
  }
-
      
  /*** 
@@ -60 +56 @@
         $this->pageTitle = 'Glossary';
         
-        $conditions = array("Glossary.catglossary_id"=>$catglossary_id, "Glossary.user_id"=>$this->othAuth->user('id'));
+        $conditions = array("Glossary.catglossary_id"=>$catglossary_id, "Glossary.user_id"=>$this->Auth->user('id'));
         
         $fields     = array("Glossary.id", "Glossary.item", "Glossary.definition", "Glossary.catglossary_id", "Catglossary.title");
@@ -74 +70 @@
  {
         $this->layout = 'ajax';
-         $this->set('catglossary_id', $catglossary_id);
-          $this->render('new', 'ajax');
+    $this->set('catglossary_id', $catglossary_id);
+    $this->render('new', 'ajax');
  }
  
@@ -107 +103 @@
     $this->set('catglossary_id', $catglossary_id);
     
-      if (!empty($this->data["Glossary"]))
-      {
+    if (!empty($this->data["Glossary"]))
+    {
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->cleanArray($this->data["Glossary"]); //Hopefully this is enough
+        $this->Sanitize->clean($this->data["Glossary"]); //Hopefully this is enough
         
-          $this->data["Glossary"]["user_id"] = $this->othAuth->user('id');
+    $this->data["Glossary"]["user_id"] = $this->Auth->user('id');
           
-          $this->Glossary->create();
+    $this->Glossary->create();
           
         if ($this->Glossary->save($this->data["Glossary"]))
-         {
+    {
            $this->msgFlash('Item has been saved.','/admin/glossaries/listing/'.$this->data["Glossary"]["catglossary_id"]);
-         }
      }
-   }
+     }
+ }
    
  public function admin_delete($id, $catglossary_id)

trunk/app/controllers/quotes_controller.php

@@ -17 +17 @@
       if (isset($this->params[Configure::read('Routing.admin')]))
       {
-                             if ($this->Auth->user('group_id') != 1)
-                                      {
-                                                   return false;
-                                                             }
-                                                            }
-                                                               return true;
- }
-                                                           
+    if ($this->Auth->user('group_id') == 1 || $this->Auth->user('group_id') == 2)
+    {
+        return true;
+    }
+      }
+  return false;
+ }                                                         
 
  public function admin_add() 
@@ -32 +31 @@
          $this->Sanitize = new Sanitize;
          
-         $this->Sanitize->cleanArray($this->data); //Hopefully this is enough
+         $this->Sanitize->clean($this->data); //Hopefully this is enough
          
-         $this->data['Quote']['user_id'] = $this->othAuth->user('id');
+         $this->data['Quote']['user_id'] = $this->Auth->user('id');
          
          if ( $this->Quote->save($this->data['Quote']))
@@ -49 +48 @@
       $this->pageTitle = 'Quotes';
       
-      $conditions      = array("user_id" => $this->othAuth->user('id'));
+      $conditions      = array("user_id" => $this->Auth->user('id'));
       $fields          = array("id", "quote", "author");
       $order           = "author DESC";
@@ -70 +69 @@
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->cleanArray($this->data);
+        $this->Sanitize->clean($this->data);
         
         if ($this->Quote->save($this->data))
@@ -82 +81 @@
  public function admin_delete($id)
  {
-        // deletes task from database
-                //die($this->data['Quote']['id']);
-        $this->Quote->del($id);
-        $this->redirect('/admin/quotes/listing');
-        exit();
+      if ($this->Quote->del($id))
+      {
+          $this->msgFlash('Quote deleted','/admin/quotes/listing');
+      } 
+      else
+      {
+           $this->flash('Error, call support', '/admin/quotes/listing');
+      }
   }
 }

trunk/app/controllers/users_controller.php

@@ -333 +333 @@
  {
     $this->layout    = 'portal';
- 
+    
     $conditions = array("id"=>'>1', "id"=>"<5");
-
+    
     $this->set('groups', Set::combine($this->User->Group->find('all'), "{n}.Group.id","{n}.Group.name"));
-
+    
     $this->Portal->statics(); // Using Portal components
  }

trunk/app/views/acquaintances/admin_edit.ctp

@@ -1 @@
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->addCrumb('Links', '/admin/acquaintances/listing'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
+<?php 
+  echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
+  echo $html->addCrumb('Links', '/admin/acquaintances/listing'); 
+  echo $html->getCrumbs(' / '); 
 
-<?php echo $html->formTag('/admin/acquaintances/edit/','post'); ?>
-
-<?php echo $html->hiddenTag('Acquaintance/id'); ?>
+  echo $form->create('Acquaintance', array('action'=>'admin_edit'));
+  echo $form->hidden('Acquaintance.id'); 
+?>
 
 <fieldset>
 <legend>Edit link</legend>
  <?php 
-   echo $form->labelTag('Acquaintance/name', 'Name:' ); 
-   echo $html->input('Acquaintance/name', array("size" => 50, "maxlength" => 50));
-   echo $html->tagErrorMsg('Acquaintance/name', 'Title is required.'); 
+   echo $form->input('Acquaintance.name', array("size" => 50, "maxlength" => 50));
+   echo $form->error('Acquaintance.name', 'Title is required.'); 
 ?>
-<p>
+
 <?php
-  echo $form->labelTag('Acquaintance/description', 'Description:');
-  echo $html->textarea('Acquaintance/description', array("cols" => 40, "rows" =>4));
-?>
-</p>  
-<?php   
-   echo $form->labelTag('Acquaintance/url', 'Link:' ); 
-   echo $html->input('Acquaintance/url', array("size" => 65, "maxlength" => 220));
-   echo $html->tagErrorMsg('Acquaintance/url', 'Link is required.'). '<br />'; 
- 
-    echo $html->submit('Save'); 
+  echo $html->para(null,
+   $form->label('Acquaintance.description', 'Description:') . $form->textarea('Acquaintance.description', array("cols" => 40, "rows" =>4))
+  );
+
+   echo $form->input('Acquaintance.url', array("size" => 65, "maxlength" => 220));
+   echo $form->error('Acquaintance.url', 'Link is required.'). '<br />'; 
+   echo '</fieldset>';
+   echo $form->end('Save'); 
  ?>
-</fieldset>
-</form>
-

trunk/app/views/acquaintances/admin_listing.ctp

@@ -4 +4 @@
 ?>
 
-<div class="title_section"><?php echo $othAuth->user('username'); ?>'s Acquaintances</div>
+<div class="title_section"><?php echo $cU['User']['username']; ?>'s Acquaintances</div>
 
 <script type="text/javascript"> 
@@ -25 +25 @@
 
 <div id="trh" style="margin:0;padding:0;padding-left:40px;width:80%;display:none;">
-<?php echo $html->formTag('/admin/acquaintances/add/','post'); ?>
+<?php echo $form->create('Acquaintance', array('action'=>'admin_add')); ?>
  <fieldset>
  <legend>New Acquaintance</legend>
-   <?php echo $form->labelTag('Acquaintance/name', 'Site:'); ?><br />
-   <?php echo $html->input('Acquaintance/name', array("size" => 30, "maxlength"=>50)); ?>
-   <?php echo $html->tagErrorMsg('Acquaintance/name', 'A name is required.'); ?>
+   <?php 
+    echo $form->label('Acquaintance.name', 'Site:') . '<br />';
+    echo $form->input('Acquaintance.name', array("size" => 30, "maxlength"=>50)); 
+    echo $form->error('Acquaintance.name', 'A name is required.'); 
+   ?>
    <br /><br />
 <p>
 <?php
-  echo $form->labelTag('Acquaintance/description', 'Description:');
-  echo $html->textarea('Acquaintance/description', array("cols" => 40, "rows" =>3));
+  echo $form->label('Acquaintance.description', 'Description:');
+  echo $form->textarea('Acquaintance.description', array("cols" => 40, "rows" =>3));
 ?>
 </p>  
 <?php 
-    echo $form->labelTag('Acquaintance/url', 'URL:') . "<br />";
-    echo $html->input('Acquaintance/url', array("size" => 60, "maxlength"=>300, "value"=>"http://"));
-    echo $html->tagErrorMsg('Acquaintance/url', 'An author is required.'); 
+    echo $form->label('Acquaintance.url', 'URL:') . '<br />';
+    echo $form->input('Acquaintance.url', array("size" => 60, "maxlength"=>300, "value"=>"http://"));
+    echo $form->error('Acquaintance.url', 'An author is required.'); 
 ?>
    
    <div style="clear:both"></div>
-  <?php echo $html->submit('Add') ?>
-</fieldset>
+   </fieldset>
+  <?php echo $form->end('Save'); ?>
 </form>
 
 </div>
  <?php $session->flash(); ?>
+ 
 <table style="width:100%">
 <?php

trunk/app/views/entries/admin_edit.ctp

@@ -10 +10 @@
    echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
    echo $html->addCrumb('Entries', '/admin/entries/listing'); 
-  echo $html->getCrumbs(' / '); 
+   echo $html->getCrumbs(' / '); 
 ?>
 

trunk/app/views/quotes/admin_edit.ctp

@@ -1 @@
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->addCrumb('Quote', '/admin/quotes/listing'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
+<?php 
+ echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
+ echo $html->addCrumb('Quote', '/admin/quotes/listing'); 
+ echo $html->getCrumbs(' / ');
 
-<?php echo $html->formTag('/admin/quotes/edit/','post'); ?>
+ echo $form->create('Quote', array('url' => 'quotes/admin_edit')); 
+ echo $form->hidden('Quote.id');
+?>
+<fieldset>
+<legend>Edit quote</legend>
+ <?php 
+   echo $form->input('Quote.quote', array("size" => 60, "maxlength" => 150));
+   echo $form->error('Quote.quote', 'Title is required.'); 
+   
+   echo $form->input('Quote.author', array("size" => 25, "maxlength" => 70));
+   echo $form->error('Quote.author', 'Author is required.'); 
 
-<?php echo $html->hiddenTag('Quote/id'); ?>
+   echo '</fieldset>';
+   echo $form->end('Save');  
+?>
 
-<fieldset>
-<legend>Edit new</legend>
- <?php 
-   echo $form->labelTag( 'Quote/quote', 'Quote:' ); 
-   echo $html->input('Quote/quote', array("size" => 60, "maxlength" => 150));
-   echo $html->tagErrorMsg('Quote/quote', 'Title is required.'); 
-   
-   echo $form->labelTag( 'Quote/quote', 'Author:' ); 
-   echo $html->input('Quote/author', array("size" => 25, "maxlength" => 70));
-   echo $html->tagErrorMsg('Quote/author', 'Author is required.'); 
- ?>
-
-  <?php echo $html->submit('Send');  ?>
-</fieldset>
-</form>
-

trunk/app/views/quotes/admin_listing.ctp

@@ -1 @@
-<?php echo $html->addCrumb('Control Tools', '/admin/entries/start'); ?> 
-<?php echo $html->getCrumbs(' / '); ?>
+<?php 
+  echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
+  echo $html->getCrumbs(' / '); 
+?>
 
 <div class="title_section">Quick News</div>
@@ -20 +22 @@
 </script>
 
-<p><?php echo $html->link($html->image('admin/new.gif', array("alt"=>"Add new", "title"=>"Add new")), '#', array("onclick"=>"hU()"), false, false); ?></p>
+<?php 
+echo $html->para(null, $html->link($html->image('actions/new.png', array("alt"=>"Add new", "title"=>"Add new")), '#', array("onclick"=>"hU()"), false, false)); ?>
 
 <div id="trh" style="margin:0;padding:0;padding-left:40px;width:80%;display:none;">
-<?php echo $html->formTag('/admin/quotes/add/','post'); ?>
+<?php echo $form->create('Quote', array('action'=>'admin_add')); ?>
  <fieldset>
- <legend>New quote</legend>
-   <?php echo $form->labelTag('Quote/quote', 'Quote:'); ?><br />
-   <?php echo $html->input('Quote/quote', array("size" => 60, "maxlength"=>130)); ?>
-   <?php echo $html->tagErrorMsg('Quote/quote', 'A quote is required.'); ?>
+ <legend>New quote</legend
+   <?php 
+   echo $form->input('Quote.quote', array("size" => 60, "maxlength"=>130));
+   echo $form->error('Quote.quote', 'A quote is required.'); 
    
-   <?php echo $form->labelTag('Quote/author', 'Author:') . "<br />"; ?>
-   <?php echo $html->input('Quote/author', array("size" => 60, "maxlength"=>130)); ?>
-   <?php echo $html->tagErrorMsg('Quote/author', 'An author is required.'); ?>
+   echo $form->input('Quote/author', array("size" => 60, "maxlength"=>130));
+   echo $form->error('Quote.author', 'An author is required.'); 
+?>
    
    <div style="clear:both"></div>
-  <?php echo $html->submit('Add') ?>
 </fieldset>
-</form>
+  <?php echo $form->end('Save'); ?>
 
 </div>

trunk/app/views/vclassrooms/admin_edit.ctp

@@ -6 +6 @@
  echo $html->getCrumbs(' / '); 
 
- echo $html->formTag('/admin/vclassrooms/edit','post', array("onsubmit"=>"chkForm()"));
- echo $html->hidden('Vclassroom/id');
+ echo $form->create('Vclassroom',array('action'=>'admin_edit', "onsubmit"=>"chkForm()"));
+ echo $form->hidden('Vclassroom.id');
 ?>
 
@@ -13 +13 @@
   <legend>New Group</legend> 
   <p>
-  <?php echo $form->labelTag('Vclassroom/name', 'Name:' );?>
-  <?php echo $html->input('Vclassroom/name', array("size" => 40, "maxlength" => 60)); ?>
-  <?php echo $html->tagErrorMsg('Vclassroom/name', 'A name is required.'); ?>
+  <?php 
+     echo $form->input('Vclassroom.name', array("size" => 40, "maxlength" => 60)); 
+     echo $form->error('Vclassroom.name', 'A name is required.'); 
+  ?>
   </p><br />
  
-  <label>Activate classroom:</label><br />
-  <?php echo $html->checkbox('Vclassroom/status', null, array("value"=>1)); ?>
+  
+  <?php 
+     echo $form->label('Vclassroom.status', 'Status:');
+     echo $form->checkbox('Vclassroom.status', array("value"=>1)); 
+?>
   <br /></p>
   
@@ -38 +42 @@
     ?>
   
-  <label>Members only by invitation:</label><br />
-  <?php echo $html->checkbox('Vclassroom/access', null, $attr); ?>
+
+  <?php 
+     echo $form->label('Vclassroom.access', 'Members only by invitation:');
+     echo $form->checkbox('Vclassroom.access', $attr); 
+  ?>
   <br /><br />
   
@@ -45 +52 @@
   
   <div id="invi_code" style="display:<?php echo $display; ?>;">
-     <label>CODE:</label>
-     <?php echo $html->input('Vclassroom/secret', array("size" => 5, "maxlength" => 6)); ?>
+     <?php 
+     echo $form->label('Vclassroom.secret', 'CODE:');
+     echo $html->input('Vclassroom.secret', array("size" => 5, "maxlength" => 6)); 
+    ?>
      <br /><br />
   </div>
   <div style="clear:both"></div>
-  <br />
-  <?php echo $html->submit('Save'); ?>
-</fieldset>
-</form>
+  <br /></fieldset>
+  <?php echo $form->end('Save'); ?>
 
 <script type="text/javascript">