Changeset 698 for trunk/app/controllers

Timestamp:

08/06/08 12:32:50 (4 months ago)

Author:

aarkerio

Message:

Validate arrayas

Location:

trunk/app/controllers

Files:

• catglossaries_controller.php (modified) (4 diffs)
• glossaries_controller.php (modified) (4 diffs)

trunk/app/controllers/catglossaries_controller.php

@@ -40 +40 @@
         $this->set('data', $this->Catglossary->findAll($conditions, $fields, $order));
         
-        /*Edublog*/
+        /*Edublog stuff*/
         $this->layout    = $this->Edublog->layout($user_id);
         
@@ -63 +63 @@
  }
  
- 
- /*** 
- ===== ADMIM METHODS =====
- ***/
+ /*** ===== ADMIN METHODS ===== ***/
  public function admin_listing()
  {      
         $this->layout    = 'admin';
         
-        $this->pageTitle = 'Glossaries';
+        $this->pageTitle = __('Glossaries', true);
         
         $conditions = array('Catglossary.user_id' => $this->Auth->user('id'));
     
         $fields     = array('Catglossary.id', 'Catglossary.title', 'Catglossary.description', 'Catglossary.created', 'Catglossary.status');
-        
-        $this->set('data', $this->Catglossary->findAll($conditions, $fields));
+        $order      = 'Catglossary.title';
+        $this->set('data', $this->Catglossary->findAll($conditions, $fields, $order));
  }
  
@@ -89 +86 @@
     
     $fields     = array('Catglossary.id', 'Catglossary.title', 'Catglossary.user_id', 'Catglossary.user_id', 'User.id', 'User.username');
-        //debug($this->Catglossary->find($conditions, $fields));exit();
         $this->set('data', $this->Catglossary->find($conditions, $fields));
  }
@@ -95 +91 @@
  public function admin_add()
  {  
-    $this->layout = 'admin';
-        
-    // adds new classroom to database
-    if (!empty($this->data['Catglossary']))
-    {
+  $this->layout = 'admin';  
+  
+  if (!empty($this->data['Catglossary'])):
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->clean($this->data["Catglossary"]);
+        $this->Sanitize->clean($this->data['Catglossary']);
         
-        $this->data["Catglossary"]["user_id"] = $this->Auth->user('id');
+        $this->data['Catglossary']['user_id'] = (int) $this->Auth->user('id');
           
-        $this->Catglossary->create();
-        
-        if ($this->Catglossary->save($this->data["Catglossary"]))
-    {
-             $this->msgFlash('Category Glossary saved.','/admin/catglossaries/listing');
-        }
-     }    
+    if ($this->Catglossary->save($this->data)):
+              $this->msgFlash('Category Glossary saved.','/admin/catglossaries/listing');
+        endif;  
+  endif;     
  }
 
-public function admin_edit($id=null)
+public function admin_edit($catglossary_id=null)
 {
-     $this->layout    = 'admin';
+ $this->layout    = 'admin';
      
-     if ( empty( $this->data["Catglossary"] ) )
-     {
-         $this->Catglossary->id  = $id;
-         
-         $this->data      = $this->Catglossary->read();
-     }
-     else
-     {   
+  if ( empty( $this->data['Catglossary'] ) ):       
+         $this->data      = $this->Catglossary->read(null, $catglossary_id);
+  else:
+        
          $this->Sanitize = new Sanitize;
          
-         $this->Sanitize->html($this->data["Catglossary"]["title"]);
+         $this->Sanitize->html($this->data['Catglossary']['title']);
          
-         $this->Sanitize->html($this->data["Catglossary"]["description"]);
+         $this->Sanitize->html($this->data['Catglossary']['description']);
          
-         if ($this->Catglossary->save($this->data["Catglossary"]))
-         {  
-            $this->msgFlash('Your category has been saved!', '/admin/catglossaries/edit/'.$this->data["Catglossary"]["id"]);
-         }
-     }
+         if ($this->Catglossary->save($this->data)):  
+            $this->msgFlash(__('Data saved', true), '/admin/catglossaries/edit/'.$this->data['Catglossary']['id']);
+         endif;
+  endif;
  }
  
- public function admin_delete($id)
+ // change status published/draft
+ public function admin_change($status, $catglossary_id)
+ {  
+    if ( !is_numeric($status)  ||  !intval($catglossary_id) ): 
+        $this->redirect('/');
+        return false;
+    endif;
+    
+    $this->data['Catglossary']['status'] = ($status == 0 ) ? 1 : 0;
+     
+    $this->data['Catglossary']['id']     = (int) $catglossary_id;
+     
+    if ($this->Catglossary->save($this->data, array('validate'=>false))):
+    $this->msgFlash(__('Status modified', true), '/admin/catglossaries/listing');
+    endif;
+ }
+
+ public function admin_delete($catglossary_id)
  {
-     if ($this->Catglossary->del($id))
-    {
-        $this->msgFlash('Category deleted', '/admin/catglossaries/listing');
-    }
+   if ($this->Catglossary->del($$catglossary_id)):
+          $this->msgFlash(__('Data removed', true), '/admin/catglossaries/listing');
+   endif;
  }
 }

trunk/app/controllers/glossaries_controller.php

@@ -27 +27 @@
         $this->pageTitle = 'Glossaries';
         
-        $user_id = $this->Glossary->User->field('id', array("username"=>$username));
+        $user_id = $this->Glossary->User->field('id', array('username'=>$username));
         
-        $conditions = array("user_id"=>$user_id, "status"=>1);
+        $conditions = array('user_id'=>$user_id, 'status'=>1);
         
         $fields     = array("id", "item", "definition");
         
-        $order      = "item ASC";
+        $order      = 'item ASC';
         
         $this->set('data', $this->Glossary->findAll($conditions, $fields, $order));
         
-        /*Edublog*/
+        /*Edublog stuff */
         $this->layout    = $this->Edublog->layout($user_id);
         
@@ -43 +43 @@
  }
      
- /*** 
- ===== ADMIM METHODS =====
- ***/
+ /*** ===== ADMIM METHODS ===== ***/
  
  public function admin_new($catglossary_id)
@@ -54 +52 @@
  }
  
- public function admin_edit($id = null)
+ public function admin_edit($glossary_id = null)
  {  
     $this->layout = 'admin';
     
-    if (empty($this->data["Glossary"]))
-    {   
-        $this->Glossary->id = $id;
-        
-        $this->data = $this->Glossary->read();
-    }
-    else
-    {
+    if (empty($this->data['Glossary'])):        
+        $this->data = $this->Glossary->read(null, $glossary_id);
+   
+    else:
+    
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->clean($this->data["Glossary"]); 
+        $this->Sanitize->clean($this->data['Glossary']); 
         
-        if ($this->Glossary->save($this->data['Glossary']))
-        {
-            $this->msgFlash('Glossary has been updated.','/admin/catglossaries/items/'.$this->data['Glossary']['catglossary_id']);
-        }
-    }
+        if ($this->Glossary->save($this->data)):
+            $this->msgFlash(__('Data saved', true),'/admin/catglossaries/items/'.$this->data['Glossary']['catglossary_id']);
+    endif;
+    endif;
  }
 
@@ -80 +74 @@
  {
     $this->layout = 'admin';
-    
-    if (!empty($this->data['Glossary']))
-    {
+      
+    if (!empty($this->data['Glossary'])):
+
         $this->Sanitize = new Sanitize;
         
         $this->Sanitize->clean($this->data['Glossary']); 
         
-    $this->data["Glossary"]["user_id"] = $this->Auth->user('id');
+    $this->data['Glossary']['user_id'] = (int) $this->Auth->user('id');
           
-    $this->Glossary->create();
-          
-        if ($this->Glossary->save($this->data["Glossary"]))
-    {
-           $this->msgFlash('Item has been saved.','/admin/catglossaries/items/'.$this->data["Glossary"]["catglossary_id"]);
-     }
-     }
+        if ($this->Glossary->save($this->data)):
+           $this->msgFlash(__('Data saved', true),'/admin/catglossaries/items/'.$this->data['Glossary']['catglossary_id']);
+    endif; 
+    endif;
  }
    
- public function admin_delete($id, $catglossary_id)
+ public function admin_delete($glossary_id, $catglossary_id)
  {
-    $this->Glossary->del($id);
-    $this->msgFlash('Glossary has been deleted.', '/admin/catglossaries/items/'.$catglossary_id);
- }
+   if ( $this->Glossary->del($glossary_id) ):
+       $this->msgFlash(__('Data removed', true), '/admin/catglossaries/items/'.$catglossary_id);
+   endif;
+ } 
 }
 ?>