Changeset 728 for trunk/app/controllers

Timestamp:

08/19/08 19:50:28 (3 months ago)

Author:

aarkerio

Message:

Little changes

Location:

trunk/app/controllers

Files:

• tests_controller.php (modified) (2 diffs)
• treasures_controller.php (modified) (2 diffs)
• vclassrooms_controller.php (modified) (2 diffs)
• webquests_controller.php (modified) (1 diff)

trunk/app/controllers/tests_controller.php

@@ -78 +78 @@
     
     $this->Edublog->blog($this->data['Test']['blogger_id']); // set edublog components
-   
+    
     $this->Sanitize = new sanitize;
 
@@ -224 +224 @@
       $this->Sanitize->clean($this->data['TestsVclassroom']);
                  
-      $this->Test->TestsVclassroom->create(); 
-      
       if ( $this->Test->TestsVclassroom->save($this->data['TestsVclassroom'])):
                $this->msgFlash(__('Test assigned', true), '/admin/tests/vclassrooms/'.$this->data['TestsVclassroom']['test_id']);
-      else: 
-              die('Something is wrong, please report this bug');
       endif;
    endif;

trunk/app/controllers/treasures_controller.php

@@ -24 +24 @@
 /*
  * chksw() 
- * check if tresure string is OK, if so, save student data on ResultTreasure model 
+ * check if tresure string (final code) is OK, if so, save student data on ResultTreasure model 
  *
  */
@@ -143 +143 @@
  }
  
-  public function admin_link2class() 
- {
-    $this->layout    = 'admin';
-    // add to database
-   if ( !empty($this->data['TreasuresVclassroom']) )
-   {
-      $this->Sanitize = new Sanitize;
-           
-      $this->Sanitize->clean($this->data['TreasuresVclassroom']);
-                 
-      $this->Treasure->TreasuresVclassroom->create();
-      
-      if ( $this->Treasure->TreasuresVclassroom->save($this->data['TreasuresVclassroom']) ):
-          $this->msgFlash('Treasure assigned', '/admin/treasures/vclassrooms/'.$this->data['TreasuresVclassroom']['treasure_id']);
-      else: 
-              die('Something is wrong, please report this bug');
-      endif;
-   }
- }
-
-  public function admin_unlink2class() 
+ public function admin_link2class() 
+ {
+  $this->layout    = 'admin';
+  // add to database
+  if ( !empty($this->data['TreasuresVclassroom']) ):
+     $this->Sanitize = new Sanitize;
+     $this->Sanitize->clean($this->data['TreasuresVclassroom']);   
+     if ($this->Treasure->TreasuresVclassroom->save($this->data['TreasuresVclassroom']) ):
+        $this->msgFlash(__('Treasure assigned', true),'/admin/treasures/vclassrooms/'.$this->data['TreasuresVclassroom']['treasure_id']);
+     endif;
+  endif;
+ }
+
+ public function admin_unlink2class() 
  {
    $this->layout    = 'admin';
    // add to database
    if ( !empty($this->data['TreasuresVclassroom']) ):
-      $this->Sanitize = new Sanitize;
-           
-      $this->Sanitize->clean($this->data['TreasuresVclassroom']);
+     $this->Sanitize = new Sanitize;
+      
+     $this->Sanitize->clean($this->data['TreasuresVclassroom']);
                  
-      if ( $this->Treasures->TreasuresVclassroom->delete($this->data['TreasuresVclassroom']['id'])):
-               $this->msgFlash('Test unlinked', '/admin/tests/vclassrooms/'.$this->data['TreasuresVclassroom']['treasure_id']);
-      else: 
-              die('Something is wrong, please report this bug');
-      endif;
+     if ( $this->Treasure->TreasuresVclassroom->delete($this->data['TreasuresVclassroom']['id'])):
+        $this->msgFlash(__('Scavenger unlinked',true),'/admin/treasures/vclassrooms/'.$this->data['TreasuresVclassroom']['treasure_id']);
+     endif;
    endif;
  }

trunk/app/controllers/vclassrooms_controller.php

@@ -104 +104 @@
  public function jointoclass()
  {
-    if (!empty($this->data['UsersVclassroom'])) 
-    {  
-       // get the secret code by this classroom 
-        $code = $this->Vclassroom->field('secret', array("Vclassroom.id"=>$this->data['UsersVclassroom']['vclassroom_id']));
-        
-        if ($code != $this->data['UsersVclassroom']['code'] || $code == null) //code is correct ?
-        {
+  if (!empty($this->data['UsersVclassroom'])): 
+    // get the secret code by this classroom 
+    $code = $this->Vclassroom->field('secret', array("Vclassroom.id"=>$this->data['UsersVclassroom']['vclassroom_id']));
+        
+    if ($code != $this->data['UsersVclassroom']['code'] || $code == null): //code is correct ?
             $this->set('msg', 'Code is incorrect');
             $this->render('jointoclass', 'ajax');
-        }
-        elseif($this->Vclassroom->chkMember($this->data['UsersVclassroom']['vclassroom_id'], $this->Auth->user('id'))) // the student is already member in this class?
-        {
-            $this->set('msg', 'You are already member of this class!');
+    elseif($this->Vclassroom->chkMember($this->data['UsersVclassroom']['vclassroom_id'], $this->Auth->user('id'))): 
+    // the student is already member in this class?     
+            $this->set('msg', __('You are already member of this class', true));
             $this->render('jointoclass', 'ajax');
-        }
-        else
-        {
-        $this->data['UsersVclassroom']['user_id'] = $this->Auth->user('id');
+     else:
+            $this->data['UsersVclassroom']['user_id'] = $this->Auth->user('id');
 
         $this->Vclassroom->UsersVclassroom->create();
 
-        if ($this->Vclassroom->UsersVclassroom->save($this->data['UsersVclassroom']))
-            {  
-               $this->set('msg', 'You have joined to this class succesfully!');
+        if ($this->Vclassroom->UsersVclassroom->save($this->data['UsersVclassroom'])):  
+               $this->set('msg', __('You have joined to this class succesfully', true));
                $this->render('jointoclass', 'ajax');
-            }
-        }
-    }
+        endif;
+     endif;
+  endif;
  }
   
@@ -292 +286 @@
     $this->layout    = 'admin';
 
-    $this->pageTitle = 'Student Record';
+    $this->pageTitle = __('Student record', true);
     
     $this->set('data', $this->Vclassroom->studentRecord($student_id, $vclassroom_id));

trunk/app/controllers/webquests_controller.php

@@ -306 +306 @@
     $this->layout    = 'admin';
     // add to database
-   if ( !empty($this->data['VclassroomsWebquest']) )
-   {
+    if ( !empty($this->data['VclassroomsWebquest']) ):
       $this->Sanitize = new Sanitize;
            
       $this->Sanitize->clean($this->data['VclassroomsWebquest']);
                  
-      $this->Webquest->VclassroomsWebquest->create(); 
-      
       if ( $this->Webquest->VclassroomsWebquest->save($this->data['VclassroomsWebquest'])):
-               $this->msgFlash('Webquest assigned', '/admin/webquests/vclassrooms/'.$this->data['VclassroomsWebquest']['webquest_id']);
-      else: 
-              die('Something is wrong, please report this bug');
+        $this->msgFlash(__('Webquest assigned', true),'/admin/webquests/vclassrooms/'.$this->data['VclassroomsWebquest']['webquest_id']);
       endif;
-   }
- }
-
-  public function admin_unlink2class() 
- {
-    $this->layout    = 'admin';
-    // add to database
-   if ( !empty($this->data['VclassroomsWebquest']) )
-   {
+    endif;
+ }
+
+ public function admin_unlink2class() 
+ {
+   $this->layout    = 'admin';
+   // add to database
+   if ( !empty($this->data['VclassroomsWebquest']) ):
       $this->Sanitize = new Sanitize;
            
       $this->Sanitize->clean($this->data['VclassroomsWebquest']);
                  
-      if ( $this->Webquest->VclassroomsWebquest->delete($this->data['VclassroomsWebquest']['id']))
-      {
+      if ( $this->Webquest->VclassroomsWebquest->delete($this->data['VclassroomsWebquest']['id'])):
                $this->msgFlash('Webquest unlinked', '/admin/webquests/vclassrooms/'.$this->data['VclassroomsWebquest']['webquest_id']);
-      }
-      else
-      { 
-              die('Something is wrong, please report this bug');
-      }
-   }
- }
-
- public function admin_delete($id)
- {
-    $this->Webquest->del($id);
-    
-    $this->msgFlash('Webquest deleted', '/admin/webquests/listing/');
+      endif;
+   endif;
+ }
+
+ public function admin_delete($webquest_id)
+ {
+   if ($this->Webquest->del($webquest_id)):
+       $this->msgFlash(__('Data removed', true), '/admin/webquests/listing/');
+   endif;
  }
 }