Changeset 695 for trunk/app/controllers

Timestamp:

08/04/08 21:29:32 (4 months ago)

Author:

aarkerio

Message:

Update scavanger~

Files:

• trunk/app/controllers/subjects_controller.php (modified) (1 diff)

trunk/app/controllers/subjects_controller.php

@@ -67 +67 @@
     $this->layout = 'admin';
      
-    // adds new classroom to database
-    if (!empty($this->data["Subject"]))
-    {
+    if (!empty($this->data['Subject'])):
+    
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->clean($this->data["Subject"]); //Hopefully this is enough
+        $this->Sanitize->clean($this->data['Subject']); 
     
-    $this->Subject->create();
-        
-        if ($this->Subject->save($this->data["Subject"]))
-        {
-           $this->msgFlash('Your subject has been saved.','/admin/subjects/listing');
-        }
-    }     
+    if ($this->Subject->save($this->data)):
+            $this->msgFlash(__('Data saved', true),'/admin/subjects/listing');
+    endif;
+    endif;   
   }
   
-  public function admin_edit($id = null)
-  {
-     
-    if (empty($this->data["Subject"]))
-    {
+  public function admin_edit($subject_id = null)
+  {     
+    if (empty($this->data['Subject'])):
+
         $this->layout = 'admin';
         
-        $this->Subject->id = $id;
-        
-        $this->data = $this->Subject->read();
-    }
-    else
-    {
+        $this->data = $this->Subject->read(null, $subject_id);
+    
+    else:
+ 
         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->clean($this->data["Subject"]); //Hopefully this is enough
+        $this->Sanitize->clean($this->data['Subject']);
         
-        if ($this->Subject->save($this->data['Subject']))
-        {
+        if ($this->Subject->save($this->data)):
             $this->msgFlash('Your subject has been updated', '/admin/subjects/listing');
-        }
-    }
-}
+    endif;
+   endif;
+ }
   
-  public function admin_delete($id)
-  {
-        // deletes task from database
-        $this->Subject->del($id);
-        $this->msgFlash('Subject has been deleted','/admin/subjects/listing');
-  }
-  
+ public function admin_delete($subject_id)
+ {
+   if ( $this->Subject->del($subject_id) ):
+     $this->msgFlash('Subject has been deleted','/admin/subjects/listing');
+   endif;
+ } 
 }
 ?>