chamilo / chamilo-lms

main/exercise/export/qti2/qti2_classes.php

Doc Comments +5 added lines

@@ -72,6 +72,7 @@ 
     /**
      * Return the XML flow for the possible answers.
      *
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
@@ -147,6 +148,7 @@ 
      * Export the text with missing words.
      *
      *
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
@@ -204,6 +206,7 @@ 
 {
     /**
      * Export the question part as a matrix-choice, with only one possible answer per line.
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
@@ -295,6 +298,7 @@ 
     /**
      * TODO update this to match hot spots instead of copying matching
      * Export the question part as a matrix-choice, with only one possible answer per line.
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
     {
@@ -382,6 +386,7 @@ 
     /**
      * TODO implement
      * Export the question part as a matrix-choice, with only one possible answer per line.
+     * @param string $questionStatment
      */
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
 	{

Indentation +135 added lines, -135 removed lines

@@ -55,12 +55,12 @@ 
 
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
 
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 }
 /**
@@ -76,21 +76,21 @@ 
     public function imsExportResponses($questionIdent, $questionStatment)
     {
         // @todo getAnswersList() converts the answers using api_html_entity_decode()
-		$this->answerList = $this->getAnswersList(true);
+        $this->answerList = $this->getAnswersList(true);
         $out  = '    <choiceInteraction responseIdentifier="' . $questionIdent . '" >' . "\n";
         $out .= '      <prompt><![CDATA['.formatExerciseQtiTitle($questionStatment) . ']]></prompt>'. "\n";
-		if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $current_answer) {
-	            $out .= '<simpleChoice identifier="answer_' . $current_answer['id'] . '" fixed="false">
+        if (is_array($this->answerList)) {
+            foreach ($this->answerList as $current_answer) {
+                $out .= '<simpleChoice identifier="answer_' . $current_answer['id'] . '" fixed="false">
                          <![CDATA['.formatExerciseQtiTitle($current_answer['answer']).']]>';
-	            if (isset($current_answer['comment']) && $current_answer['comment'] != '') {
-	                $out .= '<feedbackInline identifier="answer_' . $current_answer['id'] . '">
+                if (isset($current_answer['comment']) && $current_answer['comment'] != '') {
+                    $out .= '<feedbackInline identifier="answer_' . $current_answer['id'] . '">
 	                         <![CDATA['.formatExerciseQtiTitle($current_answer['comment']).']]>
 	                         </feedbackInline>';
-	            }
-	            $out .= '</simpleChoice>'. "\n";
-	        }
-		}
+                }
+                $out .= '</simpleChoice>'. "\n";
+            }
+        }
         $out .= '    </choiceInteraction>'. "\n";
 
         return $out;
@@ -102,8 +102,8 @@ 
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-		$this->answerList = $this->getAnswersList(true);
-		$type = $this->getQuestionType();
+        $this->answerList = $this->getAnswersList(true);
+        $type = $this->getQuestionType();
         if ($type == MCMA)  $cardinality = 'multiple'; else $cardinality = 'single';
 
         $out = '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="' . $cardinality . '" baseType="identifier">' . "\n";
@@ -111,25 +111,25 @@ 
         // Match the correct answers.
 
         $out .= '    <correctResponse>'. "\n";
-		if (is_array($this->answerList)) {
-	        foreach($this->answerList as $current_answer) {
-	            if ($current_answer['correct']) {
-	                $out .= '      <value>answer_'. $current_answer['id'] .'</value>'. "\n";
-	            }
-	        }
-		}
+        if (is_array($this->answerList)) {
+            foreach($this->answerList as $current_answer) {
+                if ($current_answer['correct']) {
+                    $out .= '      <value>answer_'. $current_answer['id'] .'</value>'. "\n";
+                }
+            }
+        }
         $out .= '    </correctResponse>'. "\n";
 
         //Add the grading
 
         $out .= '    <mapping>'. "\n";
-		if (is_array($this->answerList)) {
-	        foreach($this->answerList as $current_answer) {
-	            if (isset($current_answer['grade'])) {
-	                $out .= ' <mapEntry mapKey="answer_'. $current_answer['id'] .'" mappedValue="'.$current_answer['grade'].'" />'. "\n";
-	            }
-	        }
-		}
+        if (is_array($this->answerList)) {
+            foreach($this->answerList as $current_answer) {
+                if (isset($current_answer['grade'])) {
+                    $out .= ' <mapEntry mapKey="answer_'. $current_answer['id'] .'" mappedValue="'.$current_answer['grade'].'" />'. "\n";
+                }
+            }
+        }
         $out .= '    </mapping>'. "\n";
         $out .= '  </responseDeclaration>'. "\n";
 
@@ -150,7 +150,7 @@ 
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
-		$this->answerList = $this->getAnswersList(true);
+        $this->answerList = $this->getAnswersList(true);
         $text = '';
         $text .= $this->answerText;
         if (is_array($this->answerList)) {
@@ -171,28 +171,28 @@ 
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-		$this->answerList = $this->getAnswersList(true);
-		$this->gradeList = $this->getGradesList();
+        $this->answerList = $this->getAnswersList(true);
+        $this->gradeList = $this->getGradesList();
         $out = '';
-		if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $answer) {
-	        	$answerKey = $answer['id'];
-	        	$answer = $answer['answer'];
-	            $out .= '  <responseDeclaration identifier="fill_' . $answerKey . '" cardinality="single" baseType="identifier">' . "\n";
-	            $out .= '    <correctResponse>'. "\n";
+        if (is_array($this->answerList)) {
+            foreach ($this->answerList as $answer) {
+                $answerKey = $answer['id'];
+                $answer = $answer['answer'];
+                $out .= '  <responseDeclaration identifier="fill_' . $answerKey . '" cardinality="single" baseType="identifier">' . "\n";
+                $out .= '    <correctResponse>'. "\n";
                 $out .= '      <value><![CDATA['.formatExerciseQtiTitle($answer).']]></value>'. "\n";
-	            $out .= '    </correctResponse>'. "\n";
-	            if (isset($this->gradeList[$answerKey])) {
-	                $out .= '    <mapping>'. "\n";
-	                $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'. "\n";
-	                $out .= '    </mapping>'. "\n";
-	            }
-
-	            $out .= '  </responseDeclaration>'. "\n";
-	        }
-		}
-
-       return $out;
+                $out .= '    </correctResponse>'. "\n";
+                if (isset($this->gradeList[$answerKey])) {
+                    $out .= '    <mapping>'. "\n";
+                    $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'. "\n";
+                    $out .= '    </mapping>'. "\n";
+                }
+
+                $out .= '  </responseDeclaration>'. "\n";
+            }
+        }
+
+        return $out;
     }
 }
 
@@ -207,8 +207,8 @@ 
      */
     public function imsExportResponses($questionIdent, $questionStatment)
     {
-		$this->answerList = $this->getAnswersList(true);
-		$maxAssociation = max(count($this->leftList), count($this->rightList));
+        $this->answerList = $this->getAnswersList(true);
+        $maxAssociation = max(count($this->leftList), count($this->rightList));
 
         $out = "";
 
@@ -218,14 +218,14 @@ 
         //add left column
 
         $out .= '  <simpleMatchSet>'. "\n";
-		if (is_array($this->leftList)) {
-	        foreach ($this->leftList as $leftKey=>$leftElement) {
-	            $out .= '
+        if (is_array($this->leftList)) {
+            foreach ($this->leftList as $leftKey=>$leftElement) {
+                $out .= '
 	            <simpleAssociableChoice identifier="left_'.$leftKey.'" >
 	                <![CDATA['.formatExerciseQtiTitle($leftElement['answer']).']]>
 	            </simpleAssociableChoice>'. "\n";
-	        }
-    	}
+            }
+        }
 
         $out .= '  </simpleMatchSet>'. "\n";
 
@@ -235,14 +235,14 @@ 
 
         $i = 0;
 
-		if (is_array($this->rightList)) {
-	        foreach($this->rightList as $rightKey=>$rightElement) {
-	            $out .= '<simpleAssociableChoice identifier="right_'.$i.'" >
+        if (is_array($this->rightList)) {
+            foreach($this->rightList as $rightKey=>$rightElement) {
+                $out .= '<simpleAssociableChoice identifier="right_'.$i.'" >
 	                    <![CDATA['.formatExerciseQtiTitle($rightElement['answer']).']]>
 	                    </simpleAssociableChoice>'. "\n";
-	            $i++;
-	        }
-		}
+                $i++;
+            }
+        }
         $out .= '  </simpleMatchSet>'. "\n";
         $out .= '</matchInteraction>'. "\n";
 
@@ -254,30 +254,30 @@ 
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-		$this->answerList = $this->getAnswersList(true);
+        $this->answerList = $this->getAnswersList(true);
         $out =  '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="single" baseType="identifier">' . "\n";
         $out .= '    <correctResponse>' . "\n";
 
         $gradeArray = array();
-		if (is_array($this->leftList)) {
-	        foreach ($this->leftList as $leftKey=>$leftElement) {
-	            $i=0;
-	            foreach ($this->rightList as $rightKey=>$rightElement) {
-	                if (($leftElement['match'] == $rightElement['code'])) {
-	                    $out .= '      <value>left_' . $leftKey . ' right_'.$i.'</value>'. "\n";
-
-	                    $gradeArray['left_' . $leftKey . ' right_'.$i] = $leftElement['grade'];
-	                }
-	                $i++;
-	            }
-	        }
-		}
+        if (is_array($this->leftList)) {
+            foreach ($this->leftList as $leftKey=>$leftElement) {
+                $i=0;
+                foreach ($this->rightList as $rightKey=>$rightElement) {
+                    if (($leftElement['match'] == $rightElement['code'])) {
+                        $out .= '      <value>left_' . $leftKey . ' right_'.$i.'</value>'. "\n";
+
+                        $gradeArray['left_' . $leftKey . ' right_'.$i] = $leftElement['grade'];
+                    }
+                    $i++;
+                }
+            }
+        }
         $out .= '    </correctResponse>'. "\n";
         $out .= '    <mapping>' . "\n";
         if (is_array($gradeArray)) {
-	        foreach ($gradeArray as $gradeKey=>$grade) {
-	            $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>' . "\n";
-	        }
+            foreach ($gradeArray as $gradeKey=>$grade) {
+                $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>' . "\n";
+            }
         }
         $out .= '    </mapping>' . "\n";
         $out .= '  </responseDeclaration>'. "\n";
@@ -298,49 +298,49 @@ 
      */
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
     {
-		$this->answerList = $this->getAnswersList(true);
-		$questionMedia = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/'.$questionMedia;
-		$mimetype = mime_content_type($questionMedia);
-		if(empty($mimetype)){
-			$mimetype = 'image/jpeg';
-		}
-
-		$text = '      <p>'.$questionStatment.'</p>'."\n";
-		$text .= '      <graphicOrderInteraction responseIdentifier="hotspot_'.$questionIdent.'">'."\n";
-		$text .= '        <prompt>'.$questionDesc.'</prompt>'."\n";
-		$text .= '        <object type="'.$mimetype.'" width="250" height="230" data="'.$questionMedia.'">-</object>'."\n";
+        $this->answerList = $this->getAnswersList(true);
+        $questionMedia = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/'.$questionMedia;
+        $mimetype = mime_content_type($questionMedia);
+        if(empty($mimetype)){
+            $mimetype = 'image/jpeg';
+        }
+
+        $text = '      <p>'.$questionStatment.'</p>'."\n";
+        $text .= '      <graphicOrderInteraction responseIdentifier="hotspot_'.$questionIdent.'">'."\n";
+        $text .= '        <prompt>'.$questionDesc.'</prompt>'."\n";
+        $text .= '        <object type="'.$mimetype.'" width="250" height="230" data="'.$questionMedia.'">-</object>'."\n";
         if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $key=>$answer) {
-	        	$key = $answer['id'];
-	        	$answerTxt = $answer['answer'];
-	        	$len = api_strlen($answerTxt);
-	        	//coords are transformed according to QTIv2 rules here: http://www.imsproject.org/question/qtiv2p1pd/imsqti_infov2p1pd.html#element10663
-	        	$coords = '';
-	        	$type = 'default';
-	        	switch($answer['hotspot_type']){
-	        		case 'square':
-	        			$type = 'rect';
-						$res = array();
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
-						$coords = $res[1].','.$res[2].','.((int)$res[1]+(int)$res[3]).",".((int)$res[2]+(int)$res[4]);
-	        			break;
-	        		case 'circle':
-	        			$type = 'circle';
-			 			$res = array();
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
-						$coords = $res[1].','.$res[2].','.sqrt(pow(($res[1]-$res[3]),2)+pow(($res[2]-$res[4])));
-	        			break;
-	        		case 'poly':
-	        			$type = 'poly';
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
-	        			break;
-	        		 case 'delineation' :
-	        			$type = 'delineation';
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
-	        			break;
-	        	}
-	            $text .= '        <hotspotChoice shape="'.$type.'" coords="'.$coords.'" identifier="'.$key.'"/>'."\n";
-	        }
+            foreach ($this->answerList as $key=>$answer) {
+                $key = $answer['id'];
+                $answerTxt = $answer['answer'];
+                $len = api_strlen($answerTxt);
+                //coords are transformed according to QTIv2 rules here: http://www.imsproject.org/question/qtiv2p1pd/imsqti_infov2p1pd.html#element10663
+                $coords = '';
+                $type = 'default';
+                switch($answer['hotspot_type']){
+                    case 'square':
+                        $type = 'rect';
+                        $res = array();
+                        $coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
+                        $coords = $res[1].','.$res[2].','.((int)$res[1]+(int)$res[3]).",".((int)$res[2]+(int)$res[4]);
+                        break;
+                    case 'circle':
+                        $type = 'circle';
+                            $res = array();
+                        $coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
+                        $coords = $res[1].','.$res[2].','.sqrt(pow(($res[1]-$res[3]),2)+pow(($res[2]-$res[4])));
+                        break;
+                    case 'poly':
+                        $type = 'poly';
+                        $coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
+                        break;
+                        case 'delineation' :
+                        $type = 'delineation';
+                        $coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
+                        break;
+                }
+                $text .= '        <hotspotChoice shape="'.$type.'" coords="'.$coords.'" identifier="'.$key.'"/>'."\n";
+            }
         }
         $text .= '      </graphicOrderInteraction>'."\n";
         $out = $text;
@@ -353,23 +353,23 @@ 
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-		$this->answerList = $this->getAnswersList(true);
-		$this->gradeList = $this->getGradesList();
+        $this->answerList = $this->getAnswersList(true);
+        $this->gradeList = $this->getGradesList();
         $out = '';
         $out .= '  <responseDeclaration identifier="hotspot_'.$questionIdent.'" cardinality="ordered" baseType="identifier">' . "\n";
         $out .= '    <correctResponse>'. "\n";
 
-		if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $answerKey=>$answer)  {
-	        	$answerKey = $answer['id'];
-	        	$answer = $answer['answer'];
-	            $out .= '<value><![CDATA['.formatExerciseQtiTitle($answerKey).']]></value>';
-	        }
-		}
+        if (is_array($this->answerList)) {
+            foreach ($this->answerList as $answerKey=>$answer)  {
+                $answerKey = $answer['id'];
+                $answer = $answer['answer'];
+                $out .= '<value><![CDATA['.formatExerciseQtiTitle($answerKey).']]></value>';
+            }
+        }
         $out .= '    </correctResponse>'. "\n";
         $out .= '  </responseDeclaration>'. "\n";
 
-       return $out;
+        return $out;
     }
 }
 
@@ -384,14 +384,14 @@ 
      * Export the question part as a matrix-choice, with only one possible answer per line.
      */
     public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
-	{
-		return '';
-	}
+    {
+        return '';
+    }
     /**
      *
      */
     public function imsExportResponsesDeclaration($questionIdent)
     {
-    	return '';
+        return '';
     }
 }

Spacing +58 added lines, -58 removed lines

@@ -14,7 +14,7 @@ 
      */
     public function setAnswer()
     {
-        switch($this->type) {
+        switch ($this->type) {
             case MCUA:
                 $answer = new ImsAnswerMultipleChoice($this->id);
 
@@ -77,21 +77,21 @@ 
     {
         // @todo getAnswersList() converts the answers using api_html_entity_decode()
 		$this->answerList = $this->getAnswersList(true);
-        $out  = '    <choiceInteraction responseIdentifier="' . $questionIdent . '" >' . "\n";
-        $out .= '      <prompt><![CDATA['.formatExerciseQtiTitle($questionStatment) . ']]></prompt>'. "\n";
+        $out  = '    <choiceInteraction responseIdentifier="'.$questionIdent.'" >'."\n";
+        $out .= '      <prompt><![CDATA['.formatExerciseQtiTitle($questionStatment).']]></prompt>'."\n";
 		if (is_array($this->answerList)) {
 	        foreach ($this->answerList as $current_answer) {
-	            $out .= '<simpleChoice identifier="answer_' . $current_answer['id'] . '" fixed="false">
+	            $out .= '<simpleChoice identifier="answer_'.$current_answer['id'].'" fixed="false">
                          <![CDATA['.formatExerciseQtiTitle($current_answer['answer']).']]>';
 	            if (isset($current_answer['comment']) && $current_answer['comment'] != '') {
-	                $out .= '<feedbackInline identifier="answer_' . $current_answer['id'] . '">
+	                $out .= '<feedbackInline identifier="answer_'.$current_answer['id'].'">
 	                         <![CDATA['.formatExerciseQtiTitle($current_answer['comment']).']]>
 	                         </feedbackInline>';
 	            }
-	            $out .= '</simpleChoice>'. "\n";
+	            $out .= '</simpleChoice>'."\n";
 	        }
 		}
-        $out .= '    </choiceInteraction>'. "\n";
+        $out .= '    </choiceInteraction>'."\n";
 
         return $out;
     }
@@ -106,32 +106,32 @@ 
 		$type = $this->getQuestionType();
         if ($type == MCMA)  $cardinality = 'multiple'; else $cardinality = 'single';
 
-        $out = '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="' . $cardinality . '" baseType="identifier">' . "\n";
+        $out = '  <responseDeclaration identifier="'.$questionIdent.'" cardinality="'.$cardinality.'" baseType="identifier">'."\n";
 
         // Match the correct answers.
 
-        $out .= '    <correctResponse>'. "\n";
+        $out .= '    <correctResponse>'."\n";
 		if (is_array($this->answerList)) {
-	        foreach($this->answerList as $current_answer) {
+	        foreach ($this->answerList as $current_answer) {
 	            if ($current_answer['correct']) {
-	                $out .= '      <value>answer_'. $current_answer['id'] .'</value>'. "\n";
+	                $out .= '      <value>answer_'.$current_answer['id'].'</value>'."\n";
 	            }
 	        }
 		}
-        $out .= '    </correctResponse>'. "\n";
+        $out .= '    </correctResponse>'."\n";
 
         //Add the grading
 
-        $out .= '    <mapping>'. "\n";
+        $out .= '    <mapping>'."\n";
 		if (is_array($this->answerList)) {
-	        foreach($this->answerList as $current_answer) {
+	        foreach ($this->answerList as $current_answer) {
 	            if (isset($current_answer['grade'])) {
-	                $out .= ' <mapEntry mapKey="answer_'. $current_answer['id'] .'" mappedValue="'.$current_answer['grade'].'" />'. "\n";
+	                $out .= ' <mapEntry mapKey="answer_'.$current_answer['id'].'" mappedValue="'.$current_answer['grade'].'" />'."\n";
 	            }
 	        }
 		}
-        $out .= '    </mapping>'. "\n";
-        $out .= '  </responseDeclaration>'. "\n";
+        $out .= '    </mapping>'."\n";
+        $out .= '  </responseDeclaration>'."\n";
 
         return $out;
     }
@@ -158,7 +158,7 @@ 
                 $key = $answer['id'];
                 $answer = $answer['answer'];
                 $len = api_strlen($answer);
-                $text = str_replace('['.$answer.']','<textEntryInteraction responseIdentifier="fill_'.$key.'" expectedLength="'.api_strlen($answer).'"/>', $text);
+                $text = str_replace('['.$answer.']', '<textEntryInteraction responseIdentifier="fill_'.$key.'" expectedLength="'.api_strlen($answer).'"/>', $text);
             }
         }
         $out = $text;
@@ -178,17 +178,17 @@ 
 	        foreach ($this->answerList as $answer) {
 	        	$answerKey = $answer['id'];
 	        	$answer = $answer['answer'];
-	            $out .= '  <responseDeclaration identifier="fill_' . $answerKey . '" cardinality="single" baseType="identifier">' . "\n";
-	            $out .= '    <correctResponse>'. "\n";
-                $out .= '      <value><![CDATA['.formatExerciseQtiTitle($answer).']]></value>'. "\n";
-	            $out .= '    </correctResponse>'. "\n";
+	            $out .= '  <responseDeclaration identifier="fill_'.$answerKey.'" cardinality="single" baseType="identifier">'."\n";
+	            $out .= '    <correctResponse>'."\n";
+                $out .= '      <value><![CDATA['.formatExerciseQtiTitle($answer).']]></value>'."\n";
+	            $out .= '    </correctResponse>'."\n";
 	            if (isset($this->gradeList[$answerKey])) {
-	                $out .= '    <mapping>'. "\n";
-	                $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'. "\n";
-	                $out .= '    </mapping>'. "\n";
+	                $out .= '    <mapping>'."\n";
+	                $out .= '      <mapEntry mapKey="'.$answer.'" mappedValue="'.$this->gradeList[$answerKey].'"/>'."\n";
+	                $out .= '    </mapping>'."\n";
 	            }
 
-	            $out .= '  </responseDeclaration>'. "\n";
+	            $out .= '  </responseDeclaration>'."\n";
 	        }
 		}
 
@@ -212,12 +212,12 @@ 
 
         $out = "";
 
-        $out .= '<matchInteraction responseIdentifier="' . $questionIdent . '" maxAssociations="'. $maxAssociation .'">'. "\n";
+        $out .= '<matchInteraction responseIdentifier="'.$questionIdent.'" maxAssociations="'.$maxAssociation.'">'."\n";
         $out .= $questionStatment;
 
         //add left column
 
-        $out .= '  <simpleMatchSet>'. "\n";
+        $out .= '  <simpleMatchSet>'."\n";
 		if (is_array($this->leftList)) {
 	        foreach ($this->leftList as $leftKey=>$leftElement) {
 	            $out .= '
@@ -227,24 +227,24 @@ 
 	        }
     	}
 
-        $out .= '  </simpleMatchSet>'. "\n";
+        $out .= '  </simpleMatchSet>'."\n";
 
         //add right column
 
-        $out .= '  <simpleMatchSet>'. "\n";
+        $out .= '  <simpleMatchSet>'."\n";
 
         $i = 0;
 
 		if (is_array($this->rightList)) {
-	        foreach($this->rightList as $rightKey=>$rightElement) {
+	        foreach ($this->rightList as $rightKey=>$rightElement) {
 	            $out .= '<simpleAssociableChoice identifier="right_'.$i.'" >
 	                    <![CDATA['.formatExerciseQtiTitle($rightElement['answer']).']]>
 	                    </simpleAssociableChoice>'. "\n";
 	            $i++;
 	        }
 		}
-        $out .= '  </simpleMatchSet>'. "\n";
-        $out .= '</matchInteraction>'. "\n";
+        $out .= '  </simpleMatchSet>'."\n";
+        $out .= '</matchInteraction>'."\n";
 
         return $out;
     }
@@ -255,32 +255,32 @@ 
     public function imsExportResponsesDeclaration($questionIdent)
     {
 		$this->answerList = $this->getAnswersList(true);
-        $out =  '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="single" baseType="identifier">' . "\n";
-        $out .= '    <correctResponse>' . "\n";
+        $out = '  <responseDeclaration identifier="'.$questionIdent.'" cardinality="single" baseType="identifier">'."\n";
+        $out .= '    <correctResponse>'."\n";
 
         $gradeArray = array();
 		if (is_array($this->leftList)) {
 	        foreach ($this->leftList as $leftKey=>$leftElement) {
-	            $i=0;
+	            $i = 0;
 	            foreach ($this->rightList as $rightKey=>$rightElement) {
 	                if (($leftElement['match'] == $rightElement['code'])) {
-	                    $out .= '      <value>left_' . $leftKey . ' right_'.$i.'</value>'. "\n";
+	                    $out .= '      <value>left_'.$leftKey.' right_'.$i.'</value>'."\n";
 
-	                    $gradeArray['left_' . $leftKey . ' right_'.$i] = $leftElement['grade'];
+	                    $gradeArray['left_'.$leftKey.' right_'.$i] = $leftElement['grade'];
 	                }
 	                $i++;
 	            }
 	        }
 		}
-        $out .= '    </correctResponse>'. "\n";
-        $out .= '    <mapping>' . "\n";
+        $out .= '    </correctResponse>'."\n";
+        $out .= '    <mapping>'."\n";
         if (is_array($gradeArray)) {
 	        foreach ($gradeArray as $gradeKey=>$grade) {
-	            $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>' . "\n";
+	            $out .= '          <mapEntry mapKey="'.$gradeKey.'" mappedValue="'.$grade.'"/>'."\n";
 	        }
         }
-        $out .= '    </mapping>' . "\n";
-        $out .= '  </responseDeclaration>'. "\n";
+        $out .= '    </mapping>'."\n";
+        $out .= '  </responseDeclaration>'."\n";
 
         return $out;
     }
@@ -296,12 +296,12 @@ 
      * TODO update this to match hot spots instead of copying matching
      * Export the question part as a matrix-choice, with only one possible answer per line.
      */
-    public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
+    public function imsExportResponses($questionIdent, $questionStatment, $questionDesc = '', $questionMedia = '')
     {
 		$this->answerList = $this->getAnswersList(true);
 		$questionMedia = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/'.$questionMedia;
 		$mimetype = mime_content_type($questionMedia);
-		if(empty($mimetype)){
+		if (empty($mimetype)) {
 			$mimetype = 'image/jpeg';
 		}
 
@@ -317,26 +317,26 @@ 
 	        	//coords are transformed according to QTIv2 rules here: http://www.imsproject.org/question/qtiv2p1pd/imsqti_infov2p1pd.html#element10663
 	        	$coords = '';
 	        	$type = 'default';
-	        	switch($answer['hotspot_type']){
+	        	switch ($answer['hotspot_type']) {
 	        		case 'square':
 	        			$type = 'rect';
 						$res = array();
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
-						$coords = $res[1].','.$res[2].','.((int)$res[1]+(int)$res[3]).",".((int)$res[2]+(int)$res[4]);
+						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/', $answer['hotspot_coord'], $res);
+						$coords = $res[1].','.$res[2].','.((int) $res[1] + (int) $res[3]).",".((int) $res[2] + (int) $res[4]);
 	        			break;
 	        		case 'circle':
 	        			$type = 'circle';
 			 			$res = array();
-						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/',$answer['hotspot_coord'],$res);
-						$coords = $res[1].','.$res[2].','.sqrt(pow(($res[1]-$res[3]),2)+pow(($res[2]-$res[4])));
+						$coords = preg_match('/^\s*(\d+);(\d+)\|(\d+)\|(\d+)\s*$/', $answer['hotspot_coord'], $res);
+						$coords = $res[1].','.$res[2].','.sqrt(pow(($res[1] - $res[3]), 2) + pow(($res[2] - $res[4])));
 	        			break;
 	        		case 'poly':
 	        			$type = 'poly';
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
+						$coords = str_replace(array(';', '|'), array(',', ','), $answer['hotspot_coord']);
 	        			break;
 	        		 case 'delineation' :
 	        			$type = 'delineation';
-						$coords = str_replace(array(';','|'),array(',',','),$answer['hotspot_coord']);
+						$coords = str_replace(array(';', '|'), array(',', ','), $answer['hotspot_coord']);
 	        			break;
 	        	}
 	            $text .= '        <hotspotChoice shape="'.$type.'" coords="'.$coords.'" identifier="'.$key.'"/>'."\n";
@@ -356,18 +356,18 @@ 
 		$this->answerList = $this->getAnswersList(true);
 		$this->gradeList = $this->getGradesList();
         $out = '';
-        $out .= '  <responseDeclaration identifier="hotspot_'.$questionIdent.'" cardinality="ordered" baseType="identifier">' . "\n";
-        $out .= '    <correctResponse>'. "\n";
+        $out .= '  <responseDeclaration identifier="hotspot_'.$questionIdent.'" cardinality="ordered" baseType="identifier">'."\n";
+        $out .= '    <correctResponse>'."\n";
 
 		if (is_array($this->answerList)) {
-	        foreach ($this->answerList as $answerKey=>$answer)  {
+	        foreach ($this->answerList as $answerKey=>$answer) {
 	        	$answerKey = $answer['id'];
 	        	$answer = $answer['answer'];
 	            $out .= '<value><![CDATA['.formatExerciseQtiTitle($answerKey).']]></value>';
 	        }
 		}
-        $out .= '    </correctResponse>'. "\n";
-        $out .= '  </responseDeclaration>'. "\n";
+        $out .= '    </correctResponse>'."\n";
+        $out .= '  </responseDeclaration>'."\n";
 
        return $out;
     }
@@ -383,7 +383,7 @@ 
      * TODO implement
      * Export the question part as a matrix-choice, with only one possible answer per line.
      */
-    public function imsExportResponses($questionIdent, $questionStatment, $questionDesc='', $questionMedia='')
+    public function imsExportResponses($questionIdent, $questionStatment, $questionDesc = '', $questionMedia = '')
 	{
 		return '';
 	}

Braces +5 added lines, -1 removed lines

@@ -104,7 +104,11 @@
     {
 		$this->answerList = $this->getAnswersList(true);
 		$type = $this->getQuestionType();
-        if ($type == MCMA)  $cardinality = 'multiple'; else $cardinality = 'single';
+        if ($type == MCMA) {
+            $cardinality = 'multiple';
+        } else {
+            $cardinality = 'single';
+        }
 
         $out = '  <responseDeclaration identifier="' . $questionIdent . '" cardinality="' . $cardinality . '" baseType="identifier">' . "\n";
 

main/exercise/hotpotatoes.lib.php

Doc Comments +2 added lines, -2 removed lines

@@ -259,7 +259,7 @@ 
  * @param    reference    Reference to the array to search
  * @param    string       Node we are looking for in the array
  * @param string $node
- * @return   mixed        Node name or false if not found
+ * @return   false|string        Node name or false if not found
  */
 function myarraysearch(&$array, $node)
 {
@@ -280,7 +280,7 @@ 
  * Searches an image name into an array.
  * @param    reference        Reference to an array to search
  * @param    string           String to look for
- * @return   mixed            String given if found, false otherwise
+ * @return   false|string            String given if found, false otherwise
  * @uses     myarraysearch    This function is just an additional layer on the myarraysearch() function
  */
 function CheckImageName(&$imgparams, $string)

Indentation +1 added lines, -1 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
     if ($title == '') {
         $title = basename($fname);
     }
-    return (string)$title;
+    return (string) $title;
 }
 
 /**
@@ -176,7 +176,7 @@ 
         if ($src == '') {
             return '';
         } else {
-            $tmp_src = basename($src) ;
+            $tmp_src = basename($src);
             if ($tmp_src == '') {
                 return $src;
             } else {
@@ -198,7 +198,7 @@ 
 {
     // Select src tag from img tag.
     $match = array();
-    preg_match("|(src=\".*\" )|U", $imgtag, $match);            //src
+    preg_match("|(src=\".*\" )|U", $imgtag, $match); //src
     list($key, $srctag) = each($match);
     $src = substr($srctag, 5, (strlen($srctag) - 7));
     if (stristr($src, 'http') === false) {
@@ -230,8 +230,8 @@ 
         while (list($key, $imgtag) = each($match)) {
             $imgname = GetImgName($imgtag);
             if ($imgname != '' && !in_array($imgname, $imgparams)) {
-                array_push($imgparams, $imgname);    // name (+ type) of the images in the html test
-                $imgcount = $imgcount + 1;            // number of images in the html test
+                array_push($imgparams, $imgname); // name (+ type) of the images in the html test
+                $imgcount = $imgcount + 1; // number of images in the html test
             }
         }
     }
@@ -404,7 +404,7 @@ 
                 if ($file != '..') {
                     $full_name = $folder.'/'.$file;
                     if (is_dir($full_name)) {
-                        $dflag = 1;    // first directory
+                        $dflag = 1; // first directory
                     }
                 }
             }

main/mySpace/myStudents.php

Braces +3 added lines, -2 removed lines

@@ -1143,10 +1143,11 @@
                 $result_last_attempt = Database::query($sql);
                 if (Database :: num_rows($result_last_attempt) > 0) {
                     $id_last_attempt = Database :: result($result_last_attempt, 0, 0);
-                    if ($count_attempts > 0)
-                        echo '<a href="../exercise/exercise_show.php?id=' . $id_last_attempt . '&cidReq='.$course_code.'&session_id='.$sessionId.'&student='.$student_id.'&origin='.(empty($origin)?'tracking':$origin).'">
+                    if ($count_attempts > 0) {
+                                            echo '<a href="../exercise/exercise_show.php?id=' . $id_last_attempt . '&cidReq='.$course_code.'&session_id='.$sessionId.'&student='.$student_id.'&origin='.(empty($origin)?'tracking':$origin).'">
                         '.Display::return_icon('quiz.gif').'
                      </a>';
+                    }
                 }
                 echo '</td>';
 

Spacing +69 added lines, -69 removed lines

@@ -67,52 +67,52 @@ 
 if (isset($_GET['details'])) {
     if ($origin === 'user_course') {
         if (empty ($cidReq)) {
-            $interbreadcrumb[] = array (
-                "url" => api_get_path(WEB_COURSE_PATH) . $courseInfo['directory'],
+            $interbreadcrumb[] = array(
+                "url" => api_get_path(WEB_COURSE_PATH).$courseInfo['directory'],
                 'name' => $courseInfo['title']
             );
         }
-        $interbreadcrumb[] = array (
-            "url" => "../user/user.php?cidReq=" . $course_code,
+        $interbreadcrumb[] = array(
+            "url" => "../user/user.php?cidReq=".$course_code,
             "name" => get_lang("Users")
         );
     } else
         if ($origin === 'tracking_course') {
-            $interbreadcrumb[] = array (
-                "url" => "../tracking/courseLog.php?cidReq=".$course_code.'&id_session=' . api_get_session_id(),
+            $interbreadcrumb[] = array(
+                "url" => "../tracking/courseLog.php?cidReq=".$course_code.'&id_session='.api_get_session_id(),
                 "name" => get_lang("Tracking")
             );
         } else
             if ($origin === 'resume_session') {
-                $interbreadcrumb[] = array (
+                $interbreadcrumb[] = array(
                     'url' => "../session/session_list.php",
                     "name" => get_lang('SessionList')
                 );
-                $interbreadcrumb[] = array (
-                    'url' => "../session/resume_session.php?id_session=" . $sessionId,
+                $interbreadcrumb[] = array(
+                    'url' => "../session/resume_session.php?id_session=".$sessionId,
                     "name" => get_lang('SessionOverview')
                 );
             } else {
-                $interbreadcrumb[] = array (
-                    "url" => api_is_student_boss()?"#":"index.php",
+                $interbreadcrumb[] = array(
+                    "url" => api_is_student_boss() ? "#" : "index.php",
                     "name" => get_lang('MySpace')
                 );
                 if (isset ($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
-                    $interbreadcrumb[] = array (
-                        "url" => "student.php?id_coach=" . Security :: remove_XSS($_GET['id_coach']),
+                    $interbreadcrumb[] = array(
+                        "url" => "student.php?id_coach=".Security :: remove_XSS($_GET['id_coach']),
                         "name" => get_lang("CoachStudents")
                     );
-                    $interbreadcrumb[] = array (
-                        "url" => "myStudents.php?student=" . $student_id. '&id_coach=' . Security :: remove_XSS($_GET['id_coach']),
+                    $interbreadcrumb[] = array(
+                        "url" => "myStudents.php?student=".$student_id.'&id_coach='.Security :: remove_XSS($_GET['id_coach']),
                         "name" => get_lang("StudentDetails")
                     );
                 } else {
-                    $interbreadcrumb[] = array (
+                    $interbreadcrumb[] = array(
                         "url" => "student.php",
                         "name" => get_lang("MyStudents")
                     );
-                    $interbreadcrumb[] = array (
-                        "url" => "myStudents.php?student=" . $student_id,
+                    $interbreadcrumb[] = array(
+                        "url" => "myStudents.php?student=".$student_id,
                         "name" => get_lang("StudentDetails")
                     );
                 }
@@ -120,7 +120,7 @@ 
     $nameTools = get_lang("DetailsStudentInCourse");
 } else {
     if ($origin == 'resume_session') {
-        $interbreadcrumb[] = array (
+        $interbreadcrumb[] = array(
             'url' => "../session/session_list.php",
             "name" => get_lang('SessionList')
         );
@@ -131,24 +131,24 @@ 
             );
         }
     } else {
-        $interbreadcrumb[] = array (
-            "url" => api_is_student_boss()?"#":"index.php",
+        $interbreadcrumb[] = array(
+            "url" => api_is_student_boss() ? "#" : "index.php",
             "name" => get_lang('MySpace')
         );
         if (isset ($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
             if ($sessionId) {
-                $interbreadcrumb[] = array (
-                    "url" => "student.php?id_coach=" . Security :: remove_XSS($_GET['id_coach']) . "&id_session=" . $sessionId,
+                $interbreadcrumb[] = array(
+                    "url" => "student.php?id_coach=".Security :: remove_XSS($_GET['id_coach'])."&id_session=".$sessionId,
                     "name" => get_lang("CoachStudents")
                 );
             } else {
-                $interbreadcrumb[] = array (
-                    "url" => "student.php?id_coach=" . Security :: remove_XSS($_GET['id_coach']),
+                $interbreadcrumb[] = array(
+                    "url" => "student.php?id_coach=".Security :: remove_XSS($_GET['id_coach']),
                     "name" => get_lang("CoachStudents")
                 );
             }
         } else {
-            $interbreadcrumb[] = array (
+            $interbreadcrumb[] = array(
                 "url" => "student.php",
                 "name" => get_lang("MyStudents")
             );
@@ -330,28 +330,28 @@ 
     // Actions bar
     echo '<div class="actions">';
     echo '<a href="javascript: window.history.go(-1);">'.
-            Display::return_icon('back.png', get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
 
     echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
-            Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    echo '<a href="' . api_get_self() . '?' . Security :: remove_XSS($_SERVER['QUERY_STRING']) . '&export=csv">'.
-            Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
+    echo '<a href="'.api_get_self().'?'.Security :: remove_XSS($_SERVER['QUERY_STRING']).'&export=csv">'.
+            Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a> ';
 
-    echo '<a href="' . api_get_self() . '?' . Security :: remove_XSS($_SERVER['QUERY_STRING']) . '&export=xls">'.
-    Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a> ';
+    echo '<a href="'.api_get_self().'?'.Security :: remove_XSS($_SERVER['QUERY_STRING']).'&export=xls">'.
+    Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a> ';
 
     if (!empty ($user_info['email'])) {
         $send_mail = '<a href="mailto:'.$user_info['email'].'">'.
-            Display :: return_icon('mail_send.png', get_lang('SendMail'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display :: return_icon('mail_send.png', get_lang('SendMail'), '', ICON_SIZE_MEDIUM).'</a>';
     } else {
-        $send_mail = Display :: return_icon('mail_send_na.png', get_lang('SendMail'),'',ICON_SIZE_MEDIUM);
+        $send_mail = Display :: return_icon('mail_send_na.png', get_lang('SendMail'), '', ICON_SIZE_MEDIUM);
     }
     echo $send_mail;
     if (!empty($student_id) && !empty($course_code)) {
         // Only show link to connection details if course and student were defined in the URL
-        echo '<a href="access_details.php?student=' . $student_id . '&course=' . $course_code . '&origin=' . $origin. '&cidReq='.$course_code.'&id_session='.$sessionId.'">'.
-            Display :: return_icon('statistics.png', get_lang('AccessDetails'),'',ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="access_details.php?student='.$student_id.'&course='.$course_code.'&origin='.$origin.'&cidReq='.$course_code.'&id_session='.$sessionId.'">'.
+            Display :: return_icon('statistics.png', get_lang('AccessDetails'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     if (api_can_login_as($student_id)) {
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_list.php?action=login_as&user_id='.$student_id.'&sec_token='.$token.'">'.
@@ -360,7 +360,7 @@ 
 
     echo Display::url(
         Display::return_icon('skill-badges.png', get_lang('AssignSkill'), null, ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . 'badge/assign.php?' . http_build_query(['user' => $student_id])
+        api_get_path(WEB_CODE_PATH).'badge/assign.php?'.http_build_query(['user' => $student_id])
     );
 
 
@@ -421,7 +421,7 @@ 
     $csv_content[] = array(
         get_lang('Information', '')
     );
-    $csv_content[] = array (
+    $csv_content[] = array(
         get_lang('Name', ''),
         get_lang('Email', ''),
         get_lang('Tel', '')
@@ -449,7 +449,7 @@ 
         strip_tags($first_connection_date),
         strip_tags($last_connection_date),
         $time_spent_on_the_course,
-        $avg_student_progress . '%',
+        $avg_student_progress.'%',
         $avg_student_score
     );
 
@@ -479,19 +479,19 @@ 
             </thead>
             <tbody>
             <tr>
-                <td><?php echo get_lang('Name') . ' : '.$user_info['complete_name']; ?></td>
+                <td><?php echo get_lang('Name').' : '.$user_info['complete_name']; ?></td>
             </tr>
             <tr>
-                <td><?php echo get_lang('Email') . ' : ';
+                <td><?php echo get_lang('Email').' : ';
                     if (!empty ($user_info['email'])) {
-                        echo '<a href="mailto:' . $user_info['email'] . '">' . $user_info['email'] . '</a>';
+                        echo '<a href="mailto:'.$user_info['email'].'">'.$user_info['email'].'</a>';
                     } else {
                         echo get_lang('NoEmail');
                     } ?>
                 </td>
             </tr>
             <tr>
-                <td> <?php echo get_lang('Tel') . ' : ';
+                <td> <?php echo get_lang('Tel').' : ';
                     if (!empty ($user_info['phone'])) {
                         echo $user_info['phone'];
                     } else {
@@ -501,7 +501,7 @@ 
                 </td>
             </tr>
             <tr>
-                <td> <?php echo get_lang('OfficialCode') . ' : ';
+                <td> <?php echo get_lang('OfficialCode').' : ';
                     if (!empty ($user_info['official_code'])) {
                         echo $user_info['official_code'];
                     } else {
@@ -511,7 +511,7 @@ 
                 </td>
             </tr>
             <tr>
-                <td><?php echo get_lang('OnLine') . ' : '.$online; ?> </td>
+                <td><?php echo get_lang('OnLine').' : '.$online; ?> </td>
             </tr>
             <?php
 
@@ -525,7 +525,7 @@ 
             if ($timezone !== null) {
                 ?>
                 <tr>
-                    <td> <?php echo get_lang('Timezone') . ' : '.$timezone; ?> </td>
+                    <td> <?php echo get_lang('Timezone').' : '.$timezone; ?> </td>
                 </tr>
             <?php
             }
@@ -672,9 +672,9 @@ 
                 }
 
                 if (!empty($access_start_date) && !empty($access_end_date)) {
-                    $date_session = get_lang('From') . ' ' . $access_start_date . ' ' . get_lang('Until') . ' ' . $access_end_date;
+                    $date_session = get_lang('From').' '.$access_start_date.' '.get_lang('Until').' '.$access_end_date;
                 }
-                $title = Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.$session_name.($date_session?' ('.$date_session.')':'');
+                $title = Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.$session_name.($date_session ? ' ('.$date_session.')' : '');
             }
 
             // Courses
@@ -729,16 +729,16 @@ 
                         $scoretotal = array();
                         if (isset($cats) && isset($cats[0])) {
                             if (!empty($sId)) {
-                                $scoretotal= $cats[0]->calc_score($student_id, null, $courseCodeItem, $sId);
+                                $scoretotal = $cats[0]->calc_score($student_id, null, $courseCodeItem, $sId);
                             } else {
-                                $scoretotal= $cats[0]->calc_score($student_id, null, $courseCodeItem);
+                                $scoretotal = $cats[0]->calc_score($student_id, null, $courseCodeItem);
                             }
                         }
 
                         $scoretotal_display = '0/0 (0%)';
                         if (!empty($scoretotal)) {
                             $scoretotal_display =
-                                round($scoretotal[0], 1 ).'/'.
+                                round($scoretotal[0], 1).'/'.
                                 round($scoretotal[1], 1).
                                 ' ('.round(($scoretotal[0] / $scoretotal[1]) * 100, 2).' %)';
                         }
@@ -759,9 +759,9 @@ 
                         );
 
                         echo '<tr>
-                        <td ><a href="' .$courseInfoItem['course_public_url'] .'?id_session=' . $sId . '">'.
+                        <td ><a href="' .$courseInfoItem['course_public_url'].'?id_session='.$sId.'">'.
                             $courseInfoItem['title'].'</a></td>
-                        <td >'.$time_spent_on_course .'</td>
+                        <td >'.$time_spent_on_course.'</td>
                         <td >'.$progress.'</td>
                         <td >'.$score.'</td>
                         <td >'.$attendances_faults_avg.'</td>
@@ -829,7 +829,7 @@ 
                 <table class="table table-striped table-hover">
                 <thead>
                 <tr>
-                    <th><?php echo get_lang('LearningPath');?></th>
+                    <th><?php echo get_lang('LearningPath'); ?></th>
                     <th>
                         <?php
                         echo get_lang('Time').' ';
@@ -931,7 +931,7 @@ 
                     if (!empty($start_time)) {
                         $start_time = api_convert_and_format_date($start_time, DATE_TIME_FORMAT_LONG);
                     } else {
-                        $start_time =  '-';
+                        $start_time = '-';
                     }
 
                     if (!empty($total_time)) {
@@ -968,8 +968,8 @@ 
                     $csv_content[] = array(
                         api_html_entity_decode(stripslashes($lp_name), ENT_QUOTES, $charset),
                         api_time_to_hms($total_time),
-                        $score . '%',
-                        $score_latest . '%',
+                        $score.'%',
+                        $score_latest.'%',
                         $progress.'%',
                         $start_time
                     );
@@ -1008,7 +1008,7 @@ 
                     if ($any_result === true) {
                         $from = '';
                         if ($from_myspace) {
-                            $from ='&from=myspace';
+                            $from = '&from=myspace';
                         }
                         $link = Display::url(
                             Display::return_icon('2rightarrow.png', get_lang('Details')),
@@ -1021,14 +1021,14 @@ 
                         echo '<td>';
                         if ($any_result === true) {
                             echo '<a href="myStudents.php?action=reset_lp&sec_token='.$token.'&cidReq='.$course_code.'&course='.$course_code.'&details='.Security::remove_XSS($_GET['details']).'&origin='.$origin.'&lp_id='.$learnpath->getId().'&student='.$user_info['user_id'].'&details=true&id_session='.$sessionId.'">';
-                            echo Display::return_icon('clean.png', get_lang('Clean'),'',ICON_SIZE_SMALL).'</a>';
+                            echo Display::return_icon('clean.png', get_lang('Clean'), '', ICON_SIZE_SMALL).'</a>';
                             echo '</a>';
                         }
                         echo '</td>';
                         echo '</tr>';
                     }
                     $data_learnpath[$i][] = $lp_name;
-                    $data_learnpath[$i][] = $progress . '%';
+                    $data_learnpath[$i][] = $progress.'%';
                 }
                 ?>
                 </tbody>
@@ -1044,7 +1044,7 @@ 
         <thead>
         <tr>
             <th><?php echo get_lang('Exercises'); ?></th>
-            <th><?php echo get_lang('LearningPath');?></th>
+            <th><?php echo get_lang('LearningPath'); ?></th>
             <th><?php echo get_lang('AvgCourseScore').' '.Display :: return_icon('info3.gif', get_lang('AverageScore'), array('align' => 'absmiddle', 'hspace' => '3px')) ?></th>
             <th><?php echo get_lang('Attempts'); ?></th>
             <th><?php echo get_lang('LatestAttempt'); ?></th>
@@ -1063,7 +1063,7 @@ 
         );
 
         $t_quiz = Database :: get_course_table(TABLE_QUIZ_TEST);
-        $sql = "SELECT quiz.title, id FROM " . $t_quiz . " AS quiz
+        $sql = "SELECT quiz.title, id FROM ".$t_quiz." AS quiz
                 WHERE
                     quiz.c_id = ".$courseInfo['real_id']." AND
                     (quiz.session_id = $sessionId OR quiz.session_id = 0) AND
@@ -1128,7 +1128,7 @@ 
                 echo '<td>';
 
                 if ($count_attempts > 0) {
-                    echo $score_percentage . '%';
+                    echo $score_percentage.'%';
                 } else {
                     echo '-';
                     $score_percentage = 0;
@@ -1138,7 +1138,7 @@ 
                 echo '<td>'.$count_attempts.'</td>';
                 echo '<td>';
 
-                $sql = 'SELECT exe_id FROM ' . $tbl_stats_exercices . '
+                $sql = 'SELECT exe_id FROM '.$tbl_stats_exercices.'
                          WHERE
                             exe_exo_id = "'.$exercise_id.'" AND
                             exe_user_id ="'.$student_id.'" AND
@@ -1151,7 +1151,7 @@ 
                 if (Database :: num_rows($result_last_attempt) > 0) {
                     $id_last_attempt = Database :: result($result_last_attempt, 0, 0);
                     if ($count_attempts > 0)
-                        echo '<a href="../exercise/exercise_show.php?id=' . $id_last_attempt . '&cidReq='.$course_code.'&session_id='.$sessionId.'&student='.$student_id.'&origin='.(empty($origin)?'tracking':$origin).'">
+                        echo '<a href="../exercise/exercise_show.php?id='.$id_last_attempt.'&cidReq='.$course_code.'&session_id='.$sessionId.'&student='.$student_id.'&origin='.(empty($origin) ? 'tracking' : $origin).'">
                         '.Display::return_icon('quiz.gif').'
                      </a>';
                 }
@@ -1159,11 +1159,11 @@ 
 
                 echo '<td>';
                 $all_attempt_url = "../exercise/exercise_report.php?exerciseId=$exercise_id&cidReq=$course_code&filter_by_user=$student_id&id_session=$sessionId";
-                echo Display::url(Display::return_icon('test_results.png', get_lang('AllAttempts'), array(), ICON_SIZE_SMALL), $all_attempt_url );
+                echo Display::url(Display::return_icon('test_results.png', get_lang('AllAttempts'), array(), ICON_SIZE_SMALL), $all_attempt_url);
 
                 echo '</td></tr>';
                 $data_exercices[$i][] = $exercices['title'];
-                $data_exercices[$i][] = $score_percentage . '%';
+                $data_exercices[$i][] = $score_percentage.'%';
                 $data_exercices[$i][] = $count_attempts;
 
                 $csv_content[] = array(
@@ -1191,7 +1191,7 @@ 
             $survey_list = SurveyManager::get_surveys($course_code, $sessionId);
 
             $survey_data = array();
-            foreach($survey_list as $survey) {
+            foreach ($survey_list as $survey) {
                 $user_list = SurveyManager::get_people_who_filled_survey($survey['survey_id'], false, $courseInfo['real_id']);
                 $survey_done = Display::return_icon("accept_na.png", get_lang('NoAnswer'), array(), ICON_SIZE_SMALL);
                 if (in_array($student_id, $user_list)) {
@@ -1216,7 +1216,7 @@ 
                         $column = 0;
                         $table->setCellContents($row, $column, $data);
                         $class = 'class="row_odd"';
-                        if($row % 2) {
+                        if ($row % 2) {
                             $class = 'class="row_even"';
                         }
                         $table->setRowAttributes($row, $class, true);

main/exercise/live_stats.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 $result = $objExercise->read($exercise_id);
 
 if (!$result) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $interbreadcrumb[] = array(

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
 $url = api_get_path(WEB_AJAX_PATH).'exercise.ajax.php?a=get_live_stats&exercise_id='.$objExercise->id.'&minutes='.$minutes;
 
 //The order is important you need to check the the $column variable in the model.ajax.php file
-$columns        = array(get_lang('FirstName'), get_lang('LastName'), get_lang('Time'), get_lang('QuestionsAlreadyAnswered'), get_lang('Score'));
+$columns = array(get_lang('FirstName'), get_lang('LastName'), get_lang('Time'), get_lang('QuestionsAlreadyAnswered'), get_lang('Score'));
 
 //Column config
 $column_model = array(
@@ -93,15 +93,15 @@ 
 
 $(function() {
     <?php
-        echo Display::grid_js('live_stats',  $url, $columns, $column_model, $extra_params, array(), null, true);
+        echo Display::grid_js('live_stats', $url, $columns, $column_model, $extra_params, array(), null, true);
     ?>
     refreshGrid();
 });
 </script>
 <?php
 
-$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">' .
-    Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">'.
+    Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
 echo $actions = Display::div($actions, array('class'=> 'actions'));
 
 echo Display::grid_html('live_stats');

main/exercise/multiple_answer_combination.class.php

Indentation +4 added lines, -4 removed lines

@@ -178,9 +178,9 @@ 
     }
 
     /**
-	 * abstract function which creates the form to create/edit the answers of the question
-	 * @param FormValidator $form
-	 */
+     * abstract function which creates the form to create/edit the answers of the question
+     * @param FormValidator $form
+     */
     public function processAnswersCreation($form)
     {
         $questionWeighting = $nbrGoodAnswers = 0;
@@ -221,7 +221,7 @@ 
         // sets the total weighting of the question
         $this->updateWeighting($questionWeighting);
         $this->save();
-	}
+    }
 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {

Spacing +19 added lines, -19 removed lines

@@ -39,10 +39,10 @@ 
         $html = '<table class="table table-striped table-hover">';
         $html .= '<thead>';
         $html .= '<tr>';
-        $html .= '<th width="10">' . get_lang('Number') . '</th>';
-        $html .= '<th width="10">' . get_lang('True') . '</th>';
-        $html .= '<th width="50%">' . get_lang('Comment') . '</th>';
-        $html .= '<th width="50%">' . get_lang('Answer') . '</th>';
+        $html .= '<th width="10">'.get_lang('Number').'</th>';
+        $html .= '<th width="10">'.get_lang('True').'</th>';
+        $html .= '<th width="50%">'.get_lang('Comment').'</th>';
+        $html .= '<th width="50%">'.get_lang('Answer').'</th>';
         $html .= '</tr>';
         $html .= '</thead>';
         $html .= '<tbody>';
@@ -74,10 +74,10 @@ 
             $form->addHtml('<tr>');
 
             if (is_object($answer)) {
-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                $defaults['weighting[' . $i . ']'] = float_format($answer->weighting[$i], 1);
-                $defaults['correct[' . $i . ']'] = $answer->correct[$i];
+                $defaults['answer['.$i.']'] = $answer->answer[$i];
+                $defaults['comment['.$i.']'] = $answer->comment[$i];
+                $defaults['weighting['.$i.']'] = float_format($answer->weighting[$i], 1);
+                $defaults['correct['.$i.']'] = $answer->correct[$i];
             } else {
                 $defaults['answer[1]'] = get_lang('DefaultMultipleAnswer2');
                 $defaults['comment[1]'] = get_lang('DefaultMultipleComment2');
@@ -93,44 +93,44 @@ 
 
             $renderer->setElementTemplate(
                 '<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>',
-                'correct[' . $i . ']'
+                'correct['.$i.']'
             );
             $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.']'
             );
 
-            $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"');
+            $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');
             $answer_number->freeze();
 
             $form->addElement('checkbox',
-                'correct[' . $i . ']',
+                'correct['.$i.']',
                 null,
                 null,
                 'class="checkbox" style="margin-left: 0em;"'
             );
-            $boxes_names[] = 'correct[' . $i . ']';
+            $boxes_names[] = 'correct['.$i.']';
 
             $form->addElement(
                 'html_editor',
-                'answer[' . $i . ']',
+                'answer['.$i.']',
                 null,
                 array(),
                 array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
             );
-            $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
+            $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
             $form->addElement(
                 'html_editor',
-                'comment[' . $i . ']',
+                'comment['.$i.']',
                 null,
                 array(),
                 array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100')
@@ -226,7 +226,7 @@ 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="'.$this->question_table_class .'">
+        $header .= '<table class="'.$this->question_table_class.'">
             <tr>
                 <th>'.get_lang("Choice").'</th>
                 <th>'. get_lang("ExpectedChoice").'</th>

main/exercise/result.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 	api_not_allowed($show_headers);
 }
 
-$is_allowedToEdit = api_is_allowed_to_edit(null,true) || $is_courseTutor;
+$is_allowedToEdit = api_is_allowed_to_edit(null, true) || $is_courseTutor;
 
 //Getting results from the exe_id. This variable also contain all the information about the exercise
 $track_exercise_info = ExerciseLib::get_exercise_track_exercise_info($id);
@@ -53,8 +53,8 @@ 
     }
 }
 
-$htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
+$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
 
 if ($show_headers) {
     $interbreadcrumb[] = array(

Indentation +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     $htmlHeadXtra[] = '<style>
         body { background: none;}
     </style>';
-	Display::display_reduced_header();
+    Display::display_reduced_header();
 }
 
 $message = Session::read('attempt_remaining');

main/exercise/stats.php

Indentation +41 added lines, -41 removed lines

@@ -12,7 +12,7 @@ 
 $result = $objExercise->read($exercise_id);
 
 if (!$result) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $sessionId = api_get_session_id();
@@ -29,17 +29,17 @@ 
 $data = array();
 // Question title 	# of students who tool it 	Lowest score 	Average 	Highest score 	Maximum score
 $headers = array(
-	get_lang('Question'),
+    get_lang('Question'),
     get_lang('QuestionType'),
     get_lang('NumberStudentWhoSelectedIt'),
-	get_lang('LowestScore'),
-	get_lang('AverageScore'),
-	get_lang('HighestScore'),
-	get_lang('Weighting')
+    get_lang('LowestScore'),
+    get_lang('AverageScore'),
+    get_lang('HighestScore'),
+    get_lang('Weighting')
 );
 
 if (!empty($question_list)) {
-	foreach ($question_list as $question_id) {
+    foreach ($question_list as $question_id) {
         $question_obj = Question::read($question_id);
 
         $exercise_stats = ExerciseLib::get_student_stats_by_question(
@@ -73,7 +73,7 @@ 
         $data[$question_id]['average_score'] = round($exercise_stats['average'], 2);
         $data[$question_id]['highest_score'] = round($exercise_stats['max'], 2);
         $data[$question_id]['max_score'] = round($question_obj->weighting, 2);
-	}
+    }
 }
 
 // Format A table
@@ -81,37 +81,37 @@ 
 $row = 0;
 $column = 0;
 foreach ($headers as $header) {
-	$table->setHeaderContents($row, $column, $header);
-	$column++;
+    $table->setHeaderContents($row, $column, $header);
+    $column++;
 }
 $row++;
 foreach ($data as $row_table) {
-	$column = 0;
-	foreach ($row_table as $cell) {
-		$table->setCellContents($row, $column, $cell);
-		$table->updateCellAttributes($row, $column, 'align="center"');
-		$column++;
-	}
-	$table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
-	$row++;
+    $column = 0;
+    foreach ($row_table as $cell) {
+        $table->setCellContents($row, $column, $cell);
+        $table->updateCellAttributes($row, $column, 'align="center"');
+        $column++;
+    }
+    $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
+    $row++;
 }
 $content = $table->toHtml();
 
 // Format B
 
 $headers = array(
-	get_lang('Question'),
-	get_lang('Answer'),
-	get_lang('Correct'),
-	get_lang('NumberStudentWhoSelectedIt')
+    get_lang('Question'),
+    get_lang('Answer'),
+    get_lang('Correct'),
+    get_lang('NumberStudentWhoSelectedIt')
 );
 
 $data = array();
 
 if (!empty($question_list)) {
     $id = 0;
-	foreach ($question_list as $question_id) {
-		$question_obj = Question::read($question_id);
+    foreach ($question_list as $question_id) {
+        $question_obj = Question::read($question_id);
         $exercise_stats = ExerciseLib::get_student_stats_by_question(
             $question_id,
             $exercise_id,
@@ -120,7 +120,7 @@ 
         );
 
         $answer = new Answer($question_id);
-		$answer_count = $answer->selectNbrAnswers();
+        $answer_count = $answer->selectNbrAnswers();
 
         for ($answer_id = 1; $answer_id <= $answer_count; $answer_id++) {
             $answer_info = $answer->selectAnswer($answer_id);
@@ -175,11 +175,11 @@ 
                         $correct = '';
 
                         for ($i = 1; $i <= $answer_count; $i++) {
-                             $is_correct_i = $answer->isCorrect($i);
-                             if ($is_correct_i != 0 && $is_correct_i == $answer_id) {
-                                 $correct = $answer->selectAnswer($i);
-                                 break;
-                             }
+                                $is_correct_i = $answer->isCorrect($i);
+                                if ($is_correct_i != 0 && $is_correct_i == $answer_id) {
+                                    $correct = $answer->selectAnswer($i);
+                                    break;
+                                }
                         }
                         $data[$id]['answer'] = $correct;
                         $data[$id]['correct'] = $answer_info;
@@ -245,7 +245,7 @@ 
             }
             $id++;
         }
-	}
+    }
 }
 
 // Format A table
@@ -253,19 +253,19 @@ 
 $row = 0;
 $column = 0;
 foreach ($headers as $header) {
-	$table->setHeaderContents($row, $column, $header);
-	$column++;
+    $table->setHeaderContents($row, $column, $header);
+    $column++;
 }
 $row++;
 foreach ($data as $row_table) {
-	$column = 0;
-	foreach ($row_table as $cell) {
-		$table->setCellContents($row, $column, $cell);
-		$table->updateCellAttributes($row, $column, 'align="center"');
-		$column++;
-	}
-	$table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
-	$row++;
+    $column = 0;
+    foreach ($row_table as $cell) {
+        $table->setCellContents($row, $column, $cell);
+        $table->updateCellAttributes($row, $column, 'align="center"');
+        $column++;
+    }
+    $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
+    $row++;
 }
 $content .= $table->toHtml();
 

Spacing +16 added lines, -16 removed lines

@@ -61,13 +61,13 @@ 
         $data[$question_id]['type'] = $question_obj->get_question_type_name();
         $percentange = 0;
         if ($count_students) {
-            $percentange = $count_users / $count_students*100;
+            $percentange = $count_users / $count_students * 100;
         }
 
         $data[$question_id]['students_who_try_exercise'] = Display::bar_progress(
             $percentange,
             false,
-            $count_users .' / '.$count_students
+            $count_users.' / '.$count_students
         );
         $data[$question_id]['lowest_score'] = round($exercise_stats['min'], 2);
         $data[$question_id]['average_score'] = round($exercise_stats['average'], 2);
@@ -142,23 +142,23 @@ 
                         } else {
                             $data[$id]['name'] = '-';
                         }
-                        $data[$id]['answer'] 	= $answer_item;
+                        $data[$id]['answer'] = $answer_item;
 
                         $answer_item = api_substr($answer_item, 1);
-                        $answer_item = api_substr($answer_item, 0, api_strlen($answer_item) -1);
+                        $answer_item = api_substr($answer_item, 0, api_strlen($answer_item) - 1);
                         
-                        $data[$id]['answer'] 	= $answer_item;
+                        $data[$id]['answer'] = $answer_item;
 
-                        $data[$id]['correct'] 	= '-';
+                        $data[$id]['correct'] = '-';
 
                         $count = ExerciseLib::getNumberStudentsFillBlanksAnwserCount($question_id, $exercise_id);
                         $count = $count[$counter];
                         
                         $percentange = 0;
                         if (!empty($count_students)) {
-                            $percentange = $count/$count_students*100;
+                            $percentange = $count / $count_students * 100;
                         }
-                        $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
+                        $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students);
                         $id++;
                         $counter++;
                     }
@@ -194,9 +194,9 @@ 
                         );
                         $percentange = 0;
                         if (!empty($count_students)) {
-                            $percentange = $count/$count_students*100;
+                            $percentange = $count / $count_students * 100;
                         }
-                        $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
+                        $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students);
                     }
                     break;
                 case HOT_SPOT:
@@ -217,9 +217,9 @@ 
                     );
                     $percentange = 0;
                     if (!empty($count_students)) {
-                        $percentange = $count/$count_students*100;
+                        $percentange = $count / $count_students * 100;
                     }
-                    $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
+                    $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students);
                     break;
                 default:
                     if ($answer_id == 1) {
@@ -239,9 +239,9 @@ 
                     );
                     $percentange = 0;
                     if (!empty($count_students)) {
-                        $percentange = $count/$count_students*100;
+                        $percentange = $count / $count_students * 100;
                     }
-                    $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count .' / '.$count_students);
+                    $data[$id]['attempts'] = Display::bar_progress($percentange, false, $count.' / '.$count_students);
             }
             $id++;
         }
@@ -273,8 +273,8 @@ 
 $interbreadcrumb[] = array("url" => "admin.php?exerciseId=$exercise_id&".api_get_cidreq(), "name" => $objExercise->name);
 
 $tpl = new Template(get_lang('ReportByQuestion'));
-$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">' .
-    Display :: return_icon('back.png', get_lang('GoBackToQuestionList'),'',ICON_SIZE_MEDIUM).'</a>';
+$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">'.
+    Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
 $actions = Display::div($actions, array('class'=> 'actions'));
 $content = $actions.$content;
 $tpl->assign('content', $content);

main/exercise/global_multiple_answer.class.php

Spacing +24 added lines, -24 removed lines

@@ -34,20 +34,20 @@ 
         $html = '<table class="data_table">
                 <tr>
                     <th width="10px">
-                        ' . get_lang('Number') . '
+                        ' . get_lang('Number').'
                     </th>
                     <th width="10px">
-                        ' . get_lang('True') . '
+                        ' . get_lang('True').'
                     </th>
                     <th width="50%">
-                        ' . get_lang('Answer') . '
+                        ' . get_lang('Answer').'
                     </th>';
 
-        $html .='<th>' . get_lang('Comment') . '</th>';
-        $html .='</tr>';
+        $html .= '<th>'.get_lang('Comment').'</th>';
+        $html .= '</tr>';
         $form->addElement(
             'label',
-            get_lang('Answers') .
+            get_lang('Answers').
             '<br /> '.Display::return_icon('fill_field.png'),
             $html
         );
@@ -82,9 +82,9 @@ 
         for ($i = 1; $i <= $nb_answers; ++$i) {
             /* si la reponse est de type objet */
             if (is_object($answer)) {
-                $defaults['answer[' . $i . ']'] = $answer->answer[$i];
-                $defaults['comment[' . $i . ']'] = $answer->comment[$i];
-                $defaults['correct[' . $i . ']'] = $answer->correct[$i];
+                $defaults['answer['.$i.']'] = $answer->answer[$i];
+                $defaults['comment['.$i.']'] = $answer->comment[$i];
+                $defaults['correct['.$i.']'] = $answer->correct[$i];
 
                 // start
                 $scoreA = $answer->weighting[$i];
@@ -106,16 +106,16 @@ 
             $renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'comment['.$i.']');
             //$renderer->setElementTemplate('<td><!-- BEGIN error --><span class="form_error">{error}</span><!-- END error --><br/>{element}</td>', 'weighting['.$i.']');
 
-            $answer_number = $form->addElement('text', 'counter[' . $i . ']', null, 'value="' . $i . '"');
+            $answer_number = $form->addElement('text', 'counter['.$i.']', null, 'value="'.$i.'"');
             $answer_number->freeze();
 
-            $form->addElement('checkbox', 'correct[' . $i . ']', null, null, 'class="checkbox"');
-            $boxes_names[] = 'correct[' . $i . ']';
+            $form->addElement('checkbox', 'correct['.$i.']', null, null, 'class="checkbox"');
+            $boxes_names[] = 'correct['.$i.']';
 
-            $form->addElement('html_editor', 'answer[' . $i . ']', null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
-            $form->addRule('answer[' . $i . ']', get_lang('ThisFieldIsRequired'), 'required');
+            $form->addElement('html_editor', 'answer['.$i.']', null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addRule('answer['.$i.']', get_lang('ThisFieldIsRequired'), 'required');
 
-            $form->addElement('html_editor', 'comment[' . $i . ']', null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
+            $form->addElement('html_editor', 'comment['.$i.']', null, array(), array('ToolbarSet' => 'TestProposedAnswer', 'Width' => '100%', 'Height' => '100'));
 
             $form->addElement('html', '</tr>');
         }
@@ -181,7 +181,7 @@ 
         // Reponses correctes
         $nbr_corrects = 0;
         for ($i = 1; $i <= $nb_answers; $i++) {
-            $goodAnswer = trim($form->getSubmitValue('correct[' . $i . ']'));
+            $goodAnswer = trim($form->getSubmitValue('correct['.$i.']'));
             if ($goodAnswer) {
                 $nbr_corrects++;
             }
@@ -200,9 +200,9 @@ 
         $test = $form->getSubmitValue('pts');
 
         for ($i = 1; $i <= $nb_answers; $i++) {
-            $answer = trim($form->getSubmitValue('answer[' . $i . ']'));
-            $comment = trim($form->getSubmitValue('comment[' . $i . ']'));
-            $goodAnswer = trim($form->getSubmitValue('correct[' . $i . ']'));
+            $answer = trim($form->getSubmitValue('answer['.$i.']'));
+            $comment = trim($form->getSubmitValue('comment['.$i.']'));
+            $goodAnswer = trim($form->getSubmitValue('correct['.$i.']'));
 
             if ($goodAnswer) {
                 $weighting = abs($answer_score);
@@ -230,12 +230,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;

main/exercise/hotspot_actionscript_admin.as.php

Indentation +4 added lines, -4 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
 
 api_protect_course_script(false);
 
-$isAllowedToEdit = api_is_allowed_to_edit(null,true);
+$isAllowedToEdit = api_is_allowed_to_edit(null, true);
 
 if (!$isAllowedToEdit) {
     api_not_allowed(true);
@@ -22,7 +22,7 @@ 
 $objQuestion = Question::read($questionId);
 $_course = api_get_course_info();
 
-$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 
 $picturePath = $documentPath.'/images';
 $pictureName = $objQuestion->selectPicture();
@@ -65,13 +65,13 @@ 
 $answers = $_SESSION['tmp_answers'];
 $nbrAnswers = count($answers['answer']);
 
-for ($i=1;$i <= $nbrAnswers; $i++) {
+for ($i = 1; $i <= $nbrAnswers; $i++) {
     $hotSpot = [];
     $hotSpot['id'] = null;
-    $hotSpot['answer']= $answers['answer'][$i];
+    $hotSpot['answer'] = $answers['answer'][$i];
 
     if ($answer_type == HOT_SPOT_DELINEATION) {
-        if ($i==1) {
+        if ($i == 1) {
             $hotSpot['type'] = 'delineation';
         } else {
             $hotSpot['type'] = 'oar';