chamilo / chamilo-lms

main/exercice/export/exercise_import.inc.php

Spacing +18 added lines, -18 removed lines

@@ -20,7 +20,7 @@ 
     }
 
     do {
-        $path = $dir . $prefix . mt_rand(0, 9999999);
+        $path = $dir.$prefix.mt_rand(0, 9999999);
     } while (!mkdir($path, $mode));
 
     return $path;
@@ -74,7 +74,7 @@ 
     // used to specify the question directory where files could be found in relation in any question
     global $questionTempDir;
 
-    $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'qti2';
+    $archive_path = api_get_path(SYS_ARCHIVE_PATH).'qti2';
     $baseWorkDir = $archive_path;
 
     if (!is_dir($baseWorkDir)) {
@@ -118,14 +118,14 @@ 
     // parse every subdirectory to search xml question files
     while (false !== ($file = readdir($exerciseHandle))) {
 
-        if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") {
+        if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") {
 
             // Find each manifest for each question repository found
-            $questionHandle = opendir($baseWorkDir . '/' . $file);
+            $questionHandle = opendir($baseWorkDir.'/'.$file);
             while (false !== ($questionFile = readdir($questionHandle))) {
                 if (preg_match('/.xml$/i', $questionFile)) {
                     $result = parse_file($baseWorkDir, $file, $questionFile);
-                    $filePath = $baseWorkDir . $file;
+                    $filePath = $baseWorkDir.$file;
                     $file_found = true;
                 }
             }
@@ -133,7 +133,7 @@ 
 
             // Else ignore file
             $result = parse_file($baseWorkDir, '', $file);
-            $filePath = $baseWorkDir . '/' . $file;
+            $filePath = $baseWorkDir.'/'.$file;
             $file_found = true;
         }
     }
@@ -200,7 +200,7 @@ 
         }
 
         // delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         return $last_exercise_id;
     }
 
@@ -228,8 +228,8 @@ 
     global $record_item_body;
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!($fp = fopen($questionFilePath, 'r'))) {
         Display:: display_error_message(get_lang('Error opening question\'s XML file'));
@@ -326,10 +326,10 @@ 
     if ($record_item_body) {
 
         if ((!in_array($current_element, $non_HTML_tag_to_avoid))) {
-            $current_question_item_body .= "<" . $name;
+            $current_question_item_body .= "<".$name;
 
             foreach ($attributes as $attribute_name => $attribute_value) {
-                $current_question_item_body .= " " . $attribute_name . "=\"" . $attribute_value . "\"";
+                $current_question_item_body .= " ".$attribute_name."=\"".$attribute_value."\"";
             }
             $current_question_item_body .= ">";
         } else {
@@ -338,11 +338,11 @@ 
 
             if ($current_element == 'INLINECHOICEINTERACTION') {
 
-                $current_question_item_body .= "**claroline_start**" . $attributes['RESPONSEIDENTIFIER'] . "**claroline_end**";
+                $current_question_item_body .= "**claroline_start**".$attributes['RESPONSEIDENTIFIER']."**claroline_end**";
             }
             if ($current_element == 'TEXTENTRYINTERACTION') {
                 $correct_answer_value = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
-                $current_question_item_body .= "[" . $correct_answer_value . "]";
+                $current_question_item_body .= "[".$correct_answer_value."]";
 
             }
             if ($current_element == 'BR') {
@@ -457,7 +457,7 @@ 
     //treat the record of the full content of itembody tag :
 
     if ($record_item_body && (!in_array($current_element, $non_HTML_tag_to_avoid))) {
-        $current_question_item_body .= "</" . $name . ">";
+        $current_question_item_body .= "</".$name.">";
     }
 
     switch ($name) {
@@ -515,14 +515,14 @@ 
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= '' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['value'] .= ''.trim($data);
             }
             break;
         case 'FEEDBACKINLINE':
             if (!isset ($exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'])) {
                 $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] = trim($data);
             } else {
-                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' ' . trim($data);
+                $exercise_info['question'][$current_question_ident]['answer'][$current_answer_id]['feedback'] .= ' '.trim($data);
             }
             break;
         case 'SIMPLEASSOCIABLECHOICE':
@@ -546,8 +546,8 @@ 
             $answer_identifier = $exercise_info['question'][$current_question_ident]['correct_answers'][$current_answer_id];
             if ($current_inlinechoice_id == $answer_identifier) {
                 $current_question_item_body = str_replace(
-                    "**claroline_start**" . $current_answer_id . "**claroline_end**",
-                    "[" . $data . "]",
+                    "**claroline_start**".$current_answer_id."**claroline_end**",
+                    "[".$data."]",
                     $current_question_item_body
                 );
             } else {

main/exercice/export/aiken/aiken_import.inc.php

Spacing +15 added lines, -15 removed lines

@@ -25,7 +25,7 @@ 
         $dir .= '/';
 
     do {
-        $path = $dir . $prefix . mt_rand(0, 9999999);
+        $path = $dir.$prefix.mt_rand(0, 9999999);
     } while (!mkdir($path, $mode));
 
     return $path;
@@ -38,10 +38,10 @@ 
 function aiken_display_form($msg = '') {
     $name_tools = get_lang('ImportAikenQuiz');
     $form  = '<div class="actions">';
-    $form .= '<a href="exercise.php?show=test">' . Display :: return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+    $form .= '<a href="exercise.php?show=test">'.Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     $form .= '</div>';
     $form .= $msg;
-    $form_validator  = new FormValidator('aiken_upload', 'post',api_get_self()."?".api_get_cidreq(), null, array('enctype' => 'multipart/form-data') );
+    $form_validator = new FormValidator('aiken_upload', 'post', api_get_self()."?".api_get_cidreq(), null, array('enctype' => 'multipart/form-data'));
     $form_validator->addElement('header', $name_tools);
     $form_validator->addElement('text', 'total_weight', get_lang('TotalWeight'));
     $form_validator->addElement('file', 'userFile', get_lang('DownloadFile'));
@@ -89,7 +89,7 @@ 
     global $record_item_body;
     // used to specify the question directory where files could be found in relation in any question
     global $questionTempDir;
-    $archive_path = api_get_path(SYS_ARCHIVE_PATH) . 'aiken';
+    $archive_path = api_get_path(SYS_ARCHIVE_PATH).'aiken';
     $baseWorkDir = $archive_path;
 
     if (!is_dir($baseWorkDir)) {
@@ -130,9 +130,9 @@ 
 
     // Parse every subdirectory to search txt question files
     while (false !== ($file = readdir($exerciseHandle))) {
-        if (is_dir($baseWorkDir . '/' . $file) && $file != "." && $file != "..") {
+        if (is_dir($baseWorkDir.'/'.$file) && $file != "." && $file != "..") {
             //find each manifest for each question repository found
-            $questionHandle = opendir($baseWorkDir . '/' . $file);
+            $questionHandle = opendir($baseWorkDir.'/'.$file);
             while (false !== ($questionFile = readdir($questionHandle))) {
                 if (preg_match('/.txt$/i', $questionFile)) {
                     $result = aiken_parse_file(
@@ -154,7 +154,7 @@ 
         $result = 'NoTxtFileFoundInTheZip';
     }
 
-    if ($result !== true ) {
+    if ($result !== true) {
         return $result;
     }
 
@@ -215,7 +215,7 @@ 
         }
 
         // Delete the temp dir where the exercise was unzipped
-        my_delete($baseWorkDir . $uploadPath);
+        my_delete($baseWorkDir.$uploadPath);
         $operation = $last_exercise_id;
     }
 
@@ -235,8 +235,8 @@ 
 function aiken_parse_file(&$exercise_info, $exercisePath, $file, $questionFile) {
     global $questionTempDir;
 
-    $questionTempDir = $exercisePath . '/' . $file . '/';
-    $questionFilePath = $questionTempDir . $questionFile;
+    $questionTempDir = $exercisePath.'/'.$file.'/';
+    $questionFilePath = $questionTempDir.$questionFile;
 
     if (!is_file($questionFilePath)) {
         return 'FileNotFound';
@@ -248,13 +248,13 @@ 
     $answers_array = array();
     $new_question = true;
     foreach ($data as $line => $info) {
-        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/',$info)) {
+        if ($question_index > 0 && $new_question == true && preg_match('/^(\r)?\n/', $info)) {
             // double empty line
             continue;
         }
         $new_question = false;
         //make sure it is transformed from iso-8859-1 to utf-8 if in that form
-        if (!mb_check_encoding($info,'utf-8') && mb_check_encoding($info,'iso-8859-1')) {
+        if (!mb_check_encoding($info, 'utf-8') && mb_check_encoding($info, 'iso-8859-1')) {
             $info = utf8_encode($info);
         }
         $exercise_info['question'][$question_index]['type'] = 'MCUA';
@@ -286,7 +286,7 @@ 
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
-        } elseif (preg_match('/^(\r)?\n/',$info)) {
+        } elseif (preg_match('/^(\r)?\n/', $info)) {
             //moving to next question (tolerate \r\n or just \n)
             if (empty($exercise_info['question'][$question_index]['correct_answers'])) {
                 error_log('Aiken: Error in question index '.$question_index.': no correct answer defined');
@@ -306,7 +306,7 @@ 
                     $exercise_info['question'][$question_index]['title'] = $info;
                 } else {
                     //Question itself (use a 100-chars long title and a larger description)
-                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)) . '...';
+                    $exercise_info['question'][$question_index]['title'] = trim(substr($info, 0, 100)).'...';
                     $exercise_info['question'][$question_index]['description'] = $info;
                 }
             } else {
@@ -316,7 +316,7 @@ 
     }
     $total_questions = count($exercise_info['question']);
     $total_weight = (!empty($_POST['total_weight'])) ? intval($_POST['total_weight']) : 20;
-    foreach  ($exercise_info['question'] as $key => $question) {
+    foreach ($exercise_info['question'] as $key => $question) {
         $exercise_info['question'][$key]['weighting'][current(array_keys($exercise_info['question'][$key]['weighting']))] = $total_weight / $total_questions;
     }
     return true;

main/exercice/export/aiken/aiken_classes.php

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@ 
  * @package chamilo.exercise
  */
 
-if ( count( get_included_files() ) == 1 ) die( '---' );
+if (count(get_included_files()) == 1) die('---');
 
 if (!function_exists('mime_content_type')) {
 	function mime_content_type($filename) {
-		return DocumentManager::file_get_mime_type((string)$filename);
+		return DocumentManager::file_get_mime_type((string) $filename);
 	}
 }
 
@@ -25,7 +25,7 @@ 
      */
     function setAnswer()
     {
-        switch($this->type)
+        switch ($this->type)
         {
             case MCUA :
                 $answer = new AikenAnswerMultipleChoice($this->id);

main/exercice/export/scorm/scorm_classes.php

Spacing +181 added lines, -181 removed lines

@@ -32,7 +32,7 @@ 
     {
         $question = new ScormQuestion();
         $qst = $question->read($questionId);
-        if( !$qst ) {
+        if (!$qst) {
             return '';
         }
         $question->id = $qst->id;
@@ -40,9 +40,9 @@ 
         $question->type = $qst->type;
         $question->question = $qst->question;
         $question->description = $qst->description;
-        $question->weighting=$qst->weighting;
-        $question->position=$qst->position;
-        $question->picture=$qst->picture;
+        $question->weighting = $qst->weighting;
+        $question->position = $qst->position;
+        $question->picture = $qst->picture;
         $assessmentItem = new ScormAssessmentItem($question, $standalone);
         //echo "<pre>".print_r($scorm,1)."</pre>";exit;
         return $assessmentItem->export();
@@ -111,14 +111,14 @@ 
 		$html = $this->getQuestionHTML();
 		$js   = $this->getQuestionJS();
 
-		if( is_object($this->answer) )
+		if (is_object($this->answer))
 		{
-			list($js2,$html2) = $this->answer->export();
+			list($js2, $html2) = $this->answer->export();
 			$js .= $js2;
 			$html .= $html2;
 		}
 
-		return array($js,$html);
+		return array($js, $html);
 	}
 
     function createAnswersForm($form)
@@ -136,19 +136,19 @@ 
      */
     function getQuestionHTML()
     {
-    	$title			= $this->selectTitle();
-		$description	= $this->selectDescription();
+    	$title = $this->selectTitle();
+		$description = $this->selectDescription();
 		$cols = 2;
-		$s='<tr>' .
-			'<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">' . "\n" .
+		$s = '<tr>'.
+			'<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">'."\n".
 		   	$title.
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n" .
-		   	'<tr>' . "\n" .
-		   	'<td valign="top" colspan="'.$cols.'">' . "\n" .
-		   	'<i>'.$description.'</i>' . "\n" .
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n";
+		   	'</td>'."\n".
+		   	'</tr>'."\n".
+		   	'<tr>'."\n".
+		   	'<td valign="top" colspan="'.$cols.'">'."\n".
+		   	'<i>'.$description.'</i>'."\n".
+		   	'</td>'."\n".
+		   	'</tr>'."\n";
 		return $s;
     }
 
@@ -160,10 +160,10 @@ 
     	//$id = $this->id;
     	$w = $this->selectWeighting();
     	$s = 'questions.push('.$this->js_id.');'."\n";
-    	if($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
+    	if ($this->type == FREE_ANSWER or $this->type == HOT_SPOT)
     	{ //put the max score to 0 to avoid discounting the points of
     	  //non-exported quiz types in the SCORM
-    		$w=0;
+    		$w = 0;
     	}
     	$s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
     	return $s;
@@ -184,40 +184,40 @@ 
 	{
 		$html = '';
     	$js   = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 		$type = $this->getQuestionType();
 		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
 		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 
 		//not sure if we are going to export also the MULTIPLE_ANSWER_COMBINATION to SCORM
         //if ($type == MCMA  || $type == MULTIPLE_ANSWER_COMBINATION ) {
-		if ($type == MCMA ) {
+		if ($type == MCMA) {
         	//$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
         	$id = 1;
         	$jstmp = '';
         	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
+			foreach ($this->answer as $i => $answer)
 			{
 				$identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
 				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
+		    		'<tr>'."\n"
+				.	'<td align="center" width="5%">'."\n"
+		    	.	'<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />'."\n"
+		    	.	'</td>'."\n"
+		    	.	'<td width="95%">'."\n"
+		    	.	'<label for="'.$identifier.'">'.$this->answer[$i].'</label>'."\n"
+		    	.	'</td>'."\n"
+		    	.	'</tr>'."\n\n";
 		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
+		    	if ($this->correct[$i])
 		    	{
 		    		$jstmpc .= $i.',';
 		    	}
 		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
 		    	$id++;
 			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
+	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc, 0, -1).');'."\n";
 	    	if ($type == MCMA) {
 	    		$js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
 	    	} else {
@@ -228,14 +228,14 @@ 
         		//To this items we show the ThisItemIsNotExportable
         	    $qId = $this->questionJSId;
 		    	$js = '';
-		    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+		    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 				// some javascript must be added for that kind of questions
-				$html .= '<tr>' . "\n"
-						.	'<td>' . "\n"
-				    	. '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>' . "\n"
-				    	.	'</td>' . "\n"
-				    	.	'</tr>' . "\n";
-				$html .= '</table></td></tr>' . "\n";
+				$html .= '<tr>'."\n"
+						.	'<td>'."\n"
+				    	. '<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_exact" rows="20" cols="100"></textarea>'."\n"
+				    	.	'</td>'."\n"
+				    	.	'</tr>'."\n";
+				$html .= '</table></td></tr>'."\n";
 				// currently the exact answers cannot be displayed, so ignore the textarea
 				$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
 				$js .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
@@ -245,40 +245,40 @@ 
 				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
 		    	$js .= $jstmpw;
-		        return array($js,$html);
+		        return array($js, $html);
         } else {
         	//$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
         	$id = 1;
         	$jstmp = '';
         	$jstmpc = '';
-			foreach( $this->answer as $i => $answer )
+			foreach ($this->answer as $i => $answer)
 			{
 	        	$identifier = 'question_'.$this->questionJSId.'_unique_'.$i;
 	        	$identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
 				$html .=
-		    		'<tr>' . "\n"
-				.	'<td align="center" width="5%">' . "\n"
-		    	.	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'<td width="95%">' . "\n"
-		    	.	'<label for="'.$identifier.'">' . $this->answer[$i] . '</label>' . "\n"
-		    	.	'</td>' . "\n"
-		    	.	'</tr>' . "\n\n";
+		    		'<tr>'."\n"
+				.	'<td align="center" width="5%">'."\n"
+		    	.	'<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="radio"/>'."\n"
+		    	.	'</td>'."\n"
+		    	.	'<td width="95%">'."\n"
+		    	.	'<label for="'.$identifier.'">'.$this->answer[$i].'</label>'."\n"
+		    	.	'</td>'."\n"
+		    	.	'</tr>'."\n\n";
 		    	$jstmp .= $i.',';
-		    	if($this->correct[$i])
+		    	if ($this->correct[$i])
 		    	{
 		    		$jstmpc .= $i;
 		    	}
 		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";\n";
 		    	$id++;
 			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = '.$jstmpc.';'."\n";
 	    	$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
 			$js .= $jstmpw;
         }
-		$html .= '</table></td></tr>' . "\n";
-        return array($js,$html);
+		$html .= '</table></td></tr>'."\n";
+        return array($js, $html);
     }
 }
 
@@ -302,29 +302,29 @@ 
 		$identifier_true  = $identifier.'_true';
 		$identifier_false = $identifier.'_false';
 		$html .=
-    		'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
+    		'<tr>'."\n"
+		.	'<td align="center" width="5%">'."\n"
     	.	'<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" '
-		.		'/>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'<td width="95%">' . "\n"
-    	.	'<label for="'.$identifier_true.'">' . get_lang('True') . '</label>' . "\n"
-    	.	'</td>' . "\n"
-    	.	'</tr>' . "\n\n";
+		.		'/>'."\n"
+    	.	'</td>'."\n"
+    	.	'<td width="95%">'."\n"
+    	.	'<label for="'.$identifier_true.'">'.get_lang('True').'</label>'."\n"
+    	.	'</td>'."\n"
+    	.	'</tr>'."\n\n";
     	$html .=
-			'<tr>' . "\n"
-		.	'<td align="center" width="5%">' . "\n"
+			'<tr>'."\n"
+		.	'<td align="center" width="5%">'."\n"
 		.	'<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" '
-		.		'/>' . "\n"
-		.	'</td>' . "\n"
-		.	'<td width="95%">' . "\n"
-		.	'<label for="'.$identifier_false.'">' . get_lang('False') . '</label>' . "\n"
-		.	'</td>' . "\n"
-		.	'</tr>' . "\n\n";
-		$html .= '</table></td></tr>' . "\n";
+		.		'/>'."\n"
+		.	'</td>'."\n"
+		.	'<td width="95%">'."\n"
+		.	'<label for="'.$identifier_false.'">'.get_lang('False').'</label>'."\n"
+		.	'</td>'."\n"
+		.	'</tr>'."\n\n";
+		$html .= '</table></td></tr>'."\n";
 		$js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
     	$js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
-		if($this->response == 'TRUE')
+		if ($this->response == 'TRUE')
 		{
 	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
 		}
@@ -337,7 +337,7 @@ 
     	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
     	$js .= $jstmpw;
 
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -357,56 +357,56 @@ 
     {
     	global $charset;
     	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 		// get all enclosed answers
 		$blankList = array();
 		// build replacement
 		$replacementList = array();
-		foreach( $this->answer as $i => $answer) {
+		foreach ($this->answer as $i => $answer) {
 			$blankList[] = '['.$answer.']';
 		}
 		$answerCount = count($blankList);
 
 		// splits text and weightings that are joined with the character '::'
-		list($answer,$weight)=explode('::',$answer);
-		$weights = explode(',',$weight);
+		list($answer, $weight) = explode('::', $answer);
+		$weights = explode(',', $weight);
 		// because [] is parsed here we follow this procedure:
 		// 1. find everything between the [ and ] tags
-		$i=1;
+		$i = 1;
 		$jstmp = '';
 		$jstmpc = '';
 		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
 		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		$startlocations=api_strpos($answer,'[');
-		$endlocations=api_strpos($answer,']');
-		while($startlocations !== false && $endlocations !== false) {
-			$texstring=api_substr($answer,$startlocations,($endlocations-$startlocations)+1);
-			$answer = api_substr_replace($answer,'<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />',$startlocations,($endlocations-$startlocations)+1);
+		$startlocations = api_strpos($answer, '[');
+		$endlocations = api_strpos($answer, ']');
+		while ($startlocations !== false && $endlocations !== false) {
+			$texstring = api_substr($answer, $startlocations, ($endlocations - $startlocations) + 1);
+			$answer = api_substr_replace($answer, '<input type="text" name="question_'.$this->questionJSId.'_fib_'.$i.'" id="question_'.$this->questionJSId.'_fib_'.$i.'" size="10" value="" />', $startlocations, ($endlocations - $startlocations) + 1);
 			$jstmp .= $i.',';
-			$jstmpc .= "'".api_htmlentities(api_substr($texstring,1,-1),ENT_QUOTES,$charset)."',";
-				$my_weight=explode('@',$weights[$i-1]);
-				if (count($my_weight)==2) {
-					$weight_db=$my_weight[0];
+			$jstmpc .= "'".api_htmlentities(api_substr($texstring, 1, -1), ENT_QUOTES, $charset)."',";
+				$my_weight = explode('@', $weights[$i - 1]);
+				if (count($my_weight) == 2) {
+					$weight_db = $my_weight[0];
 				} else {
-					$weight_db=$my_weight[0];
+					$weight_db = $my_weight[0];
 				}
 	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
 			$i++;
-			$startlocations=api_strpos($answer,'[');
-			$endlocations=api_strpos($answer,']');
+			$startlocations = api_strpos($answer, '[');
+			$endlocations = api_strpos($answer, ']');
 		}
 
-		$html .= 	'<tr>' . "\n"
-				.	'<td>' . "\n"
-		    	.	$answer  . "\n"
-	    		.	'</td>' . "\n"
-	    		.	'</tr>' . "\n";
-		$html .= '</table></td></tr>' . "\n";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
+		$html .= '<tr>'."\n"
+				.	'<td>'."\n"
+		    	.	$answer."\n"
+	    		.	'</td>'."\n"
+	    		.	'</tr>'."\n";
+		$html .= '</table></td></tr>'."\n";
+		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp, 0, -1).');'."\n";
+    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc, 0, -1).');'."\n";
     	$js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
     	$js .= $jstmpw;
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -423,7 +423,7 @@ 
     function export()
     {
     	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
   		// prepare list of right proposition to allow
 		// - easiest display
 		// - easiest randomisation if needed one day
@@ -432,12 +432,12 @@ 
 			$displayedRightList = array_values($this->rightList);
 		}
 		// get max length of displayed array
-		$arrayLength = max( count($this->leftList), count($this->rightList) );
+		$arrayLength = max(count($this->leftList), count($this->rightList));
 
-		$nbrAnswers=$this->selectNbrAnswers();
-		$cpt1='A';
-		$cpt2=1;
-		$Select=array();
+		$nbrAnswers = $this->selectNbrAnswers();
+		$cpt1 = 'A';
+		$cpt2 = 1;
+		$Select = array();
 		$qId = $this->questionJSId;
 		$s = '';
 		$jstmp = '';
@@ -445,74 +445,74 @@ 
         $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
         $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+		for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
 			$identifier = 'question_'.$qId.'_matching_';
-			$answer=$this->selectAnswer($answerId);
-			$answerCorrect=$this->isCorrect($answerId);
-			$weight=$this->selectWeighting($answerId);
+			$answer = $this->selectAnswer($answerId);
+			$answerCorrect = $this->isCorrect($answerId);
+			$weight = $this->selectWeighting($answerId);
 			$jstmp .= $answerId.',';
 
 			if (!$answerCorrect) {
 				// options (A, B, C, ...) that will be put into the list-box
-				$Select[$answerId]['Lettre']=$cpt1;
+				$Select[$answerId]['Lettre'] = $cpt1;
 				// answers that will be shown at the right side
 				$Select[$answerId]['Reponse'] = $answer;
 				$cpt1++;
 			} else {
-				$s.='<tr>'."\n";
-				$s.='<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
-				$s.=' <option value="0">--</option>';
+				$s .= '<tr>'."\n";
+				$s .= '<td width="40%" valign="top">'."\n".'<b>'.$cpt2.'</b>.&nbsp;'.$answer."\n</td>\n";
+				$s .= '<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
+				$s .= ' <option value="0">--</option>';
 	            // fills the list-box
-	            foreach($Select as $key=>$val)
+	            foreach ($Select as $key=>$val)
 	            {
-					$s.='<option value="'.$key.'">'.$val['Lettre'].'</option>';
+					$s .= '<option value="'.$key.'">'.$val['Lettre'].'</option>';
 				}  // end foreach()
 
-				$s.='</select>&nbsp;&nbsp;</td>'."\n";
-				$s.='<td width="40%" valign="top">';
-				if(isset($Select[$cpt2])) $s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-					else $s.='&nbsp;';
-				$s.="</td>\n</tr>\n";
+				$s .= '</select>&nbsp;&nbsp;</td>'."\n";
+				$s .= '<td width="40%" valign="top">';
+				if (isset($Select[$cpt2])) $s .= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+					else $s .= '&nbsp;';
+				$s .= "</td>\n</tr>\n";
 
 				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
 
-				$my_weight=explode('@',$weight);
-				if (count($my_weight)==2) {
-					$weight=$my_weight[0];
+				$my_weight = explode('@', $weight);
+				if (count($my_weight) == 2) {
+					$weight = $my_weight[0];
 				} else {
-					$weight=$my_weight[0];
+					$weight = $my_weight[0];
 				}
 		    	$jstmpw .= 'questions_answers_ponderation['.$qId.']['.$cpt2.'] = '.$weight.";\n";
 				$cpt2++;
 
 				// if the left side of the "matching" has been completely shown
-				if($answerId == $nbrAnswers)
+				if ($answerId == $nbrAnswers)
 				{
 					// if there remain answers to be shown on the right side
-					while(isset($Select[$cpt2]))
+					while (isset($Select[$cpt2]))
 					{
 						//$s.='<tr>'."\n";
 						//$s.='<td colspan="2">'."\n";
 						//$s.='<table border="0" cellpadding="0" cellspacing="0" width="100%">'."\n";
-						$s.='<tr>'."\n";
-						$s.='<td width="60%" colspan="2">&nbsp;</td>'."\n";
-						$s.='<td width="40%" valign="top">';
-						$s.='<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-						$s.="</td>\n</tr>\n";
+						$s .= '<tr>'."\n";
+						$s .= '<td width="60%" colspan="2">&nbsp;</td>'."\n";
+						$s .= '<td width="40%" valign="top">';
+						$s .= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+						$s .= "</td>\n</tr>\n";
 						$cpt2++;
 					}	// end while()
 				}  // end if()
 			}
 		}
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc,0,-1).');'."\n";
+		$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp, 0, -1).');'."\n";
+    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.substr($jstmpc, 0, -1).');'."\n";
     	$js .= 'questions_types['.$this->questionJSId.'] = \'matching\';'."\n";
     	$js .= $jstmpw;
 		$html .= $s;
-		$html .= '</table></td></tr>' . "\n";
+		$html .= '</table></td></tr>'."\n";
 
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -549,7 +549,7 @@ 
 		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
     	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
     	$js .= $jstmpw;
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 /**
@@ -601,15 +601,15 @@ 
     function export()
     {
     	$js = $this->get_js_header();
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+    	$html = '<tr><td colspan="2"><table width="100%">'."\n";
 		// some javascript must be added for that kind of questions
 		$html .= '';
 
 		// Get the answers, make a list
-		$nbrAnswers=$this->selectNbrAnswers();
+		$nbrAnswers = $this->selectNbrAnswers();
 
 		$answer_list = '<div style="padding: 10px; margin-left: -8px; border: 1px solid #4271b5; height: 448px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><ol>';
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
+		for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++)
 		{
 			$answer_list .= '<li>'.$this->selectAnswer($answerId).'</li>';
 		}
@@ -658,11 +658,11 @@ 
                 </td>
             <tr>
 HTML;
-		$html .= '</table></td></tr>' . "\n";
+		$html .= '</table></td></tr>'."\n";
 
 		// currently the free answers cannot be displayed, so ignore the textarea
 		$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 
@@ -693,7 +693,7 @@ 
     {
         $this->question = $question;
         $this->question->setAnswer();
-        $this->questionIdent = "QST_" . $question->id ;
+        $this->questionIdent = "QST_".$question->id;
         $this->standalone = $standalone;
     }
 
@@ -707,9 +707,9 @@ 
     {
         global $charset;
         $head = "";
-        if( $this->standalone)
+        if ($this->standalone)
         {
-            $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n";
+            $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>'."\n";
             $head .= '<html>'."\n";
         }
         return $head;
@@ -720,7 +720,7 @@ 
      *
      */
     function end_page() {
-        if($this->standalone){return '</html>';}
+        if ($this->standalone) {return '</html>'; }
         return '';
     }
 
@@ -728,7 +728,7 @@ 
      * Start document header
      */
     function start_header() {
-        if($this->standalone){return '<head>'. "\n";}
+        if ($this->standalone) {return '<head>'."\n"; }
         return '';
     }
 
@@ -755,7 +755,7 @@ 
      */
     function end_header()
     {
-        if($this->standalone){return '</head>'. "\n";}
+        if ($this->standalone) {return '</head>'."\n"; }
         return '';
     }
     /**
@@ -775,11 +775,11 @@ 
     function common_js()
     {
         $js = file_get_contents('../newscorm/js/api_wrapper.js');
-        $js .= 'var questions = new Array();' . "\n";
-        $js .= 'var questions_answers = new Array();' . "\n";
-        $js .= 'var questions_answers_correct = new Array();' . "\n";
-        $js .= 'var questions_types = new Array();' . "\n";
-        $js .= "\n" .
+        $js .= 'var questions = new Array();'."\n";
+        $js .= 'var questions_answers = new Array();'."\n";
+        $js .= 'var questions_answers_correct = new Array();'."\n";
+        $js .= 'var questions_types = new Array();'."\n";
+        $js .= "\n".
             '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
@@ -819,7 +819,7 @@ 
         //$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
         //$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
         $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-        if($this->standalone){return $js. "\n";}
+        if ($this->standalone) {return $js."\n"; }
         return '';
     }
 
@@ -829,7 +829,7 @@ 
      */
     function end_js()
     {
-        if($this->standalone){return '</script>'. "\n";}
+        if ($this->standalone) {return '</script>'."\n"; }
         return '';
     }
 
@@ -839,7 +839,7 @@ 
      */
     function start_body()
     {
-        if($this->standalone){return '<body>'. "\n".'<form id="dokeos_scorm_form" method="post" action="">'."\n";}
+        if ($this->standalone) {return '<body>'."\n".'<form id="dokeos_scorm_form" method="post" action="">'."\n"; }
         return '';
     }
 
@@ -849,7 +849,7 @@ 
      */
     function end_body()
     {
-        if($this->standalone){return '<br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'. "\n";}
+        if ($this->standalone) {return '<br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'."\n"; }
         return '';
     }
 
@@ -864,9 +864,9 @@ 
     function export()
     {
         $js = $html = '';
-        list($js,$html) = $this->question->export();
+        list($js, $html) = $this->question->export();
         //list($js,$html) = $this->question->answer->export();
-        if($this->standalone)
+        if ($this->standalone)
         {
             $res = $this->start_page()
                 . $this->start_header()
@@ -888,7 +888,7 @@ 
         }
         else
         {
-            return array($js,$html);
+            return array($js, $html);
         }
     }
 }
@@ -917,9 +917,9 @@ 
      * @param boolean $standalone Wether it should include XML tag and DTD line.
      * @return The XML as a string, or an empty string if there's no exercise with given ID.
      */
-    public static function export_exercise_to_scorm($exerciseId, $standalone=true) {
+    public static function export_exercise_to_scorm($exerciseId, $standalone = true) {
         $exercise = new Exercise();
-        if (! $exercise->read($exerciseId)) {
+        if (!$exercise->read($exerciseId)) {
             return '';
         }
         $ims = new ScormSection($exercise);
@@ -946,7 +946,7 @@ 
     function start_page() {
         global $charset;
         $head = $foot = "";
-        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>' . "\n".'<html>'."\n";
+        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?>'."\n".'<html>'."\n";
         return $head;
     }
 
@@ -962,7 +962,7 @@ 
      * Start document header
      */
     function start_header() {
-        return '<head>'. "\n";
+        return '<head>'."\n";
     }
 
     /**
@@ -984,7 +984,7 @@ 
      * End document header
      */
     function end_header() {
-        return '</head>'. "\n";
+        return '</head>'."\n";
     }
 
     /**
@@ -992,7 +992,7 @@ 
      *
      */
     function start_js() {
-        return '<script type="text/javascript" language="javascript">'. "\n";
+        return '<script type="text/javascript" language="javascript">'."\n";
     }
 
     /**
@@ -1002,11 +1002,11 @@ 
         $js = "\n";
         $js .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
         $js .= file_get_contents('../newscorm/js/api_wrapper.js');
-        $js .= 'var questions = new Array();' . "\n";
-        $js .= 'var questions_answers = new Array();' . "\n";
-        $js .= 'var questions_answers_correct = new Array();' . "\n";
-        $js .= 'var questions_types = new Array();' . "\n";
-        $js .= "\n" .
+        $js .= 'var questions = new Array();'."\n";
+        $js .= 'var questions_answers = new Array();'."\n";
+        $js .= 'var questions_answers_correct = new Array();'."\n";
+        $js .= 'var questions_types = new Array();'."\n";
+        $js .= "\n".
             '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
@@ -1053,7 +1053,7 @@ 
         //$js .= 'addEvent(window,\'load\',loadPage,false);'."\n";
         //$js .= 'addEvent(window,\'unload\',unloadPage,false);'."\n";
         $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-        return $js. "\n";
+        return $js."\n";
     }
 
     /**
@@ -1061,7 +1061,7 @@ 
      *
      */
     function end_js() {
-        return '</script>'. "\n";
+        return '</script>'."\n";
     }
 
     /**
@@ -1070,7 +1070,7 @@ 
      */
     function start_body()
     {
-        return '<body>'. "\n".
+        return '<body>'."\n".
         '<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>\n".
         '<form id="dokeos_scorm_form" method="post" action="">'."\n".
         '<table width="100%">'."\n";
@@ -1082,7 +1082,7 @@ 
      */
     function end_body()
     {
-        return '</table><br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'. "\n";
+        return '</table><br /><input type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form>'."\n".'</body>'."\n";
     }
 
     /**
@@ -1099,11 +1099,11 @@ 
 
         $head = "";
         if ($this->standalone) {
-            $head = '<?xml version = "1.0" encoding = "' . $charset . '" standalone = "no"?>' . "\n"
-                . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n";
+            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>'."\n"
+                . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n";
         }
 
-        list($js,$html) = $this->export_questions();
+        list($js, $html) = $this->export_questions();
         //list($js,$html) = $this->question->answer->export();
         $res = $this->start_page()
             . $this->start_header()
@@ -1134,12 +1134,12 @@ 
         $js = $html = "";
         $js_id = 0;
         foreach ($this->exercise->selectQuestionList() as $q) {
-            list($jstmp,$htmltmp)= ScormQuestion::export_question($q, false, $js_id);
+            list($jstmp, $htmltmp) = ScormQuestion::export_question($q, false, $js_id);
             $js .= $jstmp."\n";
             $html .= $htmltmp."\n";
             ++$js_id;
         }
-        return array($js,$html);
+        return array($js, $html);
     }
 }
 

main/exercice/unique_answer.class.php

Spacing +54 added lines, -54 removed lines

@@ -59,21 +59,21 @@ 
 
         if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
             //Scenario
-            $comment_title = '<th width="20%">' . get_lang('Comment') . '</th>';
-            $feedback_title = '<th width="20%">' . get_lang('Scenario') . '</th>';
+            $comment_title = '<th width="20%">'.get_lang('Comment').'</th>';
+            $feedback_title = '<th width="20%">'.get_lang('Scenario').'</th>';
         } else {
-            $comment_title = '<th width="40%">' . get_lang('Comment') . '</th>';
+            $comment_title = '<th width="40%">'.get_lang('Comment').'</th>';
         }
 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr style="text-align: center;">
-                    <th width="5%">' . get_lang('Number') . '</th>
-                    <th width="5%"> ' . get_lang('True') . '</th>
-                    <th width="40%">' . get_lang('Answer') . '</th>
-                        ' . $comment_title . '
-                        ' . $feedback_title . '
-                    <th width="10%">' . get_lang('Weighting') . '</th>
+                    <th width="5%">' . get_lang('Number').'</th>
+                    <th width="5%"> ' . get_lang('True').'</th>
+                    <th width="40%">' . get_lang('Answer').'</th>
+                        ' . $comment_title.'
+                        ' . $feedback_title.'
+                    <th width="10%">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -103,7 +103,7 @@ 
                     continue;
                 }
                 $question = Question::read($questionid);
-                $select_question[$questionid] = 'Q' . $key . ' :' . cut(
+                $select_question[$questionid] = 'Q'.$key.' :'.cut(
                     $question->selectTitle(), 20
                 );
             }
@@ -134,9 +134,9 @@ 
                 if ($answer->correct[$i]) {
                     $correct = $i;
                 }
-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                $defaults['weighting[' . $i . ']'] = float_format(
+                $defaults['answer['.$i.']'] = $answer->answer[$i];
+                $defaults['comment['.$i.']'] = $answer->comment[$i];
+                $defaults['weighting['.$i.']'] = float_format(
                     $answer->weighting[$i],
                     1
                 );
@@ -159,18 +159,18 @@ 
                     $url_result = $url;
                 }
 
-                $temp_scenario['url' . $i] = $url_result;
-                $temp_scenario['try' . $i] = $try_result;
-                $temp_scenario['lp' . $i] = $lp;
-                $temp_scenario['destination' . $i] = $list_dest;
+                $temp_scenario['url'.$i] = $url_result;
+                $temp_scenario['try'.$i] = $try_result;
+                $temp_scenario['lp'.$i] = $lp;
+                $temp_scenario['destination'.$i] = $list_dest;
             } else {
                 $defaults['answer[1]'] = get_lang('DefaultUniqueAnswer1');
                 $defaults['weighting[1]'] = 10;
                 $defaults['answer[2]'] = get_lang('DefaultUniqueAnswer2');
                 $defaults['weighting[2]'] = 0;
 
-                $temp_scenario['destination' . $i] = array('0');
-                $temp_scenario['lp' . $i] = array('0');
+                $temp_scenario['destination'.$i] = array('0');
+                $temp_scenario['lp'.$i] = array('0');
             }
             $defaults['scenario'] = $temp_scenario;
 
@@ -182,62 +182,62 @@ 
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'counter[' . $i . ']'
+                'counter['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'answer[' . $i . ']'
+                'answer['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'comment[' . $i . ']'
+                'comment['.$i.']'
             );
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'weighting[' . $i . ']'
+                'weighting['.$i.']'
             );
 
             $answer_number = $form->addElement(
-                'text', 'counter[' . $i . ']', null, ' value = "' . $i . '"'
+                'text', 'counter['.$i.']', null, ' value = "'.$i.'"'
             );
             $answer_number->freeze();
             $form->addElement(
                 'radio', 'correct', null, null, $i, 'class="checkbox"'
             );
 
-            $form->addHtmlEditor('answer[' . $i . ']', null, null, true, $editor_config);
+            $form->addHtmlEditor('answer['.$i.']', null, null, true, $editor_config);
 
             $form->addRule(
-                'answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required'
+                'answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required'
             );
 
             if ($obj_ex->selectFeedbackType() == EXERCISE_FEEDBACK_TYPE_DIRECT) {
-                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config);
+                $form->addHtmlEditor('comment['.$i.']', null, null, false, $editor_config);
                 // Direct feedback
                 //Adding extra feedback fields
                 $group = array();
-                $group['try' . $i] = $form->createElement(
+                $group['try'.$i] = $form->createElement(
                     'checkbox',
-                    'try' . $i,
+                    'try'.$i,
                     null,
                     get_lang('TryAgain')
                 );
-                $group['lp' . $i] = $form->createElement(
+                $group['lp'.$i] = $form->createElement(
                     'select',
-                    'lp' . $i,
-                    get_lang('SeeTheory') . ': ',
+                    'lp'.$i,
+                    get_lang('SeeTheory').': ',
                     $select_lp_id
                 );
-                $group['destination' . $i] = $form->createElement(
+                $group['destination'.$i] = $form->createElement(
                     'select',
-                    'destination' . $i,
-                    get_lang('GoToQuestion') . ': ',
+                    'destination'.$i,
+                    get_lang('GoToQuestion').': ',
                     $select_question
                 );
-                $group['url' . $i] = $form->createElement(
+                $group['url'.$i] = $form->createElement(
                     'text',
-                    'url' . $i,
-                    get_lang('Other') . ': ',
+                    'url'.$i,
+                    get_lang('Other').': ',
                     array(
                         'class' => 'col-md-2',
                         'placeholder' => get_lang('Other')
@@ -250,9 +250,9 @@ 
                     'scenario'
                 );
             } else {
-                $form->addHtmlEditor('comment[' . $i . ']', null, null, false, $editor_config);
+                $form->addHtmlEditor('comment['.$i.']', null, null, false, $editor_config);
             }
-            $form->addText('weighting[' . $i . ']', null, null, array('value' => '0'));
+            $form->addText('weighting['.$i.']', null, null, array('value' => '0'));
             $form->addHtml('</tr>');
         }
 
@@ -306,19 +306,19 @@ 
         $nb_answers = $form->getSubmitValue('nb_answers');
 
         for ($i = 1; $i <= $nb_answers; $i++) {
-            $answer = trim($form->getSubmitValue('answer[' . $i . ']'));
-            $comment = trim($form->getSubmitValue('comment[' . $i . ']'));
-            $weighting = trim($form->getSubmitValue('weighting[' . $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);
 
-            $try = $scenario['try' . $i];
-            $lp = $scenario['lp' . $i];
-            $destination = $scenario['destination' . $i];
-            $url = trim($scenario['url' . $i]);
+            $try = $scenario['try'.$i];
+            $lp = $scenario['lp'.$i];
+            $destination = $scenario['destination'.$i];
+            $url = trim($scenario['url'.$i]);
 
             /*
             How we are going to parse the destination value
@@ -366,7 +366,7 @@ 
             }
 
             //1@@1;2;@@2;4;4;@@http://www.chamilo.org
-            $dest = $try . '@@' . $lp . '@@' . $destination . '@@' . $url;
+            $dest = $try.'@@'.$lp.'@@'.$destination.'@@'.$url;
             $objAnswer->createAnswer(
                 $answer,
                 $goodAnswer,
@@ -400,12 +400,12 @@ 
         $score = null
     ) {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="' . $this->question_table_class . '">
+        $header .= '<table class="'.$this->question_table_class.'">
 			<tr>
-				<th>' . get_lang("Choice") . '</th>
-				<th>' . get_lang("ExpectedChoice") . '</th>
-				<th>' . get_lang("Answer") . '</th>';
-        $header .= '<th>' . get_lang("Comment") . '</th>';
+				<th>' . get_lang("Choice").'</th>
+				<th>' . get_lang("ExpectedChoice").'</th>
+				<th>' . get_lang("Answer").'</th>';
+        $header .= '<th>'.get_lang("Comment").'</th>';
         $header .= '</tr>';
 
         return $header;
@@ -469,7 +469,7 @@ 
         if ($correct) {
             $sql = "UPDATE $tbl_quiz_question
                     SET ponderation = (ponderation + $score)
-                    WHERE c_id = $course_id AND id = " . $question_id;
+                    WHERE c_id = $course_id AND id = ".$question_id;
             Database::query($sql);
         }
     }

main/exercice/hotspot_actionscript.as.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 session_cache_limiter("none");
 
 require '../inc/global.inc.php';
-require api_get_path(LIBRARY_PATH) . 'geometry.lib.php';
+require api_get_path(LIBRARY_PATH).'geometry.lib.php';
 
 // set vars
 $questionId    = intval($_GET['modifyAnswers']);
@@ -29,7 +29,7 @@ 
 $course_id = api_get_course_int_id();
 
 // Query db for answers
-if ($answer_type==HOT_SPOT_DELINEATION) {
+if ($answer_type == HOT_SPOT_DELINEATION) {
 	$sql = "SELECT id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
 	        WHERE c_id = $course_id AND question_id = ".intval($questionId)." AND hotspot_type = 'delineation' ORDER BY id";
 } else {
@@ -75,7 +75,7 @@ 
     $hotSpot['answer'] = $hotspot['answer'];
 
 	// Square or rectancle
-	if ($hotspot['hotspot_type'] == 'square' )
+	if ($hotspot['hotspot_type'] == 'square')
 	{
         $hotSpot['type'] = 'square';
 	}

main/exercice/Hpdownload.php

Spacing +35 added lines, -35 removed lines

@@ -12,12 +12,12 @@ 
 session_cache_limiter('public');
 
 require_once '../inc/global.inc.php';
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 $tbl_document = Database::get_course_table(TABLE_DOCUMENT);
 
-$doc_url=str_replace(array('../','\\..','\\0','..\\'),array('','','',''),urldecode($_GET['doc_url']));
-$filename=basename($doc_url);
+$doc_url = str_replace(array('../', '\\..', '\\0', '..\\'), array('', '', '', ''), urldecode($_GET['doc_url']));
+$filename = basename($doc_url);
 
 // launch event
 //Event::event_download($doc_url);
@@ -29,7 +29,7 @@ 
 	$full_file_name = $course_path.Security::remove_XSS($doc_url);
 }
 
-if(!is_file($full_file_name)) {
+if (!is_file($full_file_name)) {
 	exit;
 }
 
@@ -37,26 +37,26 @@ 
     exit;
 }
 
-$extension=explode('.',$filename);
-$extension=strtolower($extension[sizeof($extension)-1]);
-
-switch($extension) {
-	case 'gz':		$content_type='application/x-gzip';			break;
-	case 'zip':		$content_type='application/zip';			break;
-	case 'pdf':		$content_type='application/pdf';			break;
-	case 'png':		$content_type='image/png';					break;
-	case 'gif':		$content_type='image/gif';					break;
-	case 'jpg':		$content_type='image/jpeg';					break;
-	case 'txt':		$content_type='text/plain';					break;
-	case 'htm':		$content_type='text/html';					break;
-	case 'html':	$content_type='text/html';					break;
-	default:		$content_type='application/octet-stream';	break;
+$extension = explode('.', $filename);
+$extension = strtolower($extension[sizeof($extension) - 1]);
+
+switch ($extension) {
+	case 'gz':		$content_type = 'application/x-gzip'; break;
+	case 'zip':		$content_type = 'application/zip'; break;
+	case 'pdf':		$content_type = 'application/pdf'; break;
+	case 'png':		$content_type = 'image/png'; break;
+	case 'gif':		$content_type = 'image/gif'; break;
+	case 'jpg':		$content_type = 'image/jpeg'; break;
+	case 'txt':		$content_type = 'text/plain'; break;
+	case 'htm':		$content_type = 'text/html'; break;
+	case 'html':	$content_type = 'text/html'; break;
+	default:		$content_type = 'application/octet-stream'; break;
 }
 
 header('Content-disposition: filename='.$filename);
 header('Content-Type: '.$content_type);
-header('Expires: '.gmdate('D, d M Y H:i:s',time()+10).' GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s',time()+10).' GMT');
+header('Expires: '.gmdate('D, d M Y H:i:s', time() + 10).' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s', time() + 10).' GMT');
 
 /*
 	Dynamic parsing section
@@ -70,16 +70,16 @@ 
 if ($content_type == 'text/html') {
 	$directory_name = dirname($full_file_name);
 
-	$dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
+	$dir = str_replace(array('\\', $_configuration['root_sys']."courses/".$_course['path'].'/document'), array('/', ''), $directory_name);
 
-	if($dir[strlen($dir)-1] != '/') {
-		$dir.='/';
+	if ($dir[strlen($dir) - 1] != '/') {
+		$dir .= '/';
 	}
 
 
 	//Parse whole file at one
 	$fp = fopen($full_file_name, "r");
-	$file_content = fread ($fp, filesize ($full_file_name));
+	$file_content = fread($fp, filesize($full_file_name));
 	fclose($fp);
 	//$file_content = api_replace_parameter($dir, $file_content, "src");
 	//$file_content = api_replace_parameter($dir, $file_content, "href");
@@ -98,9 +98,9 @@ 
 
 
     $exercisePath = api_get_self();
-  	$exfile = explode('/',$exercisePath);
-  	$exfile = $exfile[sizeof($exfile)-1];
-  	$exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile));
+  	$exfile = explode('/', $exercisePath);
+  	$exfile = $exfile[sizeof($exfile) - 1];
+  	$exercisePath = substr($exercisePath, 0, strpos($exercisePath, $exfile));
   	$exercisePath = $exercisePath;
 
 		$content = $file_content;
@@ -125,16 +125,16 @@ 
 "// Must be included \n".
 "function Finish(){\n".
 " mySaveScore();";
-		$newcontent = str_replace($mit,$js_content,$content);
+		$newcontent = str_replace($mit, $js_content, $content);
 
-		$prehref="javascript:void(0);";
-		$posthref=$_configuration['root_web']."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+		$prehref = "javascript:void(0);";
+		$posthref = $_configuration['root_web']."main/exercice/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
+		$newcontent = str_replace($prehref, $posthref, $newcontent);
 
 
-		$prehref="class=\"GridNum\" onclick=";
-		$posthref="class=\"GridNum\" onMouseover=";
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+		$prehref = "class=\"GridNum\" onclick=";
+		$posthref = "class=\"GridNum\" onMouseover=";
+		$newcontent = str_replace($prehref, $posthref, $newcontent);
 
 
 		header('Content-length: '.strlen($newcontent));
@@ -146,7 +146,7 @@ 
 
 //normal case, all non-html files
 //header('Content-length: '.filesize($full_file_name));
-$fp=fopen($full_file_name,'rb');
+$fp = fopen($full_file_name, 'rb');
 fpassthru($fp);
 fclose($fp);
 ?>

main/exercice/hotpotatoes_exercise_result.class.php

Spacing +55 added lines, -55 removed lines

@@ -23,13 +23,13 @@ 
     {
 		$return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
-        $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
+        $TBL_TRACK_HOTPOTATOES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
         $cid             = api_get_course_id();
         $course_id       = api_get_course_int_id();
         //$user_id         = intval($user_id);
         $user_id = null;
-        $session_id_and  = ' AND te.session_id = ' . api_get_session_id() . ' ';
+        $session_id_and  = ' AND te.session_id = '.api_get_session_id().' ';
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
@@ -37,7 +37,7 @@ 
         }
 
         if (empty($user_id)) {
-            $sql="SELECT firstname as userpart1, lastname as userpart2 ,
+            $sql = "SELECT firstname as userpart1, lastname as userpart2 ,
                     email,
                     tth.exe_name,
                     tth.exe_result,
@@ -49,13 +49,13 @@ 
                             tth.exe_name = '$hotpotato_name'
                     ORDER BY tth.c_id ASC, tth.exe_date ASC";
         } else {
-            $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
+            $user_id_and = ' AND te.exe_user_id = '.api_get_user_id().' ';
             // get only this user's results
 
             $sql = "SELECT '', exe_name, exe_result , exe_weighting, exe_date
                     FROM $TBL_TRACK_HOTPOTATOES
                     WHERE
-                        exe_user_id = '" . $user_id . "' AND
+                        exe_user_id = '".$user_id."' AND
                         c_id = $course_id AND
                         tth.exe_name = '$hotpotato_name'
                     ORDER BY c_id ASC, exe_date ASC";
@@ -64,13 +64,13 @@ 
         $results = array();
 
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $results[] = $rowx;
         }
 
         $hpresults = array();
         $resx = Database::query($sql);
-        while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+        while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             $hpresults[] = $rowx;
         }
 
@@ -89,19 +89,19 @@ 
 
         // Print the Result of Hotpotatoes Tests
         if (is_array($hpresults)) {
-            for($i = 0; $i < sizeof($hpresults); $i++) {
+            for ($i = 0; $i < sizeof($hpresults); $i++) {
                 $return[$i] = array();
                 $title = GetQuizName($hpresults[$i]['exe_name'], $document_path);
-                if ($title =='') {
+                if ($title == '') {
                     $title = basename($hpresults[$i]['exe_name']);
                 }
-                if(empty($user_id)) {
+                if (empty($user_id)) {
                 $return[$i]['email'] = $hpresults[$i]['email'];
                     $return[$i]['first_name'] = $hpresults[$i]['userpart1'];
                     $return[$i]['last_name'] = $hpresults[$i]['userpart2'];
                 }
                 $return[$i]['title'] = $title;
-                $return[$i]['exe_date']  = $hpresults[$i]['exe_date'];
+                $return[$i]['exe_date'] = $hpresults[$i]['exe_date'];
 
                 $return[$i]['result'] = $hpresults[$i]['exe_result'];
                 $return[$i]['max'] = $hpresults[$i]['exe_weighting'];
@@ -120,7 +120,7 @@ 
 	 * @param	boolean		Whether to include user fields or not
 	 * @return	boolean		False on error
 	 */
-	public function exportCompleteReportCSV($document_path='', $hotpotato_name)
+	public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
     {
 		global $charset;
 		$this->getExercisesReporting($document_path, $hotpotato_name);
@@ -131,17 +131,17 @@ 
 		$data = '';
 
         if (api_is_western_name_order()) {
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
         } else {
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
         }
@@ -163,16 +163,16 @@ 
 		$data .= "\n";
 
 		//results
-		foreach($this->results as $row) {
+		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)).';';
+            $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
 			/*if ($export_user_fields) {
 				//show user fields data, if any, for this user
@@ -182,10 +182,10 @@ 
 				}
 			}*/
 
-			$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 .= 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";
 		}
 
@@ -207,7 +207,7 @@ 
 		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 "\xEF\xBB\xBF"; // force utf-8 header of csv file
 		echo $data;
 		return true;
 	}
@@ -249,25 +249,25 @@ 
 		}
 
 		if ($with_column_user) {
-		    $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Email'));
+		    $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Email'));
 		    $column++;
 
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+    			$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
     			$column++;
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
             } else {
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
-                $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('FirstName'));
+                $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);
+			$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) {
@@ -276,63 +276,63 @@ 
 			}
 		}
 
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Title'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Title'));
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('StartDate'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('StartDate'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('EndDate'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('EndDate'));
         $column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Score'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Score'));
 		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Total'));
+		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Total'));
 		$column++;
-        $worksheet->SetCellValueByColumnAndRow($line,$column, get_lang('Status'));
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Status'));
 		$line++;
 
 		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));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
                 $column++;
 
                 if (api_is_western_name_order()) {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
                 } else {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $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));
+				$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));
+			$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, $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']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['duration']);
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['result']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['result']);
 			$column++;
-			$worksheet->SetCellValueByColumnAndRow($line,$column,$row['max']);
+			$worksheet->SetCellValueByColumnAndRow($line, $column, $row['max']);
 			$column++;
-            $worksheet->SetCellValueByColumnAndRow($line,$column,$row['status']);
+            $worksheet->SetCellValueByColumnAndRow($line, $column, $row['status']);
 			$line++;
 		}
 

main/exercice/question.class.php

Spacing +76 added lines, -76 removed lines

@@ -22,7 +22,7 @@ 
     public $type;
     public $level;
     public $picture;
-    public $exerciseList;  // array with the list of exercises which this question is in
+    public $exerciseList; // array with the list of exercises which this question is in
     public $category_list;
     public $parent_id;
     public $category;
@@ -47,8 +47,8 @@ 
             'multiple_answer_combination_true_false.class.php',
             'MultipleAnswerCombinationTrueFalse'
         ),
-        GLOBAL_MULTIPLE_ANSWER => array('global_multiple_answer.class.php' , 'GlobalMultipleAnswer'),
-        CALCULATED_ANSWER => array('calculated_answer.class.php' , 'CalculatedAnswer'),
+        GLOBAL_MULTIPLE_ANSWER => array('global_multiple_answer.class.php', 'GlobalMultipleAnswer'),
+        CALCULATED_ANSWER => array('calculated_answer.class.php', 'CalculatedAnswer'),
         UNIQUE_ANSWER_IMAGE => ['UniqueAnswerImage.php', 'UniqueAnswerImage'],
         DRAGGABLE => ['Draggable.php', 'Draggable'],
         MATCHING_DRAGGABLE => ['MatchingDraggable.php', 'MatchingDraggable']
@@ -107,14 +107,14 @@ 
         $id = intval($id);
 
         if (!empty($course_id)) {
-            $course_info =  api_get_course_info_by_id($course_id);
+            $course_info = api_get_course_info_by_id($course_id);
         } else {
             $course_info = api_get_course_info();
         }
 
         $course_id = $course_info['real_id'];
 
-        if (empty($course_id) || $course_id == -1 ) {
+        if (empty($course_id) || $course_id == -1) {
             return false;
         }
 
@@ -270,7 +270,7 @@ 
     public function selectPicturePath()
     {
         if (!empty($this->picture)) {
-            return api_get_path(WEB_COURSE_PATH) . $this->course['path'] . '/document/images/' . $this->picture;
+            return api_get_path(WEB_COURSE_PATH).$this->course['path'].'/document/images/'.$this->picture;
         }
 
         return false;
@@ -307,7 +307,7 @@ 
      */
     public function updateTitle($title)
     {
-        $this->question=$title;
+        $this->question = $title;
     }
 
     /**
@@ -406,7 +406,7 @@ 
                     // DO nothing
                 } else {
                     $sql = "INSERT INTO $TBL_QUESTION_REL_CATEGORY (c_id, question_id, category_id)
-                            VALUES (" . api_get_course_int_id() . ", $question_id, $category_id)";
+                            VALUES (".api_get_course_int_id().", $question_id, $category_id)";
                     Database::query($sql);
                 }
             }
@@ -433,7 +433,7 @@ 
             $sql = "SELECT count(*) AS nb FROM $table
                     WHERE
                         question_id = $question_id AND
-                        c_id=" . api_get_course_int_id();
+                        c_id=".api_get_course_int_id();
             $res = Database::query($sql);
             $row = Database::fetch_array($res);
             if ($row['nb'] > 0) {
@@ -441,11 +441,11 @@ 
                         SET category_id = $category_id
                         WHERE
                             question_id = $question_id AND
-                            c_id = " . api_get_course_int_id();
+                            c_id = ".api_get_course_int_id();
                 Database::query($sql);
             } else {
                 $sql = "INSERT INTO $table (c_id, question_id, category_id)
-                        VALUES (" . api_get_course_int_id().", $question_id, $category_id)";
+                        VALUES (".api_get_course_int_id().", $question_id, $category_id)";
                 Database::query($sql);
             }
         }
@@ -463,7 +463,7 @@ 
         $sql = "DELETE FROM $table
                 WHERE
                     question_id = $question_id AND
-                    c_id = " . api_get_course_int_id();
+                    c_id = ".api_get_course_int_id();
         Database::query($sql);
     }
 
@@ -516,11 +516,11 @@ 
             ) {
                 // removes old answers
                 $sql = "DELETE FROM $TBL_REPONSES
-                        WHERE c_id = $course_id AND question_id = " . intval($this->id);
+                        WHERE c_id = $course_id AND question_id = ".intval($this->id);
                 Database::query($sql);
             }
 
-            $this->type=$type;
+            $this->type = $type;
         }
     }
 
@@ -544,7 +544,7 @@ 
         if (!file_exists($picturePath)) {
             if (mkdir($picturePath, api_get_permissions_for_new_directories())) {
                 // document path
-                $documentPath = api_get_path(SYS_COURSE_PATH) . $this->course['path'] . "/document";
+                $documentPath = api_get_path(SYS_COURSE_PATH).$this->course['path']."/document";
                 $path = str_replace($documentPath, '', $picturePath);
                 $title_path = basename($picturePath);
                 $doc_id = add_document($this->course, $path, 'folder', 0, $title_path);
@@ -560,14 +560,14 @@ 
 
         // if the question has got an ID
         if ($this->id) {
-            $this->picture = 'quiz-' . $this->id . '.jpg';
+            $this->picture = 'quiz-'.$this->id.'.jpg';
             $o_img = new Image($Picture);
-            $o_img->send_image($picturePath . '/' . $this->picture, -1, 'jpg');
+            $o_img->send_image($picturePath.'/'.$this->picture, -1, 'jpg');
             $document_id = add_document(
                 $this->course,
-                '/images/' . $this->picture,
+                '/images/'.$this->picture,
                 'file',
-                filesize($picturePath . '/' . $this->picture),
+                filesize($picturePath.'/'.$this->picture),
                 $this->picture
             );
             if ($document_id) {
@@ -601,7 +601,7 @@ 
         // if the question has an ID
         if ($this->id) {
             // Get dimensions from current image.
-            $my_image = new Image($picturePath . '/' . $this->picture);
+            $my_image = new Image($picturePath.'/'.$this->picture);
 
             $current_image_size = $my_image->get_image_size();
             $current_width = $current_image_size['width'];
@@ -641,7 +641,7 @@ 
             }
 
             $my_image->resize($new_width, $new_height);
-            $result = $my_image->send_image($picturePath . '/' . $this->picture);
+            $result = $my_image->send_image($picturePath.'/'.$this->picture);
 
             if ($result) {
                 return true;
@@ -666,7 +666,7 @@ 
             $picture = $this->picture;
             $this->picture = '';
 
-            return @unlink($picturePath . '/' . $picture) ? true : false;
+            return @unlink($picturePath.'/'.$picture) ? true : false;
         }
 
         return false;
@@ -683,27 +683,27 @@ 
     {
         $course_id = $course_info['real_id'];
         $TBL_QUESTIONS = Database::get_course_table(TABLE_QUIZ_QUESTION);
-        $destination_path = api_get_path(SYS_COURSE_PATH) . $course_info['path'] . '/document/images';
-        $source_path = api_get_path(SYS_COURSE_PATH) . $this->course['path'] . '/document/images';
+        $destination_path = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document/images';
+        $source_path = api_get_path(SYS_COURSE_PATH).$this->course['path'].'/document/images';
 
         // if the question has got an ID and if the picture exists
         if ($this->id && !empty($this->picture)) {
             $picture = explode('.', $this->picture);
             $extension = $picture[sizeof($picture) - 1];
-            $picture = 'quiz-' . $questionId . '.' . $extension;
-            $result = @copy($source_path . '/' . $this->picture, $destination_path . '/' . $picture) ? true : false;
+            $picture = 'quiz-'.$questionId.'.'.$extension;
+            $result = @copy($source_path.'/'.$this->picture, $destination_path.'/'.$picture) ? true : false;
             // If copy was correct then add to the database
             if ($result) {
                 $sql = "UPDATE $TBL_QUESTIONS SET
-                        picture = '" . Database::escape_string($picture) . "'
-                        WHERE c_id = $course_id AND id='" . intval($questionId) . "'";
+                        picture = '".Database::escape_string($picture)."'
+                        WHERE c_id = $course_id AND id='".intval($questionId)."'";
                 Database::query($sql);
 
                 $document_id = add_document(
                     $course_info,
-                    '/images/' . $picture,
+                    '/images/'.$picture,
                     'file',
-                    filesize($destination_path . '/' . $picture),
+                    filesize($destination_path.'/'.$picture),
                     $picture
                 );
                 if ($document_id) {
@@ -738,7 +738,7 @@ 
         $Extension = $PictureName[sizeof($PictureName) - 1];
 
         // saves the picture into a temporary file
-        @move_uploaded_file($Picture, $picturePath . '/tmp.' . $Extension);
+        @move_uploaded_file($Picture, $picturePath.'/tmp.'.$Extension);
     }
 
     /**
@@ -771,15 +771,15 @@ 
 
         // if the question has got an ID and if the picture exists
         if ($this->id) {
-            if (file_exists($picturePath . '/tmp.jpg')) {
+            if (file_exists($picturePath.'/tmp.jpg')) {
                 $Extension = 'jpg';
-            } elseif (file_exists($picturePath . '/tmp.gif')) {
+            } elseif (file_exists($picturePath.'/tmp.gif')) {
                 $Extension = 'gif';
-            } elseif (file_exists($picturePath . '/tmp.png')) {
+            } elseif (file_exists($picturePath.'/tmp.png')) {
                 $Extension = 'png';
             }
-            $this->picture = 'quiz-' . $this->id . '.' . $Extension;
-            return @rename($picturePath . '/tmp.' . $Extension, $picturePath . '/' . $this->picture) ? true : false;
+            $this->picture = 'quiz-'.$this->id.'.'.$Extension;
+            return @rename($picturePath.'/tmp.'.$Extension, $picturePath.'/'.$this->picture) ? true : false;
         }
         return false;
     }
@@ -809,7 +809,7 @@ 
         $category = $this->category;
 
         // question already exists
-        if(!empty($id)) {
+        if (!empty($id)) {
 
             $params = [
                 'question' => $question,
@@ -855,12 +855,12 @@ 
                     $TBL_EXERCISE_QUESTION as test_question
                     WHERE
                         question.id = test_question.question_id AND
-                        test_question.exercice_id = " . intval($exerciseId) . " AND
+                        test_question.exercice_id = ".intval($exerciseId)." AND
                         question.c_id = $c_id AND
                         test_question.c_id = $c_id ";
-            $result	= Database::query($sql);
-            $current_position = Database::result($result,0,0);
-            $this->updatePosition($current_position+1);
+            $result = Database::query($sql);
+            $current_position = Database::result($result, 0, 0);
+            $this->updatePosition($current_position + 1);
             $position = $this->position;
 
             $params = [
@@ -956,10 +956,10 @@ 
         }
     }
 
-    public function search_engine_edit($exerciseId, $addQs=false, $rmQs=false)
+    public function search_engine_edit($exerciseId, $addQs = false, $rmQs = false)
     {
         // update search engine and its values table if enabled
-        if (api_get_setting('search_enabled')=='true' && extension_loaded('xapian')) {
+        if (api_get_setting('search_enabled') == 'true' && extension_loaded('xapian')) {
             $course_id = api_get_course_id();
             // get search_did
             $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
@@ -977,8 +977,8 @@ 
             $res = Database::query($sql);
 
             if (Database::num_rows($res) > 0 || $addQs) {
-                require_once(api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php');
-                require_once(api_get_path(LIBRARY_PATH) . 'search/IndexableChunk.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php');
+                require_once(api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php');
 
                 $di = new ChamiloIndexer();
                 if ($addQs) {
@@ -991,7 +991,7 @@ 
 
                 // retrieve others exercise ids
                 $se_ref = Database::fetch_array($res);
-                $se_doc = $di->get_document((int)$se_ref['search_did']);
+                $se_doc = $di->get_document((int) $se_ref['search_did']);
                 if ($se_doc !== FALSE) {
                     if (($se_doc_data = $di->get_document_data($se_doc)) !== FALSE) {
                         $se_doc_data = unserialize($se_doc_data);
@@ -1029,16 +1029,16 @@ 
                     SE_DATA => array(
                         'type' => SE_DOCTYPE_EXERCISE_QUESTION,
                         'exercise_ids' => $question_exercises,
-                        'question_id' => (int)$this->id
+                        'question_id' => (int) $this->id
                     ),
-                    SE_USER => (int)api_get_user_id(),
+                    SE_USER => (int) api_get_user_id(),
                 );
                 $ic_slide->xapian_data = serialize($xapian_data);
                 $ic_slide->addValue("content", $this->description);
 
                 //TODO: index answers, see also form validation on question_admin.inc.php
 
-                $di->remove_document((int)$se_ref['search_did']);
+                $di->remove_document((int) $se_ref['search_did']);
                 $di->addChunk($ic_slide);
 
                 //index and return search engine document id
@@ -1117,7 +1117,7 @@ 
             $count = $new_exercise->selectNbrQuestions();
             $count++;
             $sql = "INSERT INTO $exerciseRelQuestionTable (c_id, question_id, exercice_id, question_order)
-                    VALUES ({$this->course['real_id']}, " . intval($id) . ", " . intval($exerciseId) . ", '$count')";
+                    VALUES ({$this->course['real_id']}, ".intval($id).", ".intval($exerciseId).", '$count')";
             Database::query($sql);
 
             // we do not want to reindex if we had just saved adnd indexed the question
@@ -1146,7 +1146,7 @@ 
         $course_id = api_get_course_int_id();
 
         // exercise not found
-        if($pos === false) {
+        if ($pos === false) {
             return false;
         } else {
             // deletes the position in the array containing the wanted exercise ID
@@ -1156,17 +1156,17 @@ 
                     FROM $TBL_EXERCISE_QUESTION
                     WHERE
                         c_id = $course_id
-                        AND question_id = " . intval($id) . "
+                        AND question_id = ".intval($id)."
                         AND exercice_id = " . intval($exerciseId);
             $res = Database::query($sql);
-            if (Database::num_rows($res)>0) {
+            if (Database::num_rows($res) > 0) {
                 $row = Database::fetch_array($res);
                 if (!empty($row['question_order'])) {
                     $sql = "UPDATE $TBL_EXERCISE_QUESTION
                         SET question_order = question_order-1
                         WHERE
                             c_id = $course_id
-                            AND exercice_id = " . intval($exerciseId) . "
+                            AND exercice_id = ".intval($exerciseId)."
                             AND question_order > " . $row['question_order'];
                     Database::query($sql);
                 }
@@ -1175,7 +1175,7 @@ 
             $sql = "DELETE FROM $TBL_EXERCISE_QUESTION
                     WHERE
                         c_id = $course_id
-                        AND question_id = " . intval($id) . "
+                        AND question_id = ".intval($id)."
                         AND exercice_id = " . intval($exerciseId);
             Database::query($sql);
 
@@ -1216,7 +1216,7 @@ 
                                 SET question_order = question_order-1
                                 WHERE
                                     c_id= $course_id
-                                    AND exercice_id = " . intval($row['exercice_id']) . "
+                                    AND exercice_id = ".intval($row['exercice_id'])."
                                     AND question_order > " . $row['question_order'];
                         Database::query($sql);
                     }
@@ -1224,20 +1224,20 @@ 
             }
 
             $sql = "DELETE FROM $TBL_EXERCISE_QUESTION
-                    WHERE c_id = $course_id AND question_id = " . intval($id) . "";
+                    WHERE c_id = $course_id AND question_id = ".intval($id)."";
             Database::query($sql);
 
             $sql = "DELETE FROM $TBL_QUESTIONS
-                    WHERE c_id = $course_id AND id = " . intval($id) . "";
+                    WHERE c_id = $course_id AND id = ".intval($id)."";
             Database::query($sql);
 
             $sql = "DELETE FROM $TBL_REPONSES
-                    WHERE c_id = $course_id AND question_id = " . intval($id) . "";
+                    WHERE c_id = $course_id AND question_id = ".intval($id)."";
             Database::query($sql);
 
             // remove the category of this question in the question_rel_category table
             $sql = "DELETE FROM $TBL_QUIZ_QUESTION_REL_CATEGORY
-                    WHERE c_id = $course_id AND question_id = " . intval($id) . " AND c_id=" . api_get_course_int_id();
+                    WHERE c_id = $course_id AND question_id = ".intval($id)." AND c_id=".api_get_course_int_id();
             Database::query($sql);
 
             api_item_property_update($this->course, TOOL_QUIZ, $id, 'QuizQuestionDeleted', api_get_user_id());
@@ -1394,7 +1394,7 @@ 
                 if (class_exists($class_name)) {
                     return new $class_name();
                 } else {
-                    echo 'Can\'t instanciate class ' . $class_name . ' of type ' . $type;
+                    echo 'Can\'t instanciate class '.$class_name.' of type '.$type;
                 }
             }
         }
@@ -1436,7 +1436,7 @@ 
 
         // Question type
         $answerType = isset($_REQUEST['answerType']) ? intval($_REQUEST['answerType']) : null;
-        $form->addElement('hidden','answerType', $answerType);
+        $form->addElement('hidden', 'answerType', $answerType);
 
         // html editor
         $editorConfig = array(
@@ -1444,7 +1444,7 @@ 
             'Height' => '150'
         );
 
-        if (!api_is_allowed_to_edit(null,true)) {
+        if (!api_is_allowed_to_edit(null, true)) {
             $editorConfig['UserStatus'] = 'student';
         }
 
@@ -1581,7 +1581,7 @@ 
 
         if ($feedback_type == 1) {
             //2. but if it is a feedback DIRECT we only show the UNIQUE_ANSWER type that is currently available
-            $question_type_custom_list = array (
+            $question_type_custom_list = array(
                 UNIQUE_ANSWER => self::$questionTypes[UNIQUE_ANSWER],
                 HOT_SPOT_DELINEATION => self::$questionTypes[HOT_SPOT_DELINEATION]
             );
@@ -1597,17 +1597,17 @@ 
             require_once $a_type[0];
             // get the picture of the type and the langvar which describes it
             $img = $explanation = '';
-            eval('$img = ' . $a_type[1] . '::$typePicture;');
-            eval('$explanation = get_lang(' . $a_type[1] . '::$explanationLangVar);');
+            eval('$img = '.$a_type[1].'::$typePicture;');
+            eval('$explanation = get_lang('.$a_type[1].'::$explanationLangVar);');
             echo '<li>';
             echo '<div class="icon-image">';
             if ($objExercise->exercise_was_added_in_lp == true) {
                 $img = pathinfo($img);
-                $img = $img['filename'] . '_na.' . $img['extension'];
+                $img = $img['filename'].'_na.'.$img['extension'];
                 echo Display::return_icon($img, $explanation, null, ICON_SIZE_BIG);
             } else {
-                echo '<a href="admin.php?' . api_get_cidreq() . '&newQuestion=yes&answerType=' . $i . '">' .
-                Display::return_icon($img, $explanation, null, ICON_SIZE_BIG) . '</a>';
+                echo '<a href="admin.php?'.api_get_cidreq().'&newQuestion=yes&answerType='.$i.'">'.
+                Display::return_icon($img, $explanation, null, ICON_SIZE_BIG).'</a>';
             }
             echo '</div>';
             echo '</li>';
@@ -1619,9 +1619,9 @@ 
             echo Display::return_icon('database_na.png', get_lang('GetExistingQuestion'), null, ICON_SIZE_BIG);
         } else {
             if ($feedback_type == 1) {
-                echo $url = "<a href=\"question_pool.php?" . api_get_cidreq() . "&type=1&fromExercise=$exerciseId\">";
+                echo $url = "<a href=\"question_pool.php?".api_get_cidreq()."&type=1&fromExercise=$exerciseId\">";
             } else {
-                echo $url = '<a href="question_pool.php?' . api_get_cidreq() . '&fromExercise=' . $exerciseId . '">';
+                echo $url = '<a href="question_pool.php?'.api_get_cidreq().'&fromExercise='.$exerciseId.'">';
             }
             echo Display::return_icon('database.png', get_lang('GetExistingQuestion'), null, ICON_SIZE_BIG);
         }
@@ -1758,7 +1758,7 @@ 
             $header .= $this->show_media_content();
         }
 
-        $header .= Display::page_subheader2($counter_label . ". " . $question_title);
+        $header .= Display::page_subheader2($counter_label.". ".$question_title);
         $header .= Display::div(
             "<div class=\"rib rib-$class\"><h3>$score_label</h3></div> <h4>{$score['result']}</h4>",
             array('class' => 'ribbon')
@@ -1779,7 +1779,7 @@ 
     public function create_question(
         $quiz_id,
         $question_name,
-        $question_description = "" ,
+        $question_description = "",
         $max_score = 0,
         $type = 1,
         $level = 1
@@ -1849,8 +1849,8 @@ 
         require_once $tabQuestionList[$type][0];
 
         $img = $explanation = null;
-        eval('$img = ' . $tabQuestionList[$type][1] . '::$typePicture;');
-        eval('$explanation = get_lang(' . $tabQuestionList[$type][1] . '::$explanationLangVar);');
+        eval('$img = '.$tabQuestionList[$type][1].'::$typePicture;');
+        eval('$explanation = get_lang('.$tabQuestionList[$type][1].'::$explanationLangVar);');
         return array($img, $explanation);
     }
 
@@ -1914,7 +1914,7 @@ 
         $media_list[0] = get_lang('NoMedia');
 
         if (!empty($medias)) {
-            foreach($medias as $media) {
+            foreach ($medias as $media) {
                 $media_list[$media['id']] = empty($media['question']) ? get_lang('Untitled') : $media['question'];
             }
         }