Changeset 666 for trunk/app/controllers

Timestamp:

07/22/08 17:08:42 (4 months ago)

Author:

aarkerio

Message:

Exmans and vclass

Location:

trunk/app/controllers

Files:

• answers_controller.php (modified) (1 diff)
• questions_controller.php (modified) (4 diffs)
• tests_controller.php (modified) (3 diffs)

trunk/app/controllers/answers_controller.php

@@ -25 +25 @@
  public function admin_add() 
  {
-   if (!empty($this->data["Answer"]))
-   {  
-    //die(print_r($this->data));
+   if (!empty($this->data["Answer"])):  
         
-   $this->Sanitize = new Sanitize;
+     $this->Sanitize = new Sanitize;
         
-   $this->Sanitize->clean($this->data["Answer"]);
+     $this->Sanitize->clean($this->data["Answer"]);
         
-   $this->data["Answer"]['user_id'] = $this->Auth->user('id');
-
-   $this->Answer->create();
+     $this->data["Answer"]['user_id'] = $this->Auth->user('id');
         
-   if ( $this->Answer->save($this->data['Answer']) ) 
-   {
-     $conditions = array("Answer.question_id" => $this->data['Answer']['question_id']);
-     $fields     = array("Answer.id", "Answer.answer", "Answer.correct", "Answer.question_id");
-     $order      = "Answer.id";
-                    
-     $this->set('data', $this->Answer->findAll($conditions, $fields, $order));
-                    
-     $this->render('questions', 'ajax');
-   }
-   else
-   {
+     if ( $this->Answer->save($this->data) ):
+         $conditions = array("Answer.question_id" => $this->data['Answer']['question_id']);
+         $fields     = array("Answer.id", "Answer.answer", "Answer.correct", "Answer.question_id");
+         $order      = "Answer.id";           
+         $this->set('data', $this->Answer->findAll($conditions, $fields, $order));
+         $this->render('questions', 'ajax');
+   else:
      echo "Ajax error, check with the company's computer guy...";
-   }
-  }
+   endif;
+  endif;
  }
 

trunk/app/controllers/questions_controller.php

@@ -5 +5 @@
 *  GPLv3 manuel<arroba>mononeurona<punto>org
 */ 
-//File: /app/controllers/quotes_controller.php
+//File: /app/controllers/questions_controller.php
 
 uses('Sanitize');
@@ -29 +29 @@
         
     $this->data["Question"]['user_id'] = $this->Auth->user('id');
-
-    $this->Question->create();
         
-    if ( $this->Question->save( $this->data['Question'] ) ):
+    if ( $this->Question->save( $this->data ) ):
       $conditions = array('Question.test_id' => $this->data['Question']['test_id']);
       $fields     = array('Question.id','Question.question','Question.hint','Question.worth','Question.explanation','Question.test_id');
@@ -50 +48 @@
  {
     $this->layout = 'admin';
-    // adds new vote to database
-    if ( !empty($this->data["Question"]) )
-    {         
-        $this->Sanitize = new Sanitize;
+   
+    if ( !empty($this->data["Question"]) ):         
+         $this->Sanitize = new Sanitize;
         
-        $this->Sanitize->clean($this->data["Question"]);
+         $this->Sanitize->clean($this->data["Question"]);
                 
-         if ( $this->Question->save( $this->data['Question'] ) ) 
-         {
-              $this->msgFlash('Question saved', '/admin/tests/questions/'.$this->data['Question']['test_id']);
-         }
-         else
-         {
-                echo "Ajax error, check with the company's computer guy...";
-         }
-     }
-     else
-     {  
+     if ( $this->Question->save( $this->data ) ): 
+             $this->msgFlash(__('Question saved', true), '/admin/tests/questions/'.$this->data['Question']['test_id']);
+     else:
+             echo "Ajax error, check with the company's computer guy...";
+     endif;
+     else:  
         $this->data = $this->Question->read(null, $question_id);
-     }
+     endif;
   }
   
@@ -76 +68 @@
         $this->layout    = 'admin';
         
-        $this->pageTitle = 'Questions';
+        $this->pageTitle = __('Questions', true);
         
         $conditions = array("Question.user_id"=>$this->Auth->user('id'));

trunk/app/controllers/tests_controller.php

@@ -29 +29 @@
         $this->Auth->allow(array('view', 'display', 'result'));
    endif;
-   // L10n
-   $this->L10n = new L10n();
-   $this->L10n->get("en");
- 
-   Configure::write('Config.language', "en");
  }
 
  public function display($username, $user_id)
  {
-    $this->pageTitle = 'Exams';
+    $this->pageTitle = __('Tests', true);
           
     $this->layout    = $this->Edublog->layout($user_id);
@@ -53 +48 @@
     $user_id = $this->Test->field('Test.user_id', array("Test.id"=>$test_id));
     
-    $this->pageTitle = 'Exam';
+    $this->pageTitle = __('Test', true);
     
     $this->layout    = $this->Edublog->layout($user_id);
@@ -189 +184 @@
    $this->layout    = 'admin';
         
-   $this->pageTitle = 'Tests';
+   $this->pageTitle = __('Tests', true);
         
    $conditions = array('Test.user_id'=>$this->Auth->user('id'));