chamilo / chamilo-lms

main/exercice/export/qti2/qti2_classes.php

Indentation +138 added lines, -138 removed lines

@@ -55,18 +55,18 @@ 
 
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
 
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 }
 /**
- * Class
- * @package chamilo.exercise
- */
+     * Class
+     * @package chamilo.exercise
+     */
 class ImsAnswerMultipleChoice extends Answer
 {
     /**
@@ -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 '';
     }
 }

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

Indentation +12 added lines, -12 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * Library for the import of Aiken format
- * @author claro team <cvs@claroline.net>
- * @author Guillaume Lederer <guillaume@claroline.net>
- * @author César Perales <cesar.perales@gmail.com> Parse function for Aiken format
- * @package chamilo.exercise
- */
+     * Library for the import of Aiken format
+     * @author claro team <cvs@claroline.net>
+     * @author Guillaume Lederer <guillaume@claroline.net>
+     * @author César Perales <cesar.perales@gmail.com> Parse function for Aiken format
+     * @package chamilo.exercise
+     */
 /**
- * Security check
- */
+     * Security check
+     */
 if (count(get_included_files()) == 1)
     die('---');
 
@@ -78,9 +78,9 @@ 
     }
 }
 /**
- * Main function to import the Aiken exercise
- * @return mixed True on success, error message on failure
- */
+     * Main function to import the Aiken exercise
+     * @return mixed True on success, error message on failure
+     */
 function aiken_import_exercise($file)
 {
     global $exercise_info;
@@ -281,7 +281,7 @@ 
             $correct_answer_index = array_search($matches[1], $answers_array);
             $exercise_info['question'][$question_index]['title'] = $matches[1];
         } elseif (preg_match('/^TAGS:\s?([A-Z])\s?/', $info, $matches)) {
-             //TAGS for chamilo >= 1.10
+                //TAGS for chamilo >= 1.10
             $exercise_info['question'][$question_index]['answer_tags'] = explode(',', $matches[1]);
         } elseif (preg_match('/^ETIQUETAS:\s?([A-Z])\s?/', $info, $matches)) {
             //TAGS for chamilo >= 1.10 (Spanish e-ducativa format)

main/exercice/export/aiken/aiken_classes.php

Indentation +11 added lines, -11 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @author Claro Team <cvs@claroline.net>
- * @author Yannick Warnier <yannick.warnier@beeznest.com> - updated ImsAnswerHotspot to match QTI norms
- * @author César Perales <cesar.perales@gmail.com> Updated function names and import files for Aiken format support
- * @package chamilo.exercise
- */
+     * @author Claro Team <cvs@claroline.net>
+     * @author Yannick Warnier <yannick.warnier@beeznest.com> - updated ImsAnswerHotspot to match QTI norms
+     * @author César Perales <cesar.perales@gmail.com> Updated function names and import files for Aiken format support
+     * @package chamilo.exercise
+     */
 
 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);
-	}
+    function mime_content_type($filename) {
+        return DocumentManager::file_get_mime_type((string)$filename);
+    }
 }
 
 /**
@@ -29,7 +29,7 @@ 
         {
             case MCUA :
                 $answer = new AikenAnswerMultipleChoice($this->id);
-            	return $answer;
+                return $answer;
             default :
                 $answer = null;
                 break;
@@ -38,11 +38,11 @@ 
     }
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 }
 

main/exercice/export/scorm/scorm_classes.php

Indentation +424 added lines, -424 removed lines

@@ -49,86 +49,86 @@ 
     }
 
     /**
-	 * Include the correct answer class and create answer
-	 */
-	public function setAnswer()
-	{
-		switch ($this->type) {
-			case MCUA:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
+     * Include the correct answer class and create answer
+     */
+    public function setAnswer()
+    {
+        switch ($this->type) {
+            case MCUA:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case MCMA:
+                break;
+            case MCMA:
             case GLOBAL_MULTIPLE_ANSWER:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case TF:
-				$this->answer = new ScormAnswerTrueFalse($this->id);
+                break;
+            case TF:
+                $this->answer = new ScormAnswerTrueFalse($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case FIB:
-				$this->answer = new ScormAnswerFillInBlanks($this->id);
+                break;
+            case FIB:
+                $this->answer = new ScormAnswerFillInBlanks($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case MATCHING:
+                break;
+            case MATCHING:
             case MATCHING_DRAGGABLE:
-				$this->answer = new ScormAnswerMatching($this->id);
+                $this->answer = new ScormAnswerMatching($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
+                break;
             case ORAL_EXPRESSION:
-			case FREE_ANSWER:
-				$this->answer = new ScormAnswerFree($this->id);
+            case FREE_ANSWER:
+                $this->answer = new ScormAnswerFree($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT:
-				$this->answer = new ScormAnswerHotspot($this->id);
+                break;
+            case HOT_SPOT:
+                $this->answer = new ScormAnswerHotspot($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case MULTIPLE_ANSWER_COMBINATION:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
+                break;
+            case MULTIPLE_ANSWER_COMBINATION:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
+                break;
             case HOT_SPOT_ORDER:
-				$this->answer = new ScormAnswerHotspot($this->id);
+                $this->answer = new ScormAnswerHotspot($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT_DELINEATION:
-				$this->answer = new ScormAnswerHotspot($this->id);
+                break;
+            case HOT_SPOT_DELINEATION:
+                $this->answer = new ScormAnswerHotspot($this->id);
                 $this->answer->questionJSId = $this->js_id;
-				break;
-			default :
-				$this->answer = null;
+                break;
+            default :
+                $this->answer = null;
                 $this->answer->questionJSId = $this->js_id;
-				break;
-		}
+                break;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	function export()
-	{
-		$html = $this->getQuestionHTML();
-		$js   = $this->getQuestionJS();
+    function export()
+    {
+        $html = $this->getQuestionHTML();
+        $js   = $this->getQuestionJS();
 
-		if( is_object($this->answer) )
-		{
-			list($js2,$html2) = $this->answer->export();
-			$js .= $js2;
-			$html .= $html2;
-		}
+        if( is_object($this->answer) )
+        {
+            list($js2,$html2) = $this->answer->export();
+            $js .= $js2;
+            $html .= $html2;
+        }
 
-		return array($js,$html);
-	}
+        return array($js,$html);
+    }
 
     function createAnswersForm($form)
     {
-    	return true;
+        return true;
     }
 
     function processAnswersCreation($form)
     {
-    	return true;
+        return true;
     }
 
     /**
@@ -136,20 +136,20 @@ 
      */
     function getQuestionHTML()
     {
-    	$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" .
-		   	$title.
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n" .
-		   	'<tr>' . "\n" .
-		   	'<td valign="top" colspan="'.$cols.'">' . "\n" .
-		   	'<i>'.$description.'</i>' . "\n" .
-		   	'</td>' . "\n" .
-		   	'</tr>' . "\n";
-		return $s;
+        $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" .
+                $title.
+                '</td>' . "\n" .
+                '</tr>' . "\n" .
+                '<tr>' . "\n" .
+                '<td valign="top" colspan="'.$cols.'">' . "\n" .
+                '<i>'.$description.'</i>' . "\n" .
+                '</td>' . "\n" .
+                '</tr>' . "\n";
+        return $s;
     }
 
     /**
@@ -157,16 +157,16 @@ 
      */
     function getQuestionJS()
     {
-    	//$id = $this->id;
-    	$w = $this->selectWeighting();
-    	$s = 'questions.push('.$this->js_id.');'."\n";
-    	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;
-    	}
-    	$s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
-    	return $s;
+        //$id = $this->id;
+        $w = $this->selectWeighting();
+        $s = 'questions.push('.$this->js_id.');'."\n";
+        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;
+        }
+        $s .= 'questions_score_max['.$this->js_id.'] = '.$w.";\n";
+        return $s;
     }
 }
 
@@ -177,107 +177,107 @@ 
  */
 class ScormAnswerMultipleChoice extends Answer
 {
-	/**
-	 * Return HTML code for possible answers
+    /**
+     * Return HTML code for possible answers
      */
-	function export()
-	{
-		$html = '';
-    	$js   = '';
-    	$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
+    function export()
+    {
+        $html = '';
+        $js   = '';
+        $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 ) {
-        	//$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
-        	$id = 1;
-        	$jstmp = '';
-        	$jstmpc = '';
-			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";
-		    	$jstmp .= $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";
-	    	if ($type == MCMA) {
-	    		$js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
-	    	} else {
-	    		$js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
-	    	}
-	    	$js .= $jstmpw;
+        if ($type == MCMA ) {
+            //$questionTypeLang = get_lang('MultipleChoiceMultipleAnswers');
+            $id = 1;
+            $jstmp = '';
+            $jstmpc = '';
+            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";
+                $jstmp .= $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";
+            if ($type == MCMA) {
+                $js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
+            } else {
+                $js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
+            }
+            $js .= $jstmpw;
         } elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
-        		//To this items we show the ThisItemIsNotExportable
-        	    $qId = $this->questionJSId;
-		    	$js = '';
-		    	$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";
-				// 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";
-		    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-		    	$js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
-				$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-		    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-		    	$js .= $jstmpw;
-		        return array($js,$html);
+                //To this items we show the ThisItemIsNotExportable
+                $qId = $this->questionJSId;
+                $js = '';
+                $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";
+                // 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";
+                $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+                $js .= 'questions_types['.$this->questionJSId.'] = \'exact\';'."\n";
+                $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+                $js .= $jstmpw;
+                return array($js,$html);
         } else {
-        	//$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
-        	$id = 1;
-        	$jstmp = '';
-        	$jstmpc = '';
-			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";
-		    	$jstmp .= $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.'] = '.$jstmpc.';'."\n";
-	    	$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
-			$js .= $jstmpw;
+            //$questionTypeLang = get_lang('MultipleChoiceUniqueAnswer');
+            $id = 1;
+            $jstmp = '';
+            $jstmpc = '';
+            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";
+                $jstmp .= $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.'] = '.$jstmpc.';'."\n";
+            $js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';'."\n";
+            $js .= $jstmpw;
         }
-		$html .= '</table></td></tr>' . "\n";
+        $html .= '</table></td></tr>' . "\n";
         return array($js,$html);
     }
 }
@@ -288,7 +288,7 @@ 
  */
 class ScormAnswerTrueFalse extends Answer
 {
-	/**
+    /**
      * Return the XML flow for the possible answers.
      * That's one <response_lid>, containing several <flow_label>
      *
@@ -296,46 +296,46 @@ 
      */
     function export()
     {
-    	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">';
-		$identifier = 'question_'.$this->questionJSId.'_tf';
-		$identifier_true  = $identifier.'_true';
-		$identifier_false = $identifier.'_false';
-		$html .=
-    		'<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";
-    	$html .=
-			'<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";
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
-		if($this->response == 'TRUE')
-		{
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
-		}
-		else
-		{
-	    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
-		}
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
-    	$js .= $jstmpw;
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">';
+        $identifier = 'question_'.$this->questionJSId.'_tf';
+        $identifier_true  = $identifier.'_true';
+        $identifier_false = $identifier.'_false';
+        $html .=
+            '<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";
+        $html .=
+            '<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";
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array(\'true\',\'false\');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'tf\';'."\n";
+        if($this->response == 'TRUE')
+        {
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'true\');'."\n";
+        }
+        else
+        {
+            $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array(\'false\');'."\n";
+        }
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = '.$this->weighting[1].";\n";
+        $js .= $jstmpw;
 
         return array($js,$html);
     }
@@ -347,7 +347,7 @@ 
  */
 class ScormAnswerFillInBlanks extends Answer
 {
-	/**
+    /**
      * Export the text with missing words.
      *
      * As a side effect, it stores two lists in the class :
@@ -355,57 +355,57 @@ 
      */
     function export()
     {
-    	global $charset;
-    	$js = '';
-    	$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) {
-			$blankList[] = '['.$answer.']';
-		}
-		$answerCount = count($blankList);
-
-		// splits text and weightings that are joined with the character '::'
-		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;
-		$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);
-			$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];
-				} else {
-					$weight_db=$my_weight[0];
-				}
-	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
-			$i++;
-			$startlocations=api_strpos($answer,'[');
-			$endlocations=api_strpos($answer,']');
-		}
+        global $charset;
+        $js = '';
+        $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) {
+            $blankList[] = '['.$answer.']';
+        }
+        $answerCount = count($blankList);
+
+        // splits text and weightings that are joined with the character '::'
+        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;
+        $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);
+            $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];
+                } else {
+                    $weight_db=$my_weight[0];
+                }
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
+            $i++;
+            $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";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
-    	$js .= $jstmpw;
+        $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);
     }
 }
@@ -416,101 +416,101 @@ 
  */
 class ScormAnswerMatching extends Answer
 {
-	/**
+    /**
      * Export the question part as a matrix-choice, with only one possible answer per line.
      * @author Amand Tihon <amand@alrj.org>
      */
     function export()
     {
-    	$js = '';
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-  		// prepare list of right proposition to allow
-		// - easiest display
-		// - easiest randomisation if needed one day
-		// (here I use array_values to change array keys from $code1 $code2 ... to 0 1 ...)
-		if (is_array($this->rightList)) {
-			$displayedRightList = array_values($this->rightList);
-		}
-		// get max length of displayed array
-		$arrayLength = max( count($this->leftList), count($this->rightList) );
-
-		$nbrAnswers=$this->selectNbrAnswers();
-		$cpt1='A';
-		$cpt2=1;
-		$Select=array();
-		$qId = $this->questionJSId;
-		$s = '';
-		$jstmp = '';
-		$jstmpc = '';
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">' . "\n";
+            // prepare list of right proposition to allow
+        // - easiest display
+        // - easiest randomisation if needed one day
+        // (here I use array_values to change array keys from $code1 $code2 ... to 0 1 ...)
+        if (is_array($this->rightList)) {
+            $displayedRightList = array_values($this->rightList);
+        }
+        // get max length of displayed array
+        $arrayLength = max( count($this->leftList), count($this->rightList) );
+
+        $nbrAnswers=$this->selectNbrAnswers();
+        $cpt1='A';
+        $cpt2=1;
+        $Select=array();
+        $qId = $this->questionJSId;
+        $s = '';
+        $jstmp = '';
+        $jstmpc = '';
         $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
         $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
 
-		for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
-			$identifier = 'question_'.$qId.'_matching_';
-			$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;
-				// 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>';
-	            // fills the list-box
-	            foreach($Select as $key=>$val)
-	            {
-					$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";
-
-				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
-
-				$my_weight=explode('@',$weight);
-				if (count($my_weight)==2) {
-					$weight=$my_weight[0];
-				} else {
-					$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 there remain answers to be shown on the right side
-					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";
-						$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_types['.$this->questionJSId.'] = \'matching\';'."\n";
-    	$js .= $jstmpw;
-		$html .= $s;
-		$html .= '</table></td></tr>' . "\n";
+        for($answerId=1;$answerId <= $nbrAnswers;$answerId++) {
+            $identifier = 'question_'.$qId.'_matching_';
+            $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;
+                // 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>';
+                // fills the list-box
+                foreach($Select as $key=>$val)
+                {
+                    $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";
+
+                $jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
+
+                $my_weight=explode('@',$weight);
+                if (count($my_weight)==2) {
+                    $weight=$my_weight[0];
+                } else {
+                    $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 there remain answers to be shown on the right side
+                    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";
+                        $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_types['.$this->questionJSId.'] = \'matching\';'."\n";
+        $js .= $jstmpw;
+        $html .= $s;
+        $html .= '</table></td></tr>' . "\n";
 
         return array($js,$html);
     }
@@ -522,7 +522,7 @@ 
  */
 class ScormAnswerFree extends Answer
 {
-	/**
+    /**
      * Export the text with missing words.
      *
      * As a side effect, it stores two lists in the class :
@@ -531,67 +531,67 @@ 
      */
     function export()
     {
-    	//$qId = $this->questionJSId;
-    	$js = '';
-    	/*$html = '<tr><td colspan="2"><table width="100%">' . "\n";
+        //$qId = $this->questionJSId;
+        $js = '';
+        /*$html = '<tr><td colspan="2"><table width="100%">' . "\n";
 		// some javascript must be added for that kind of questions
 		$html .= '<tr><td>
 		    	<textarea name="question_'.$qId.'_free" id="question_'.$qId.'_free" rows="20" cols="100"></textarea>
 		    	</td>
                 </tr>';
 		$html .= '</table></td></tr>';*/
-		// currently the free 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";
-    	$js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-    	$js .= 'questions_types['.$this->questionJSId.'] = \'free\';'."\n";
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-    	$js .= $jstmpw;
+        // currently the free 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";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'free\';'."\n";
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+        $js .= $jstmpw;
         return array($js,$html);
     }
 }
 /**
- * This class handles the SCORM export of hotpot questions
- * @package chamilo.exercise.scorm
- */
+     * This class handles the SCORM export of hotpot questions
+     * @package chamilo.exercise.scorm
+     */
 class ScormAnswerHotspot extends Answer
 {
-	/**
-	 * Returns the javascript code that goes with HotSpot exercises
-	 * @return string	The JavaScript code
-	 */
-	function get_js_header()
-	{
-		if ($this->standalone) {
-			$header = '<script type="text/javascript" language="javascript">';
-			$header .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
-			$header .= '</script>';
-			//because this header closes so many times the <script> tag, we have to reopen our own
-			$header .= '<script type="text/javascript" language="javascript">'."\n";
-			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
-			$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
-	    	$header .= $jstmpw;
-		}
-		else
-		{
-			$header = '';
-			$header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
-    		$header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
-			$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
-			$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
-	    	$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'."\n";
-	    	$header .= $jstmpw;
-		}
-		return $header;
-	}
-	/**
+    /**
+     * Returns the javascript code that goes with HotSpot exercises
+     * @return string	The JavaScript code
+     */
+    function get_js_header()
+    {
+        if ($this->standalone) {
+            $header = '<script type="text/javascript" language="javascript">';
+            $header .= file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
+            $header .= '</script>';
+            //because this header closes so many times the <script> tag, we have to reopen our own
+            $header .= '<script type="text/javascript" language="javascript">'."\n";
+            $header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
+            $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'.";\n";
+            $header .= $jstmpw;
+        }
+        else
+        {
+            $header = '';
+            $header .= 'questions_answers['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();'."\n";
+            $header .= 'questions_types['.$this->questionJSId.'] = \'hotspot\';'."\n";
+            $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;'."\n";
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][1] = 0;'."\n";
+            $header .= $jstmpw;
+        }
+        return $header;
+    }
+    /**
      * Export the text with missing words.
      *
      * As a side effect, it stores two lists in the class :
@@ -600,22 +600,22 @@ 
      */
     function export()
     {
-    	$js = $this->get_js_header();
-    	$html = '<tr><td colspan="2"><table width="100%">' . "\n";
-		// some javascript must be added for that kind of questions
-		$html .= '';
+        $js = $this->get_js_header();
+        $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();
+        // Get the answers, make a list
+        $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++)
-		{
-			$answer_list .= '<li>'.$this->selectAnswer($answerId).'</li>';
-		}
-		$answer_list .= '</ol></div>';
+        $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++)
+        {
+            $answer_list .= '<li>'.$this->selectAnswer($answerId).'</li>';
+        }
+        $answer_list .= '</ol></div>';
 
-		/*
+        /*
 		if(!$onlyAnswers)
 		{
 			$s="<tr>
@@ -633,11 +633,11 @@ 
 		}
 		*/
 
-		//$canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
-		$canClick = true;
-		//$tes = isset($_GET['modifyAnswers']) ? '0' : '1';
-		//echo $tes;
-		$relPath = api_get_path(REL_PATH);
+        //$canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
+        $canClick = true;
+        //$tes = isset($_GET['modifyAnswers']) ? '0' : '1';
+        //echo $tes;
+        $relPath = api_get_path(REL_PATH);
         $html .= <<<HTML
             <tr>
                 <td>
@@ -658,10 +658,10 @@ 
                 </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>';
+        // 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);
     }
 }

main/exercice/unique_answer.class.php

Indentation +1 added lines, -1 removed lines

@@ -447,7 +447,7 @@
         $position = $row_max->max_position + 1;
 
         // Insert a new answer
-       $params = [
+        $params = [
             'c_id' => $course_id,
             'id' => $id,
             'question_id' => $question_id,

main/exercice/hotspot_actionscript.as.php

Indentation +27 added lines, -27 removed lines

@@ -30,10 +30,10 @@ 
 
 // Query db for answers
 if ($answer_type==HOT_SPOT_DELINEATION) {
-	$sql = "SELECT id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
+    $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 {
-	$sql = "SELECT id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
+    $sql = "SELECT id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
 	        WHERE c_id = $course_id AND question_id = ".intval($questionId)." ORDER BY id";
 }
 $result = Database::query($sql);
@@ -74,37 +74,37 @@ 
     $hotSpot['id'] = $hotspot['id'];
     $hotSpot['answer'] = $hotspot['answer'];
 
-	// Square or rectancle
-	if ($hotspot['hotspot_type'] == 'square' )
-	{
+    // Square or rectancle
+    if ($hotspot['hotspot_type'] == 'square' )
+    {
         $hotSpot['type'] = 'square';
-	}
-	// Circle or ovale
-	if ($hotspot['hotspot_type'] == 'circle')
-	{
+    }
+    // Circle or ovale
+    if ($hotspot['hotspot_type'] == 'circle')
+    {
         $hotSpot['type'] = 'circle';
-	}
-	// Polygon
-	if ($hotspot['hotspot_type'] == 'poly')
-	{
+    }
+    // Polygon
+    if ($hotspot['hotspot_type'] == 'poly')
+    {
         $hotSpot['type'] = 'poly';
-	}
-	// Delineation
-	if ($hotspot['hotspot_type'] == 'delineation')
-	{
+    }
+    // Delineation
+    if ($hotspot['hotspot_type'] == 'delineation')
+    {
         $hotSpot['type'] = 'delineation';
-	}
-	// No error
-	if ($hotspot['hotspot_type'] == 'noerror')
-	{
+    }
+    // No error
+    if ($hotspot['hotspot_type'] == 'noerror')
+    {
         $hotSpot['type'] = 'noerror';
-	}
+    }
 
-	// This is a good answer, count + 1 for nmbr of clicks
-	if ($hotspot['hotspot_type'] > 0)
-	{
-		$nmbrTries++;
-	}
+    // This is a good answer, count + 1 for nmbr of clicks
+    if ($hotspot['hotspot_type'] > 0)
+    {
+        $nmbrTries++;
+    }
 
     $hotSpot['coord'] = $hotspot['hotspot_coordinates'];
 

main/exercice/hotpotatoes_exercise_result.class.php

Indentation +136 added lines, -136 removed lines

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

main/exercice/hotspot_actionscript_admin.as.php

Indentation +4 added lines, -4 removed lines

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

main/exercice/result.php

Indentation +7 added lines, -7 removed lines

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