chamilo / chamilo-lms

main/exercice/hotpotatoes_exercise_result.class.php

Indentation +136 added lines, -136 removed lines

@@ -14,14 +14,14 @@ 
     //stores the results
     private $results = array();
 
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 */
-	public function getExercisesReporting($document_path, $hotpotato_name)
+    /**
+     * Gets the results of all students (or just one student if access is limited)
+     * @param	string		The document path (for HotPotatoes retrieval)
+     * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+     */
+    public function getExercisesReporting($document_path, $hotpotato_name)
     {
-		$return = array();
+        $return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
         $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
@@ -33,7 +33,7 @@ 
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
-          $session_id_and .= " AND exe_exo_id = $exercise_id ";
+            $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
         if (empty($user_id)) {
@@ -110,25 +110,25 @@ 
         $this->results = $return;
 
         return true;
-	}
+    }
 
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportCSV($document_path='', $hotpotato_name)
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportCSV($document_path='', $hotpotato_name)
     {
-		global $charset;
-		$this->getExercisesReporting($document_path, $hotpotato_name);
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $hotpotato_name);
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
 
         if (api_is_western_name_order()) {
             if(!empty($this->results[0]['first_name'])) {
@@ -147,7 +147,7 @@ 
         }
         $data .= get_lang('Email').';';
 
-		/*if ($export_user_fields) {
+        /*if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
 			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 			$num = count($extra_user_fields);
@@ -156,25 +156,25 @@ 
 			}
 		}*/
 
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
-		$data .= "\n";
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
+        $data .= "\n";
 
-		//results
-		foreach($this->results as $row) {
+        //results
+        foreach($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
-			/*if ($export_user_fields) {
+            /*if ($export_user_fields) {
 				//show user fields data, if any, for this user
 				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
 				foreach($user_fields_values as $value) {
@@ -182,40 +182,40 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-			$data .= "\n";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		}
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['exe_date']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= "\n";
+        }
+
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        // @todo add this utf-8 header for all csv files
+        echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -224,37 +224,37 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
-		if ($with_column_user) {
-		    $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
-		    $column++;
+        if ($with_column_user) {
+            $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
+            $column++;
 
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
-    			$column++;
+                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+                $column++;
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
                 $column++;
             } else {
@@ -263,36 +263,36 @@ 
                 $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
                 $column++;
             }
-		}
+        }
 
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
-				$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
-				$column++;
-			}
-		}
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+                $column++;
+            }
+        }
 
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('EndDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
+        $column++;
         $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Status'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
@@ -309,38 +309,38 @@ 
                     $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
-			}
+            }
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['start_date']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['end_date']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
+            $column++;
+            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
             $column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['duration']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
-			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
-			$column++;
             $worksheet->SetCellValueByColumnAndRow($line,$column,$row['status']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }

main/exercice/hotspot_actionscript_admin.as.php

Indentation +4 added lines, -4 removed lines

@@ -98,10 +98,10 @@
         }*/
     }
 
-	// This is a good answer, count + 1 for nmbr of clicks
-	if ($answers['weighting'][$i] > 0) {
-		$nmbrTries++;
-	}
+    // This is a good answer, count + 1 for nmbr of clicks
+    if ($answers['weighting'][$i] > 0) {
+        $nmbrTries++;
+    }
 
     $hotSpot['coord'] = $answers['hotspot_coordinates'][$i];
     $data['hotspots'][] = $hotSpot;

main/exercice/result.php

Indentation +7 added lines, -7 removed lines

@@ -17,13 +17,13 @@ 
 $show_headers = isset($_REQUEST['show_headers']) ? intval($_REQUEST['show_headers']) : null; //exe id
 
 if ($origin == 'learnpath') {
-	$show_headers = false;
+    $show_headers = false;
 }
 
 api_protect_course_script($show_headers);
 
 if (empty($id)) {
-	api_not_allowed($show_headers);
+    api_not_allowed($show_headers);
 }
 
 $is_allowedToEdit = api_is_allowed_to_edit(null,true) || $is_courseTutor;
@@ -49,7 +49,7 @@ 
 // Only users can see their own results
 if (!$is_allowedToEdit) {
     if ($student_id != $current_user_id) {
-    	api_not_allowed($show_headers);
+        api_not_allowed($show_headers);
     }
 }
 
@@ -62,19 +62,19 @@ 
         "name" => get_lang('Exercises'),
     );
     $interbreadcrumb[] = array("url" => "#", "name" => get_lang('Result'));
-	$this_section = SECTION_COURSES;
-	Display::display_header();
+    $this_section = SECTION_COURSES;
+    Display::display_header();
 } else {
     $htmlHeadXtra[] = "
     <style>
     body { background: none;}
     </style>
     ";
-	Display::display_reduced_header();
+    Display::display_reduced_header();
 }
 
 ExerciseLib::display_question_list_by_attempt($objExercise, $id, false);
 
 if ($show_headers) {
-	Display::display_footer();
+    Display::display_footer();
 }

main/exercice/multiple_answer.class.php

Indentation +11 added lines, -11 removed lines

@@ -166,12 +166,12 @@ 
     }
 
 
-	/**
-	 * abstract function which creates the form to create / edit the answers of the question
-	 * @param the formvalidator instance
-	 * @param the answers number to display
-	 */
-	function processAnswersCreation($form)
+    /**
+     * abstract function which creates the form to create / edit the answers of the question
+     * @param the formvalidator instance
+     * @param the answers number to display
+     */
+    function processAnswersCreation($form)
     {
         $questionWeighting = $nbrGoodAnswers = 0;
         $objAnswer  = new Answer($this->id);
@@ -201,12 +201,12 @@ 
         // sets the total weighting of the question
         $this->updateWeighting($questionWeighting);
         $this->save();
-	}
+    }
 
-	function return_header($feedback_type = null, $counter = null, $score = null)
+    function return_header($feedback_type = null, $counter = null, $score = null)
     {
-	    $header = parent::return_header($feedback_type, $counter, $score);
-	    $header .= '<table class="'.$this->question_table_class .'">
+        $header = parent::return_header($feedback_type, $counter, $score);
+        $header .= '<table class="'.$this->question_table_class .'">
 			<tr>
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
@@ -214,7 +214,7 @@ 
         $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;
-	}
+    }
 
 
 }

main/exercice/showinframes.php

Indentation +3 added lines, -3 removed lines

@@ -28,10 +28,10 @@
 $content = ReadFileCont($full_file_path.$user_id.'.t.html');
 
 if ($content == '') {
-	$content = ReadFileCont($full_file_path);
+    $content = ReadFileCont($full_file_path);
     // Do not move this like:
-	$mit = "function Finish(){";
-	$js_content = "
+    $mit = "function Finish(){";
+    $js_content = "
     // Code added - start
     var SaveScoreVariable = 0;
     function mySaveScore() {

main/exercice/hotpotatoes.lib.php

Indentation +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
                     if (is_dir($full_name)) {
                         $filelist[] = $file;
                     }
-               }
+                }
             }
         }
     }

main/exercice/unique_answer_no_option.class.php

Indentation +62 added lines, -62 removed lines

@@ -12,21 +12,21 @@ 
  */
 class UniqueAnswerNoOption extends Question
 {
-	static $typePicture = 'mcuao.png';
-	static $explanationLangVar = 'UniqueAnswerNoOption';
+    static $typePicture = 'mcuao.png';
+    static $explanationLangVar = 'UniqueAnswerNoOption';
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
+    /**
+     * Constructor
+     */
+    public function __construct()
     {
-		//this is highly important
-		parent::__construct();
-		$this -> type = UNIQUE_ANSWER_NO_OPTION;
-		$this -> isContent = $this-> getIsContent();
-	}
+        //this is highly important
+        parent::__construct();
+        $this -> type = UNIQUE_ANSWER_NO_OPTION;
+        $this -> isContent = $this-> getIsContent();
+    }
 
-	/**
+    /**
      * function which redifines Question::createAnswersForm
      * @param the formvalidator instance
      * @param the answers number to display
@@ -283,37 +283,37 @@ 
     }
 
     /**
-	 * Function which creates the form to create / edit the answers of the question
-	 * @param the formvalidator instance
-	 * @param the answers number to display
-	 */
-	function processAnswersCreation($form)
+     * Function which creates the form to create / edit the answers of the question
+     * @param the formvalidator instance
+     * @param the answers number to display
+     */
+    function processAnswersCreation($form)
     {
-		$questionWeighting = $nbrGoodAnswers = 0;
-		$correct = $form -> getSubmitValue('correct');
-		$objAnswer = new Answer($this->id);
-		$nb_answers = $form -> getSubmitValue('nb_answers');
-		$minus = 1;
-		if ($form -> getSubmitValue('new_question')) {
-		    $minus = 0;
-		}
-
-		for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
-		    $position   = trim($form -> getSubmitValue('position['.$i.']'));
-        	$answer     = trim($form -> getSubmitValue('answer['.$i.']'));
+        $questionWeighting = $nbrGoodAnswers = 0;
+        $correct = $form -> getSubmitValue('correct');
+        $objAnswer = new Answer($this->id);
+        $nb_answers = $form -> getSubmitValue('nb_answers');
+        $minus = 1;
+        if ($form -> getSubmitValue('new_question')) {
+            $minus = 0;
+        }
+
+        for ($i=1 ; $i <= $nb_answers - $minus; $i++) {
+            $position   = trim($form -> getSubmitValue('position['.$i.']'));
+            $answer     = trim($form -> getSubmitValue('answer['.$i.']'));
             $comment    = trim($form -> getSubmitValue('comment['.$i.']'));
             $weighting  = trim($form -> getSubmitValue('weighting['.$i.']'));
             $scenario   = $form -> getSubmitValue('scenario');
 
-           	//$list_destination = $form -> getSubmitValue('destination'.$i);
-           	//$destination_str = $form -> getSubmitValue('destination'.$i);
+                //$list_destination = $form -> getSubmitValue('destination'.$i);
+                //$destination_str = $form -> getSubmitValue('destination'.$i);
 
- 		    $try           = $scenario['try'.$i];
+                $try           = $scenario['try'.$i];
             $lp            = $scenario['lp'.$i];
- 			$destination   = $scenario['destination'.$i];
- 			$url           = trim($scenario['url'.$i]);
+                $destination   = $scenario['destination'.$i];
+                $url           = trim($scenario['url'.$i]);
 
- 			/*
+                /*
  			How we are going to parse the destination value
 
 			here we parse the destination value which is a string
@@ -326,41 +326,41 @@ 
 			selected_questions= ids of questions
 			url= an url
 			*/
-			/*
+            /*
  			$destination_str='';
  			foreach ($list_destination as $destination_id)
  			{
  				$destination_str.=$destination_id.';';
  			}*/
 
-        	$goodAnswer= ($correct == $i) ? true : false;
+            $goodAnswer= ($correct == $i) ? true : false;
 
-        	if ($goodAnswer) {
-        		$nbrGoodAnswers++;
-        		$weighting = abs($weighting);
-        		if($weighting > 0) {
+            if ($goodAnswer) {
+                $nbrGoodAnswers++;
+                $weighting = abs($weighting);
+                if($weighting > 0) {
                     $questionWeighting += $weighting;
                 }
-        	}
+            }
 
- 			if (empty($try))
- 				$try=0;
+                if (empty($try))
+                    $try=0;
 
- 			if (empty($lp)) {
- 				$lp=0;
- 			}
+                if (empty($lp)) {
+                    $lp=0;
+                }
 
- 			if (empty($destination)) {
- 				$destination=0;
- 			}
+                if (empty($destination)) {
+                    $destination=0;
+                }
 
- 			if ($url=='') {
- 				$url=0;
- 			}
+                if ($url=='') {
+                    $url=0;
+                }
 
- 			//1@@1;2;@@2;4;4;@@http://www.chamilo.org
-			$dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
-        	$objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
+                //1@@1;2;@@2;4;4;@@http://www.chamilo.org
+            $dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
+            $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
         }
 
         //Create 666 answer
@@ -373,18 +373,18 @@ 
 
         $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest);
 
-    	// saves the answers into the data base
+        // saves the answers into the data base
         $objAnswer -> save();
 
         // sets the total weighting of the question
         $this -> updateWeighting($questionWeighting);
         $this -> save();
-	}
+    }
 
-	function return_header($feedback_type = null, $counter = null, $score = null)
+    function return_header($feedback_type = null, $counter = null, $score = null)
     {
-	    $header = parent::return_header($feedback_type, $counter, $score);
-	    $header .= '<table class="'.$this->question_table_class .'">
+        $header = parent::return_header($feedback_type, $counter, $score);
+        $header .= '<table class="'.$this->question_table_class .'">
 			<tr>
 				<th>'.get_lang("Choice").'</th>
 				<th>'. get_lang("ExpectedChoice").'</th>
@@ -392,5 +392,5 @@ 
         $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
         return $header;
-	}
+    }
 }

main/exercice/question_pool.php

Indentation +121 added lines, -121 removed lines

@@ -172,11 +172,11 @@ 
 }
 
 if (isset($_SESSION['gradebook'])){
-	$gradebook=	$_SESSION['gradebook'];
+    $gradebook=	$_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array ('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook'));
+    $interbreadcrumb[]= array ('url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook'));
 }
 
 // if admin of course
@@ -227,8 +227,8 @@ 
 echo '</div>';
 
 if ($displayMessage != "") {
-	Display::display_confirmation_message($displayMessage);
-	$displayMessage = "";
+    Display::display_confirmation_message($displayMessage);
+    $displayMessage = "";
 }
 
 // Form
@@ -236,7 +236,7 @@ 
 // Title
 echo '<legend>'.$nameTools.' - '.$titleAdd.'</legend>';
 if (isset($type)) {
-	echo '<input type="hidden" name="type" value="1">';
+    echo '<input type="hidden" name="type" value="1">';
 }
 echo '<input type="hidden" name="fromExercise" value="'.$fromExercise.'">';
 
@@ -283,11 +283,11 @@ 
 foreach ($course_list as $item) {
     $courseItemId = $item['real_id'];
     $courseInfo = api_get_course_info_by_id($courseItemId);
-	$course_select_list[$courseItemId] = "";
-	if ($courseItemId == api_get_course_int_id()) {
-		$course_select_list[$courseItemId] = ">&nbsp;&nbsp;&nbsp;&nbsp;";
-	}
-	$course_select_list[$courseItemId] .= $courseInfo['title'];
+    $course_select_list[$courseItemId] = "";
+    if ($courseItemId == api_get_course_int_id()) {
+        $course_select_list[$courseItemId] = ">&nbsp;&nbsp;&nbsp;&nbsp;";
+    }
+    $course_select_list[$courseItemId] .= $courseInfo['title'];
 }
 
 $select_course_html =  Display::select(
@@ -304,11 +304,11 @@ 
     // no course selected, reset menu test / difficult� / type de reponse
     reset_menu_exo_lvl_type();
 } else {
-	$course_info = api_get_course_info_by_id($selected_course);
+    $course_info = api_get_course_info_by_id($selected_course);
 }
 // If course has changed, reset the menu default
 if ($course_id_changed) {
-	reset_menu_exo_lvl_type();
+    reset_menu_exo_lvl_type();
 }
 
 $course_id = $course_info['real_id'];
@@ -356,7 +356,7 @@ 
 }
 
 if ($exercise_id_changed == 1) {
-	reset_menu_lvl_type();
+    reset_menu_lvl_type();
 }
 $select_exercise_html =  Display::select(
     'exerciseId',
@@ -434,19 +434,19 @@ 
 // if we have selected an exercise in the list-box 'Filter'
 
 if ($exerciseId > 0) {
-	$where = '';
-	$from = '';
-	if (isset($courseCategoryId) && $courseCategoryId > 0) {
-		$from = ", $TBL_COURSE_REL_CATEGORY crc ";
-		$where .= " AND crc.c_id=$selected_course AND crc.question_id=qu.id AND crc.category_id=$courseCategoryId";
-	}
-	if (isset($exerciseLevel) && $exerciseLevel != -1) {
-		$where .= ' AND level='.$exerciseLevel;
-	}
-	if (isset($answerType) && $answerType > 0) {
-		$where .= ' AND type='.$answerType;
-	}
-	$sql = "SELECT DISTINCT
+    $where = '';
+    $from = '';
+    if (isset($courseCategoryId) && $courseCategoryId > 0) {
+        $from = ", $TBL_COURSE_REL_CATEGORY crc ";
+        $where .= " AND crc.c_id=$selected_course AND crc.question_id=qu.id AND crc.category_id=$courseCategoryId";
+    }
+    if (isset($exerciseLevel) && $exerciseLevel != -1) {
+        $where .= ' AND level='.$exerciseLevel;
+    }
+    if (isset($answerType) && $answerType > 0) {
+        $where .= ' AND type='.$answerType;
+    }
+    $sql = "SELECT DISTINCT
 	            id,
 	            question,
 	            type,
@@ -468,22 +468,22 @@ 
         $mainQuestionList[] = $row;
     }
 } elseif ($exerciseId == -1) {
-	// If we have selected the option 'Orphan questions' in the list-box 'Filter'
-	$level_where = '';
-	$from = '';
-	if (isset($courseCategoryId) && $courseCategoryId > 0) {
-		$from = " INNER JOIN  $TBL_COURSE_REL_CATEGORY crc ON crc.question_id=q.id AND crc.c_id= q.c_id ";
-		$level_where .= " AND
+    // If we have selected the option 'Orphan questions' in the list-box 'Filter'
+    $level_where = '';
+    $from = '';
+    if (isset($courseCategoryId) && $courseCategoryId > 0) {
+        $from = " INNER JOIN  $TBL_COURSE_REL_CATEGORY crc ON crc.question_id=q.id AND crc.c_id= q.c_id ";
+        $level_where .= " AND
 		        crc.c_id = $selected_course AND
 		        crc.category_id = $courseCategoryId";
-	}
-	if (isset($exerciseLevel) && $exerciseLevel!= -1 ) {
-		$level_where = ' AND level='.$exerciseLevel;
-	}
-	$answer_where = '';
-	if (isset($answerType) && $answerType >0 -1 ) {
-		$answer_where = ' AND type='.$answerType;
-	}
+    }
+    if (isset($exerciseLevel) && $exerciseLevel!= -1 ) {
+        $level_where = ' AND level='.$exerciseLevel;
+    }
+    $answer_where = '';
+    if (isset($answerType) && $answerType >0 -1 ) {
+        $answer_where = ' AND type='.$answerType;
+    }
 
     // @todo fix this query with the new id field
     $sql = " (
@@ -525,24 +525,24 @@ 
         $mainQuestionList[] = $row;
     }
 } else {
-	// All tests for selected course
+    // All tests for selected course
     // If we have not selected any option in the list-box 'Filter'
-	$filter = '';
-	$from = '';
+    $filter = '';
+    $from = '';
 
-	if (isset($courseCategoryId) && $courseCategoryId > 0) {
-		$from = ", $TBL_COURSE_REL_CATEGORY crc ";
-		$filter .= " AND
+    if (isset($courseCategoryId) && $courseCategoryId > 0) {
+        $from = ", $TBL_COURSE_REL_CATEGORY crc ";
+        $filter .= " AND
 		            crc.c_id = $selected_course AND
 		            crc.question_id = qu.id AND
 		            crc.category_id = $courseCategoryId";
-	}
-	if (isset($exerciseLevel) && $exerciseLevel != -1) {
-		$filter .= ' AND level='.$exerciseLevel.' ';
-	}
-	if (isset($answerType) && $answerType > 0) {
-		$filter .= ' AND qu.type='.$answerType.' ';
-	}
+    }
+    if (isset($exerciseLevel) && $exerciseLevel != -1) {
+        $filter .= ' AND level='.$exerciseLevel.' ';
+    }
+    if (isset($answerType) && $answerType > 0) {
+        $filter .= ' AND qu.type='.$answerType.' ';
+    }
 
     if (!empty($session_id) && $session_id != '-1') {
         $mainQuestionList = array();
@@ -644,7 +644,7 @@ 
             $mainQuestionList[] = $row;
         }
     }
-	// forces the value to 0
+    // forces the value to 0
     $exerciseId = 0;
 }
 
@@ -670,33 +670,33 @@ 
 //
 if ($fromExercise <= 0) {
     // NOT IN A TEST - IN THE COURSE
-	if ($selected_course == api_get_course_int_id()) {
-		$actionLabel = get_lang('Modify');
-		$actionIcon1 = "edit";
-		$actionIcon2 = "delete";
+    if ($selected_course == api_get_course_int_id()) {
+        $actionLabel = get_lang('Modify');
+        $actionIcon1 = "edit";
+        $actionIcon2 = "delete";
         // We are in the course, question title can be a link to the question edit page
-		$questionTagA = 1;
+        $questionTagA = 1;
     } else { // NOT IN A TEST - NOT IN THE COURSE
-		$actionLabel = get_lang('Reuse');
-		$actionIcon1 = get_lang('MustBeInATest');
-		$actionIcon2 = "";
+        $actionLabel = get_lang('Reuse');
+        $actionIcon1 = get_lang('MustBeInATest');
+        $actionIcon2 = "";
         // We are not in this course, to messy if we link to the question in another course
-		$questionTagA = 0;
-	}
+        $questionTagA = 0;
+    }
 } else {
     // IN A TEST - IN THE COURSE
-	if ($selected_course == api_get_course_int_id()) {
-		$actionLabel = get_lang('Reuse');
-		$actionIcon1 = "add";
-		$actionIcon2 = "";
-		$questionTagA = 1;
+    if ($selected_course == api_get_course_int_id()) {
+        $actionLabel = get_lang('Reuse');
+        $actionIcon1 = "add";
+        $actionIcon2 = "";
+        $questionTagA = 1;
     } else {
         // IN A TEST - NOT IN THE COURSE
-		$actionLabel = get_lang('Reuse');
-		$actionIcon1 = "clone";
-		$actionIcon2 = "";
-		$questionTagA = 0;
-	}
+        $actionLabel = get_lang('Reuse');
+        $actionIcon1 = "clone";
+        $actionIcon2 = "";
+        $questionTagA = 0;
+    }
 }
 // Display table
 $header = array(
@@ -789,7 +789,7 @@ 
 );
 
 if (!$nbrQuestions) {
-	echo get_lang('NoQuestion');
+    echo get_lang('NoQuestion');
 }
 
 Display::display_footer();
@@ -801,9 +801,9 @@ 
 */
 function reset_menu_lvl_type()
 {
-	global $exerciseLevel, $answerType;
-	$answerType = -1;
-	$exerciseLevel = -1;
+    global $exerciseLevel, $answerType;
+    $answerType = -1;
+    $exerciseLevel = -1;
 }
 
 /**
@@ -813,10 +813,10 @@ 
 */
 function reset_menu_exo_lvl_type()
 {
-	global $exerciseId, $courseCategoryId;
-	reset_menu_lvl_type();
-	$exerciseId = 0;
-	$courseCategoryId = 0;
+    global $exerciseId, $courseCategoryId;
+    reset_menu_lvl_type();
+    $exerciseId = 0;
+    $courseCategoryId = 0;
 }
 
 /**
@@ -838,17 +838,17 @@ 
     $in_questionname,
     $sessionId
 ) {
-	$res = $in_questionname;
+    $res = $in_questionname;
     $sessionIcon = null;
-	if ($in_addA) {
+    if ($in_addA) {
         if (!empty($sessionId) && $sessionId != -1) {
             $sessionIcon = ' '.Display::return_icon('star.png', get_lang('Session'));
         }
-		$res = "<a href='admin.php?".api_get_cidreq()."&editQuestion=$in_questionid&type=$in_questiontype&fromExercise=$in_fromex'>".
+        $res = "<a href='admin.php?".api_get_cidreq()."&editQuestion=$in_questionid&type=$in_questiontype&fromExercise=$in_fromex'>".
             $res.$sessionIcon.
             "</a>";
-	}
-	return $res;
+    }
+    return $res;
 }
 
 /**
@@ -878,16 +878,16 @@ 
     $in_session_id,
     $in_exercise_id
 ) {
-	$res = "";
-	$getParams = "&selected_course=$in_selected_course&courseCategoryId=$in_courseCategoryId&exerciseId=$in_exercise_id&exerciseLevel=$in_exerciseLevel&answerType=$in_answerType&session_id=$in_session_id";
-	switch ($in_action) {
-		case "delete" :
-			$res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&delete=$in_questionid' onclick='return confirm_your_choice()'>";
-			$res .= Display::return_icon("delete.png", get_lang('Delete'));
-			$res .= "</a>";
-			break;
-		case "edit" :
-			$res = get_a_tag_for_question(
+    $res = "";
+    $getParams = "&selected_course=$in_selected_course&courseCategoryId=$in_courseCategoryId&exerciseId=$in_exercise_id&exerciseLevel=$in_exerciseLevel&answerType=$in_answerType&session_id=$in_session_id";
+    switch ($in_action) {
+        case "delete" :
+            $res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&delete=$in_questionid' onclick='return confirm_your_choice()'>";
+            $res .= Display::return_icon("delete.png", get_lang('Delete'));
+            $res .= "</a>";
+            break;
+        case "edit" :
+            $res = get_a_tag_for_question(
                 1,
                 $from_exercise,
                 $in_questionid,
@@ -895,33 +895,33 @@ 
                 Display::return_icon("edit.png", get_lang('Modify')),
                 $in_session_id
             );
-			break;
-		case "add":
-			// add if question is not already in test
-			$myObjEx = new Exercise();
-			$myObjEx->read($from_exercise);
-			if (!$myObjEx->isInList($in_questionid)) {
-				$res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&recup=$in_questionid&fromExercise=$from_exercise'>";
-				$res .= Display::return_icon("view_more_stats.gif", get_lang('InsertALinkToThisQuestionInTheExercise'));
-				$res .= "</a>";
+            break;
+        case "add":
+            // add if question is not already in test
+            $myObjEx = new Exercise();
+            $myObjEx->read($from_exercise);
+            if (!$myObjEx->isInList($in_questionid)) {
+                $res = "<a href='".api_get_self()."?".api_get_cidreq().$getParams."&recup=$in_questionid&fromExercise=$from_exercise'>";
+                $res .= Display::return_icon("view_more_stats.gif", get_lang('InsertALinkToThisQuestionInTheExercise'));
+                $res .= "</a>";
             } else {
-				$res = "-";
-			}
-			unset($myObjEx);
-			break;
-		case "clone":
+                $res = "-";
+            }
+            unset($myObjEx);
+            break;
+        case "clone":
             $url = api_get_self()."?".api_get_cidreq().$getParams."&question_copy=$in_questionid&course_id=$in_selected_course&fromExercise=$from_exercise";
             $res = Display::url(
                 Display::return_icon('cd.gif', get_lang('ReUseACopyInCurrentTest')),
                 $url
             );
-			break;
-		default :
-			$res = $in_action;
-			break;
-	}
+            break;
+        default :
+            $res = $in_action;
+            break;
+    }
 
-	return $res;
+    return $res;
 }
 
 /**
@@ -930,14 +930,14 @@ 
  */
 function get_question_type_for_question($in_selectedcourse, $in_questionid)
 {
-	$myObjQuestion = Question::read($in_questionid, $in_selectedcourse);
+    $myObjQuestion = Question::read($in_questionid, $in_selectedcourse);
     $questionType = null;
     if (!empty($myObjQuestion)) {
         list($typeImg, $typeExpl) = $myObjQuestion->get_type_icon_html();
         $questionType = Display::tag('div', Display::return_icon($typeImg, $typeExpl, array(), 32), array());
         unset($myObjQuestion);
     }
-	return $questionType;
+    return $questionType;
 }
 
 /**
@@ -946,6 +946,6 @@ 
  */
 function get_question_categorie_for_question($in_courseid, $in_questionid)
 {
-	$cat = TestCategory::getCategoryNameForQuestion($in_questionid, $in_courseid);
-	return $cat;
+    $cat = TestCategory::getCategoryNameForQuestion($in_questionid, $in_courseid);
+    return $cat;
 }

main/gradebook/gradebook_display_certificate.php

Indentation +9 added lines, -9 removed lines

@@ -162,17 +162,17 @@
 
     if ($form->validate()) {
         $officialCode = $form->getSubmitValue('filter');
-         if ($officialCode == 'all') {
+            if ($officialCode == 'all') {
             $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
         } else {
-             $userList = UserManager::getUsersByOfficialCode($officialCode);
-             if (!empty($userList)) {
-                 $certificate_list = GradebookUtils::get_list_users_certificates(
-                     $cat_id,
-                     $userList
-                 );
-             }
-         }
+                $userList = UserManager::getUsersByOfficialCode($officialCode);
+                if (!empty($userList)) {
+                    $certificate_list = GradebookUtils::get_list_users_certificates(
+                        $cat_id,
+                        $userList
+                    );
+                }
+            }
     } else {
         $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
     }