Minor - fixing format code

main/exercice/admin.php

@@ -303,7 +303,10 @@ function multiple_answer_true_false_onchange(variable) {
     var result = variable.checked;
     var id = variable.id;
     var weight_id = "weighting_" + id;
-    var array_result=new Array(); array_result[1]="1"; array_result[0]= "-0.50"; array_result[-1]= "0";
+    var array_result=new Array();
+    array_result[1]="1";
+    array_result[0]= "-0.50";
+    array_result[-1]= "0";
     if (result) {
         result = 1;
     } else {

main/exercice/answer.class.php

@@ -420,7 +420,8 @@ class Answer {
 	 * @param coordinates 	Coordinates for hotspot exercises (optional)
 	 * @param integer		Type for hotspot exercises (optional)
 	 */
-	function createAnswer($answer,$correct,$comment,$weighting,$position,$new_hotspot_coordinates = null, $new_hotspot_type = null, $destination='') {
+	function createAnswer($answer,$correct,$comment,$weighting, $position, $new_hotspot_coordinates = null, $new_hotspot_type = null, $destination='')
+    {
 		$this->new_nbrAnswers++;
 		$id=$this->new_nbrAnswers;
 		$this->new_answer[$id]=$answer;
@@ -442,7 +443,8 @@ class Answer {
 	 * @param	integer	Answer weighting
 	 * @param	integer	Answer position
 	 */
-	function updateAnswers($answer,$comment, $correct, $weighting,$position,$destination) {
+	function updateAnswers($answer,$comment, $correct, $weighting, $position, $destination)
+    {
 		$TBL_REPONSES = Database :: get_course_table(TABLE_QUIZ_ANSWER);
 
 		$questionId=$this->questionId;
@@ -463,9 +465,9 @@ class Answer {
 	 *
 	 * @author - Olivier Brouckaert
 	 */
-	function save() {
+	function save()
+    {
 		$TBL_REPONSES = Database::get_course_table(TABLE_QUIZ_ANSWER);
-        $table_track_e_attempt   = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
 		$questionId   = intval($this->questionId);
 
 		$c_id = $this->course['real_id'];
@@ -482,15 +484,24 @@ class Answer {
 			$hotspot_coordinates	= Database::escape_string($this->new_hotspot_coordinates[$i]);
 			$hotspot_type			= Database::escape_string($this->new_hotspot_type[$i]);
 			$destination			= Database::escape_string($this->new_destination[$i]);
+
             if (!(isset($this->position[$i]))) {
                 $flag = 1;
 			    $sql.="($c_id, '$i','$questionId','$answer','$correct','$comment','$weighting','$position','$hotspot_coordinates','$hotspot_type','$destination'),";
             } else {
                 // https://support.chamilo.org/issues/6558
                 // function updateAnswers already escape_string, error if we do it twice. Feed function updateAnswers with none escaped strings
-                $this->updateAnswers($this->new_answer[$i], $this->new_comment[$i], $this->new_correct[$i], $this->new_weighting[$i], $this->new_position[$i], $this->new_destination[$i]);
+                $this->updateAnswers(
+                    $this->new_answer[$i],
+                    $this->new_comment[$i],
+                    $this->new_correct[$i],
+                    $this->new_weighting[$i],
+                    $this->new_position[$i],
+                    $this->new_destination[$i]
+                );
             }
         }
+
 		if ($flag == 1) {
             $sql = api_substr($sql,0,-1);
             Database::query($sql);

main/exercice/fill_blanks.class.php

@@ -11,8 +11,6 @@
  * Code
  */
 
-if(!class_exists('FillBlanks')):
-
 /**
 	CLASS FillBlanks
  *
@@ -60,13 +58,15 @@ class FillBlanks extends Question
 			//make sure we only take the last bit to find special marks
 			$sz = count($pre_array);
 			$is_set_switchable = explode('@', $pre_array[$sz-1]);
+
 			if ($is_set_switchable[1]) {
 				$defaults['multiple_answer'] = 1;
 			} else {
 				$defaults['multiple_answer'] = 0;
 			}
 
-			//take the complete string except after the last '::'
+			//Take the complete string except after the last '::'
+
 			$defaults['answer'] = '';
 			for ($i=0;$i<($sz-1);$i++) {
 				$defaults['answer'] .= $pre_array[$i];
@@ -77,7 +77,7 @@ class FillBlanks extends Question
 		}
 
 		// javascript
-		echo '<script type="text/javascript">            
+		echo '<script>
 			function FCKeditor_OnComplete( editorInstance ) {
 				if (window.attachEvent) {
 					editorInstance.EditorDocument.attachEvent("onkeyup", updateBlanks) ;
@@ -114,6 +114,7 @@ class FillBlanks extends Question
                 if (firstTime) {
                     firstTime = false;
 			';
+
             if (count($a_weightings) > 0) {
                 foreach($a_weightings as $i => $weighting) {
                     echo 'document.getElementById("weighting['.$i.']").value = "'.$weighting.'";';
@@ -157,7 +158,6 @@ class FillBlanks extends Question
 	function processAnswersCreation($form)
 	{
 		global $charset;
-
 		$answer = $form->getSubmitValue('answer');
 		//Due the fckeditor transform the elements to their HTML value
 		$answer = api_html_entity_decode($answer, ENT_QUOTES, $charset);
@@ -167,22 +167,21 @@ class FillBlanks extends Question
 
 		// get the blanks weightings
 		$nb = preg_match_all('/\[[^\]]*\]/', $answer, $blanks);
-		if(isset($_GET['editQuestion']))
-		{
+		if (isset($_GET['editQuestion'])) {
 			$this -> weighting = 0;
 		}
 
-		if($nb>0)
-		{
+		if ($nb>0) {
 			$answer .= '::';
-			for($i=0 ; $i<$nb ; ++$i)
-			{
+			for($i=0 ; $i<$nb ; ++$i) {
 				$answer .= $form->getSubmitValue('weighting['.$i.']').',';
 				$this -> weighting += $form->getSubmitValue('weighting['.$i.']');
 			}
 			$answer = api_substr($answer,0,-1);
 		}
+
 		$is_multiple = $form->getSubmitValue('multiple_answer');
+
 		$answer.='@'.$is_multiple;
 
 		$this->save();
@@ -191,7 +190,8 @@ class FillBlanks extends Question
         $objAnswer->save();
 	}
 
-	function return_header($feedback_type = null, $counter = null, $score = null) {
+	function return_header($feedback_type = null, $counter = null, $score = null)
+    {
 	    $header = parent::return_header($feedback_type, $counter, $score);
 	    $header .= '<table class="'.$this->question_table_class .'">
 			<tr>
@@ -200,4 +200,3 @@ class FillBlanks extends Question
         return $header;
 	}
 }
-endif;