chamilo / chamilo-lms

main/exercise/result.php

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/export/scorm/scorm_classes.php

Indentation +773 added lines, -773 removed lines

@@ -20,140 +20,140 @@ 
 {
     public $js_id;
     public $answer;
-	/**
-	 * Returns the HTML + JS flow corresponding to one question
-	 *
-	 * @param int $questionId The question ID
-	 * @param bool $standalone (ie including XML tag, DTD declaration, etc)
-	 * @param int  $js_id The JavaScript ID for this question.
-	 * Due to the nature of interactions, we must have a natural sequence for
-	 * questions in the generated JavaScript.
-	 * @param integer $js_id
+    /**
+     * Returns the HTML + JS flow corresponding to one question
+     *
+     * @param int $questionId The question ID
+     * @param bool $standalone (ie including XML tag, DTD declaration, etc)
+     * @param int  $js_id The JavaScript ID for this question.
+     * Due to the nature of interactions, we must have a natural sequence for
+     * questions in the generated JavaScript.
+     * @param integer $js_id
      * @return string|array
-	 */
-	public static function export_question($questionId, $standalone = true, $js_id)
-	{
-		$question = new ScormQuestion();
-		$qst = $question->read($questionId);
-		if (!$qst) {
-			return '';
-		}
-		$question->id = $qst->id;
-		$question->js_id = $js_id;
-		$question->type = $qst->type;
-		$question->question = $qst->question;
-		$question->description = $qst->description;
-		$question->weighting=$qst->weighting;
-		$question->position=$qst->position;
-		$question->picture=$qst->picture;
-		$assessmentItem = new ScormAssessmentItem($question, $standalone);
-
-		return $assessmentItem->export();
-	}
-
-	/**
-	 * 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:
-			case GLOBAL_MULTIPLE_ANSWER:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
-				$this->answer->questionJSId = $this->js_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);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case MATCHING:
-			case MATCHING_DRAGGABLE:
-			case DRAGGABLE:
-				$this->answer = new ScormAnswerMatching($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case ORAL_EXPRESSION:
-			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);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case MULTIPLE_ANSWER_COMBINATION:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT_ORDER:
-				$this->answer = new ScormAnswerHotspot($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			case HOT_SPOT_DELINEATION:
-				$this->answer = new ScormAnswerHotspot($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			// not supported
-			case UNIQUE_ANSWER_NO_OPTION:
-			case MULTIPLE_ANSWER_TRUE_FALSE:
-			case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
-			case UNIQUE_ANSWER_IMAGE:
-			case CALCULATED_ANSWER:
-				$this->answer = new ScormAnswerMultipleChoice($this->id);
-				$this->answer->questionJSId = $this->js_id;
-				break;
-			default:
-				$this->answer = new stdClass();
-				$this->answer->questionJSId = $this->js_id;
-				break;
-		}
-
-		return true;
-	}
-
-	function export()
-	{
-		$html = $this->getQuestionHTML();
-		$js = $this->getQuestionJS();
-
-		if (is_object($this->answer) && $this->answer instanceof Answer) {
-			list($js2, $html2) = $this->answer->export();
-			$js .= $js2;
-			$html .= $html2;
-		} else {
-			throw new \Exception('Question not supported. Exercise: '.$this->selectTitle());
-		}
-
-		return array($js, $html);
-	}
-
-	function createAnswersForm($form)
-	{
-		return true;
-	}
-
-	function processAnswersCreation($form)
-	{
-		return true;
-	}
-
-	/**
-	 * Returns an HTML-formatted question
-	 */
-	function getQuestionHTML()
-	{
+     */
+    public static function export_question($questionId, $standalone = true, $js_id)
+    {
+        $question = new ScormQuestion();
+        $qst = $question->read($questionId);
+        if (!$qst) {
+            return '';
+        }
+        $question->id = $qst->id;
+        $question->js_id = $js_id;
+        $question->type = $qst->type;
+        $question->question = $qst->question;
+        $question->description = $qst->description;
+        $question->weighting=$qst->weighting;
+        $question->position=$qst->position;
+        $question->picture=$qst->picture;
+        $assessmentItem = new ScormAssessmentItem($question, $standalone);
+
+        return $assessmentItem->export();
+    }
+
+    /**
+     * 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:
+            case GLOBAL_MULTIPLE_ANSWER:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer->questionJSId = $this->js_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);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case MATCHING:
+            case MATCHING_DRAGGABLE:
+            case DRAGGABLE:
+                $this->answer = new ScormAnswerMatching($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case ORAL_EXPRESSION:
+            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);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case MULTIPLE_ANSWER_COMBINATION:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case HOT_SPOT_ORDER:
+                $this->answer = new ScormAnswerHotspot($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            case HOT_SPOT_DELINEATION:
+                $this->answer = new ScormAnswerHotspot($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            // not supported
+            case UNIQUE_ANSWER_NO_OPTION:
+            case MULTIPLE_ANSWER_TRUE_FALSE:
+            case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
+            case UNIQUE_ANSWER_IMAGE:
+            case CALCULATED_ANSWER:
+                $this->answer = new ScormAnswerMultipleChoice($this->id);
+                $this->answer->questionJSId = $this->js_id;
+                break;
+            default:
+                $this->answer = new stdClass();
+                $this->answer->questionJSId = $this->js_id;
+                break;
+        }
+
+        return true;
+    }
+
+    function export()
+    {
+        $html = $this->getQuestionHTML();
+        $js = $this->getQuestionJS();
+
+        if (is_object($this->answer) && $this->answer instanceof Answer) {
+            list($js2, $html2) = $this->answer->export();
+            $js .= $js2;
+            $html .= $html2;
+        } else {
+            throw new \Exception('Question not supported. Exercise: '.$this->selectTitle());
+        }
+
+        return array($js, $html);
+    }
+
+    function createAnswersForm($form)
+    {
+        return true;
+    }
+
+    function processAnswersCreation($form)
+    {
+        return true;
+    }
+
+    /**
+     * Returns an HTML-formatted question
+     */
+    function getQuestionHTML()
+    {
         $title = $this->selectTitle();
         $description = $this->selectDescription();
-		$cols = 2;
-		$s = '<tr>
+        $cols = 2;
+        $s = '<tr>
 			<td colspan="'.$cols.'" id="question_'.$this->id.'_title" valign="middle" style="background-color:#d6d6d6;">
 			'.$title.'
 			</td>
@@ -163,16 +163,16 @@ 
 			<i>'.$description.'</i>
 			</td>
 			</tr>';
-		return $s;
-	}
+        return $s;
+    }
 
-	/**
-	 * Return the JavaScript code bound to the question
-	 */
-	public function getQuestionJS()
-	{
-		$weight = $this->selectWeighting();
-		$js = 'questions.push('.$this->js_id.');'."\n";
+    /**
+     * Return the JavaScript code bound to the question
+     */
+    public function getQuestionJS()
+    {
+        $weight = $this->selectWeighting();
+        $js = 'questions.push('.$this->js_id.');'."\n";
 
         switch ($this->type) {
             case ORAL_EXPRESSION:
@@ -181,7 +181,7 @@ 
                 $script .= file_get_contents(api_get_path(LIBRARY_PATH) . 'wami-recorder/gui.js');
                 $js .= $script;*/
                 break;
-           case HOT_SPOT:
+            case HOT_SPOT:
                 //put the max score to 0 to avoid discounting the points of
                 //non-exported quiz types in the SCORM
                 $weight = 0;
@@ -189,8 +189,8 @@ 
         }
         $js .= 'questions_score_max['.$this->js_id.'] = '.$weight.";";
 
-		return $js;
-	}
+        return $js;
+    }
 }
 
 /**
@@ -200,29 +200,29 @@ 
  */
 class ScormAnswerMultipleChoice extends Answer
 {
-	/**
-	 * Return HTML code for possible answers
-	 */
-	function export()
-	{
-		$js = '';
-		$html = '<tr><td colspan="2"><table width="100%">';
-		$type = $this->getQuestionType();
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();';
-		$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;';
+    /**
+     * Return HTML code for possible answers
+     */
+    function export()
+    {
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">';
+        $type = $this->getQuestionType();
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = new Array();';
+        $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.'][0] = 0;';
 
         $jstmpw .= 'questions_answers_correct['.$this->questionJSId.'] = new Array();';
 
-		//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) {
+        //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) {
             $id = 1;
-			$jstmp = '';
-			$jstmpc = '';
+            $jstmp = '';
+            $jstmpc = '';
             foreach ($this->answer as $i => $answer) {
-				$identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
-				$html .=
-					'<tr>
+                $identifier = 'question_'.$this->questionJSId.'_multiple_'.$i;
+                $html .=
+                    '<tr>
 					<td align="center" width="5%">
 					<input name="'.$identifier.'" id="'.$identifier.'" value="'.$i.'" type="checkbox" />
 					</td>
@@ -231,19 +231,19 @@ 
 					</td>
 					</tr>';
 
-				$jstmp .= $i.',';
+                $jstmp .= $i.',';
                 if ($this->correct[$i]) {
                     $jstmpc .= $i.',';
                 }
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
                 $jstmpw .= 'questions_answers_correct['.$this->questionJSId.']['.$i.'] = '.$this->correct[$i].';';
-				$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');'."\n";
             $js .= 'questions_types['.$this->questionJSId.'] = \'mcma\';'."\n";
-			$js .= $jstmpw;
-		} elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
-	    	$js = '';
+            $js .= $jstmpw;
+        } elseif ($type == MULTIPLE_ANSWER_COMBINATION) {
+            $js = '';
             $id = 1;
             $jstmp = '';
             $jstmpc = '';
@@ -270,15 +270,15 @@ 
             $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');';
             $js .= 'questions_types['.$this->questionJSId.'] = "exact";';
             $js .= $jstmpw;
-		} else {
-			$id = 1;
-			$jstmp = '';
-			$jstmpc = '';
+        } else {
+            $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>
+                $identifier_name = 'question_'.$this->questionJSId.'_unique_answer';
+                $html .=
+                    '<tr>
 					<td align="center" width="5%">
 					<input name="'.$identifier_name.'" id="'.$identifier.'" value="'.$i.'" type="checkbox"/>
 					</td>
@@ -286,22 +286,22 @@ 
 					<label for="'.$identifier.'">' . Security::remove_XSS($this->answer[$i]) . '</label>
 					</td>
 					</tr>';
-				$jstmp .= $i.',';
+                $jstmp .= $i.',';
                 if ($this->correct[$i]) {
                     $jstmpc .= $i;
                 }
-				$jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
+                $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$this->weighting[$i].";";
                 $jstmpw .= 'questions_answers_correct['.$this->questionJSId.']['.$i.'] = '.$this->correct[$i].';';
-				$id++;
-			}
-			$js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');';
-			$js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';';
-			$js .= $jstmpw;
-		}
-		$html .= '</table></td></tr>';
-
-		return array($js, $html);
-	}
+                $id++;
+            }
+            $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.substr($jstmp,0,-1).');';
+            $js .= 'questions_types['.$this->questionJSId.'] = \'mcua\';';
+            $js .= $jstmpw;
+        }
+        $html .= '</table></td></tr>';
+
+        return array($js, $html);
+    }
 }
 
 /**
@@ -310,21 +310,21 @@ 
  */
 class ScormAnswerTrueFalse extends Answer
 {
-	/**
-	 * Return the XML flow for the possible answers.
-	 * That's one <response_lid>, containing several <flow_label>
-	 *
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	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>
+    /**
+     * Return the XML flow for the possible answers.
+     * That's one <response_lid>, containing several <flow_label>
+     *
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    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>
 				<td align="center" width="5%">
 				<input name="'.$identifier_true.'" id="'.$identifier_true.'" value="'.$this->trueGrade.'" type="radio" />
 				</td>
@@ -332,8 +332,8 @@ 
 				<label for="'.$identifier_true.'">' . get_lang('True') . '</label>
 				</td>
 				</tr>';
-		$html .=
-			'<tr>
+        $html .=
+            '<tr>
 			<td align="center" width="5%">
 			<input name="'.$identifier_false.'" id="'.$identifier_false.'" value="'.$this->falseGrade.'" type="radio" />
 			</td>
@@ -341,20 +341,20 @@ 
 			<label for="'.$identifier_false.'">' . get_lang('False') . '</label>
 			</td>
 			</tr></table></td></tr>';
-		$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);
-	}
+        $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);
+    }
 }
 
 /**
@@ -363,76 +363,76 @@ 
  */
 class ScormAnswerFillInBlanks extends Answer
 {
-	/**
-	 * Export the text with missing words.
-	 *
-	 * As a side effect, it stores two lists in the class :
-	 * the missing words and their respective weightings.
-	 */
-	function export()
-	{
-		global $charset;
-		$js = '';
-		$html = '<tr><td colspan="2"><table width="100%">';
-		// get all enclosed answers
-		$blankList = array();
-		// build replacement
-		$replacementList = array();
-		foreach ($this->answer as $i => $answer) {
-			$blankList[] = '['.$answer.']';
-		}
-
-		// 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(
+    /**
+     * Export the text with missing words.
+     *
+     * As a side effect, it stores two lists in the class :
+     * the missing words and their respective weightings.
+     */
+    function export()
+    {
+        global $charset;
+        $js = '';
+        $html = '<tr><td colspan="2"><table width="100%">';
+        // get all enclosed answers
+        $blankList = array();
+        // build replacement
+        $replacementList = array();
+        foreach ($this->answer as $i => $answer) {
+            $blankList[] = '['.$answer.']';
+        }
+
+        // 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.',';
-			if (!empty($texstring)) {
-				$sub = api_substr($texstring, 1, -1);
-				if (!empty($sub)) {
-					$jstmpc .= "'" . api_htmlentities($sub, ENT_QUOTES, $charset) . "',";
-				}
-			}
+            if (!empty($texstring)) {
+                $sub = api_substr($texstring, 1, -1);
+                if (!empty($sub)) {
+                    $jstmpc .= "'" . api_htmlentities($sub, 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, ']');
-		}
+            $jstmpw .= 'questions_answers_ponderation['.$this->questionJSId.']['.$i.'] = '.$weight_db.";\n";
+            $i++;
+            $startlocations = api_strpos($answer, '[');
+            $endlocations = api_strpos($answer, ']');
+        }
 
-		$html .= '<tr>
+        $html .= '<tr>
 			<td>
 			'.$answer.'
 			</td>
 			</tr></table></td></tr>';
-		$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;
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array('.api_substr($jstmp,0,-1).');'."\n";
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = new Array('.api_substr($jstmpc,0,-1).');'."\n";
+        $js .= 'questions_types['.$this->questionJSId.'] = \'fib\';'."\n";
+        $js .= $jstmpw;
 
-		return array($js,$html);
-	}
+        return array($js,$html);
+    }
 }
 
 /**
@@ -441,65 +441,65 @@ 
  */
 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%">';
-		// 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 ...)
-
-		// get max length of displayed array
-
-		$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>';
-				$s.='<td width="40%" valign="top"><b>'.$cpt2.'</b>.&nbsp;'.$answer."</td>";
-				$s.='<td width="20%" align="center">&nbsp;&nbsp;<select name="'.$identifier.$cpt2.'" id="'.$identifier.$cpt2.'">';
-				$s.=' <option value="0">--</option>';
-				// fills the list-box
+    /**
+     * 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%">';
+        // 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 ...)
+
+        // get max length of displayed array
+
+        $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>';
+                $s.='<td width="40%" valign="top"><b>'.$cpt2.'</b>.&nbsp;'.$answer."</td>";
+                $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>';
-				$s.='<td width="40%" valign="top">';
+                $s.='</select>&nbsp;&nbsp;</td>';
+                $s.='<td width="40%" valign="top">';
                 if (isset($Select[$cpt2])) {
                     $s .= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
                 } else {
                     $s .= '&nbsp;';
                 }
-				$s.="</td></tr>";
+                $s.="</td></tr>";
 
-				$jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
+                $jstmpc .= '['.$answerCorrect.','.$cpt2.'],';
 
                 $my_weight = explode('@', $weight);
                 if (count($my_weight) == 2) {
@@ -507,32 +507,32 @@ 
                 } 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>';
-						$s.= '<td width="60%" colspan="2">&nbsp;</td>';
-						$s.= '<td width="40%" valign="top">';
-						$s.= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
-						$s.= "</td></tr>";
-						$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);
-	}
+                $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>';
+                        $s.= '<td width="60%" colspan="2">&nbsp;</td>';
+                        $s.= '<td width="40%" valign="top">';
+                        $s.= '<b>'.$Select[$cpt2]['Lettre'].'.</b> '.$Select[$cpt2]['Reponse'];
+                        $s.= "</td></tr>";
+                        $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);
+    }
 }
 
 /**
@@ -541,19 +541,19 @@ 
  */
 class ScormAnswerFree extends Answer
 {
-	/**
-	 * Export the text with missing words.
-	 *
-	 * As a side effect, it stores two lists in the class :
-	 * the missing words and their respective weightings.
-	 *
-	 */
-	function export()
-	{
-		$js = '';
+    /**
+     * Export the text with missing words.
+     *
+     * As a side effect, it stores two lists in the class :
+     * the missing words and their respective weightings.
+     *
+     */
+    function export()
+    {
+        $js = '';
         $identifier = 'question_'.$this->questionJSId.'_free';
-		// currently the free answers cannot be displayed, so ignore the textarea
-		$html = '<tr><td colspan="2">';
+        // currently the free answers cannot be displayed, so ignore the textarea
+        $html = '<tr><td colspan="2">';
         $type = $this->getQuestionType();
 
         if ($type == ORAL_EXPRESSION) {
@@ -565,21 +565,21 @@ 
             $layout = $template->get_template('document/record_audio.tpl');
             $html .= $template->fetch($layout);*/
 
-			$html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
+            $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
 
             return array($js, $html);
         }
 
         $html .= '<textarea minlength="20" name="'.$identifier.'" id="'.$identifier.'" ></textarea>';
         $html .= '</td></tr>';
-		$js .= 'questions_answers['.$this->questionJSId.'] = new Array();';
-		$js .= 'questions_answers_correct['.$this->questionJSId.'] = "";';
-		$js .= 'questions_types['.$this->questionJSId.'] = \'free\';';
-		$jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = "0";';
-		$js .= $jstmpw;
-
-		return array($js, $html);
-	}
+        $js .= 'questions_answers['.$this->questionJSId.'] = new Array();';
+        $js .= 'questions_answers_correct['.$this->questionJSId.'] = "";';
+        $js .= 'questions_types['.$this->questionJSId.'] = \'free\';';
+        $jstmpw = 'questions_answers_ponderation['.$this->questionJSId.'] = "0";';
+        $js .= $jstmpw;
+
+        return array($js, $html);
+    }
 }
 /**
  * This class handles the SCORM export of hotpot questions
@@ -587,63 +587,63 @@ 
  */
 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>';
-			$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>';
-			$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 :
-	 * the missing words and their respective weightings.
-	 *
-	 */
-	function export()
-	{
-		$js = $this->get_js_header();
-		$html = '<tr><td colspan="2"><table width="100%">';
-		// some javascript must be added for that kind of questions
-		$html .= '';
-
-		// 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>';
+    /**
+     * Returns the javascript code that goes with HotSpot exercises
+     * @return string	The JavaScript code
+     */
+    function get_js_header()
+    {
+        if ($this->standalone) {
+            $header = '<script>';
+            $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>';
+            $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 :
+     * the missing words and their respective weightings.
+     *
+     */
+    function export()
+    {
+        $js = $this->get_js_header();
+        $html = '<tr><td colspan="2"><table width="100%">';
+        // some javascript must be added for that kind of questions
+        $html .= '';
+
+        // 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>';
-		$canClick = true;
-		$relPath = api_get_path(REL_PATH);
-		$html .= <<<HTML
+        $canClick = true;
+        $relPath = api_get_path(REL_PATH);
+        $html .= <<<HTML
             <tr>
                 <td>
                     <div id="hotspot-{$this->questionJSId}"></div>
@@ -663,13 +663,13 @@ 
                 </td>
             <tr>
 HTML;
-		$html .= '</table></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>';
+        // currently the free answers cannot be displayed, so ignore the textarea
+        $html = '<tr><td colspan="2">'.get_lang('ThisItemIsNotExportable').'</td></tr>';
 
-		return array($js, $html);
-	}
+        return array($js, $html);
+    }
 }
 
 /**
@@ -684,32 +684,32 @@ 
  */
 class ScormAssessmentItem
 {
-	public $question;
-	public $question_ident;
-	public $answer;
-	public $standalone;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param ScormQuestion $question The Question object we want to export.
-	 */
-	public function __construct($question, $standalone = false)
-	{
-		$this->question = $question;
-		$this->question->setAnswer();
-		$this->questionIdent = "QST_" . $question->id ;
-		$this->standalone = $standalone;
-	}
-
-	/**
-	 * Start the XML flow.
-	 *
-	 * This opens the <item> block, with correct attributes.
-	 *
-	 */
-	function start_page()
-	{
+    public $question;
+    public $question_ident;
+    public $answer;
+    public $standalone;
+
+    /**
+     * Constructor.
+     *
+     * @param ScormQuestion $question The Question object we want to export.
+     */
+    public function __construct($question, $standalone = false)
+    {
+        $this->question = $question;
+        $this->question->setAnswer();
+        $this->questionIdent = "QST_" . $question->id ;
+        $this->standalone = $standalone;
+    }
+
+    /**
+     * Start the XML flow.
+     *
+     * This opens the <item> block, with correct attributes.
+     *
+     */
+    function start_page()
+    {
         $head = '';
         if ($this->standalone) {
             $charset = 'UTF-8';
@@ -717,89 +717,89 @@ 
             $head .= '<html>';
         }
 
-		return $head;
-	}
+        return $head;
+    }
 
-	/**
-	 * End the XML flow, closing the </item> tag.
-	 *
-	 */
-	function end_page()
+    /**
+     * End the XML flow, closing the </item> tag.
+     *
+     */
+    function end_page()
+    {
+        if ($this->standalone) {
+            return '</html>';
+        }
+
+        return '';
+    }
+
+    /**
+     * Start document header
+     */
+    function start_header()
+    {
+        if ($this->standalone) {
+            return '<head>';
+        }
+
+        return '';
+    }
+
+    /**
+     * Print CSS inclusion
+     */
+    function css()
+    {
+        $css = '';
+        if ($this->standalone) {
+            $css = '<style type="text/css" media="screen, projection">';
+            $css .= '/*<![CDATA[*/'."\n";
+            $css .= '/*]]>*/'."\n";
+            $css .= '</style>'."\n";
+            $css .= '<style type="text/css" media="print">';
+            $css .= '/*<![CDATA[*/'."\n";
+            $css .= '/*]]>*/'."\n";
+            $css .= '</style>';
+        }
+
+        return $css;
+    }
+
+    /**
+     * End document header
+     */
+    function end_header()
+    {
+        if ($this->standalone) {
+            return '</head>';
+        }
+
+        return '';
+    }
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_js()
     {
-		if ($this->standalone) {
-			return '</html>';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Start document header
-	 */
-	function start_header()
-	{
-		if ($this->standalone) {
-			return '<head>';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Print CSS inclusion
-	 */
-	function css()
-	{
-		$css = '';
-		if ($this->standalone) {
-			$css = '<style type="text/css" media="screen, projection">';
-			$css .= '/*<![CDATA[*/'."\n";
-			$css .= '/*]]>*/'."\n";
-			$css .= '</style>'."\n";
-			$css .= '<style type="text/css" media="print">';
-			$css .= '/*<![CDATA[*/'."\n";
-			$css .= '/*]]>*/'."\n";
-			$css .= '</style>';
-		}
-
-		return $css;
-	}
-
-	/**
-	 * End document header
-	 */
-	function end_header()
-	{
-		if ($this->standalone) {
-			return '</head>';
-		}
-
-		return '';
-	}
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_js()
-	{
         $js = '<script type="text/javascript" src="assets/api_wrapper.js"></script>';
-		if ($this->standalone) {
-			return '<script>';
-		}
-		return $js;
-	}
-
-	/**
-	 * Common JS functions
-	 */
-	function common_js()
-	{
-		$js = 'var questions = new Array();';
-		$js .= 'var questions_answers = new Array();';
-		$js .= 'var questions_answers_correct = new Array();';
-		$js .= 'var questions_types = new Array();';
-		$js .= "\n" .
-			'/**
+        if ($this->standalone) {
+            return '<script>';
+        }
+        return $js;
+    }
+
+    /**
+     * Common JS functions
+     */
+    function common_js()
+    {
+        $js = 'var questions = new Array();';
+        $js .= 'var questions_answers = new Array();';
+        $js .= 'var questions_answers_correct = new Array();';
+        $js .= 'var questions_types = new Array();';
+        $js .= "\n" .
+            '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
              * @param	string	Name of event
@@ -834,79 +834,79 @@ 
             	addEvent(window,\'unload\',unloadPage,false);
             }'."\n\n";
 
-		$js .= '';
-		$js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
+        $js .= '';
+        $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
         if ($this->standalone) {
             return $js."\n";
         }
-		return '';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_js()
-	{
+        return '';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_js()
+    {
         if ($this->standalone) {
             return '</script>';
         }
 
         return '';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_body()
-	{
-		if ($this->standalone) {
-			return '<body><form id="dokeos_scorm_form" method="post" action="">';
-		}
-
-		return '';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_body()
-	{
-		if ($this->standalone) {
-			return '<br /><input class="btn" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Export the question as a SCORM Item.
-	 * This is a default behaviour, some classes may want to override this.
-	 * @return string|array A string, the XML flow for an Item.
-	 */
-	function export()
-	{
-		list($js, $html) = $this->question->export();
-		if ($this->standalone) {
-			$res = $this->start_page()
-				. $this->start_header()
-				. $this->css()
-				. $this->start_js()
-				. $this->common_js()
-				. $js
-				. $this->end_js()
-				. $this->end_header()
-				. $this->start_body()
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_body()
+    {
+        if ($this->standalone) {
+            return '<body><form id="dokeos_scorm_form" method="post" action="">';
+        }
+
+        return '';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_body()
+    {
+        if ($this->standalone) {
+            return '<br /><input class="btn" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
+        }
+
+        return '';
+    }
+
+    /**
+     * Export the question as a SCORM Item.
+     * This is a default behaviour, some classes may want to override this.
+     * @return string|array A string, the XML flow for an Item.
+     */
+    function export()
+    {
+        list($js, $html) = $this->question->export();
+        if ($this->standalone) {
+            $res = $this->start_page()
+                . $this->start_header()
+                . $this->css()
+                . $this->start_js()
+                . $this->common_js()
+                . $js
+                . $this->end_js()
+                . $this->end_header()
+                . $this->start_body()
                 . $html
-				. $this->end_body()
-				. $this->end_page();
-			return $res;
-		} else {
-			return array($js, $html);
-		}
-	}
+                . $this->end_body()
+                . $this->end_page();
+            return $res;
+        } else {
+            return array($js, $html);
+        }
+    }
 }
 
 /**
@@ -923,103 +923,103 @@ 
  */
 class ScormSection
 {
-	public $exercise;
-	public $standalone;
-
-	/**
-	 * Send a complete exercise in SCORM format, from its ID
-	 *
-	 * @param Exercise $exercise The exercise to export
-	 * @param boolean $standalone Wether it should include XML tag and DTD line.
-	 * @return string XML as a string, or an empty string if there's no exercise with given ID.
-	 */
-	public static function export_exercise_to_scorm(Exercise $exercise, $standalone = true)
-	{
-		$ims = new ScormSection($exercise);
-		$xml = $ims->export($standalone);
-
-		return $xml;
-	}
-
-	/**
-	 * Constructor.
-	 * @param Exercise $exe The Exercise instance to export
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	public function __construct($exe)
-	{
-		$this->exercise = $exe;
-	}
-
-	/**
-	 * Start the XML flow.
-	 *
-	 * This opens the <item> block, with correct attributes.
-	 *
-	 */
-	function start_page()
-	{
+    public $exercise;
+    public $standalone;
+
+    /**
+     * Send a complete exercise in SCORM format, from its ID
+     *
+     * @param Exercise $exercise The exercise to export
+     * @param boolean $standalone Wether it should include XML tag and DTD line.
+     * @return string XML as a string, or an empty string if there's no exercise with given ID.
+     */
+    public static function export_exercise_to_scorm(Exercise $exercise, $standalone = true)
+    {
+        $ims = new ScormSection($exercise);
+        $xml = $ims->export($standalone);
+
+        return $xml;
+    }
+
+    /**
+     * Constructor.
+     * @param Exercise $exe The Exercise instance to export
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    public function __construct($exe)
+    {
+        $this->exercise = $exe;
+    }
+
+    /**
+     * Start the XML flow.
+     *
+     * This opens the <item> block, with correct attributes.
+     *
+     */
+    function start_page()
+    {
         $charset = 'UTF-8';
-		$head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?><html>';
-
-		return $head;
-	}
-
-	/**
-	 * End the XML flow, closing the </item> tag.
-	 *
-	 */
-	function end_page()
-	{
-		return '</html>';
-	}
-
-	/**
-	 * Start document header
-	 */
-	function start_header()
-	{
-		return '<head>';
-	}
-
-	/**
-	 * Print CSS inclusion
-	 */
-	private function css()
-	{
-		return '';
-	}
-
-	/**
-	 * End document header
-	 */
+        $head = '<?xml version="1.0" encoding="'.$charset.'" standalone="no"?><html>';
+
+        return $head;
+    }
+
+    /**
+     * End the XML flow, closing the </item> tag.
+     *
+     */
+    function end_page()
+    {
+        return '</html>';
+    }
+
+    /**
+     * Start document header
+     */
+    function start_header()
+    {
+        return '<head>';
+    }
+
+    /**
+     * Print CSS inclusion
+     */
+    private function css()
+    {
+        return '';
+    }
+
+    /**
+     * End document header
+     */
     private function end_header()
-	{
-		return '</head>';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
+    {
+        return '</head>';
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
     private function start_js()
-	{
-		return '<script>';
-	}
-
-	/**
-	 * Common JS functions
-	 */
-	public function common_js()
-	{
-		$js = file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
-
-		$js .= 'var questions = new Array();' . "\n";
-		$js .= 'var questions_answers = new Array();' . "\n";
-		$js .= 'var questions_answers_correct = new Array();' . "\n";
-		$js .= 'var questions_types = new Array();' . "\n";
-		$js .= "\n" .
-			'/**
+    {
+        return '<script>';
+    }
+
+    /**
+     * Common JS functions
+     */
+    public function common_js()
+    {
+        $js = file_get_contents('../inc/lib/javascript/hotspot/js/hotspot.js');
+
+        $js .= 'var questions = new Array();' . "\n";
+        $js .= 'var questions_answers = new Array();' . "\n";
+        $js .= 'var questions_answers_correct = new Array();' . "\n";
+        $js .= 'var questions_types = new Array();' . "\n";
+        $js .= "\n" .
+            '/**
              * Assigns any event handler to any element
              * @param	object	Element on which the event is added
              * @param	string	Name of event
@@ -1061,76 +1061,76 @@ 
             }
             '."\n";
 
-		$js .= '';
-		$js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
-		return $js. "\n";
-	}
+        $js .= '';
+        $js .= 'addEvent(window,\'load\',addListeners,false);'."\n";
+        return $js. "\n";
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_js()
+    {
+        return '</script>';
+    }
+
+    /**
+     * Start the itemBody
+     *
+     */
+    function start_body()
+    {
+        return '<body>'.
+        '<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>".
+        '<form id="dokeos_scorm_form" method="post" action="">'.
+        '<table width="100%">';
+    }
+
+    /**
+     * End the itemBody part.
+     *
+     */
+    function end_body()
+    {
+        return '</table><br /><input class="btn btn-primary" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
+    }
 
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_js()
+    /**
+     * Export the question as a SCORM Item.
+     *
+     * This is a default behaviour, some classes may want to override this.
+     *
+     * @param $standalone: Boolean stating if it should be exported as a stand-alone question
+     * @return string string, the XML flow for an Item.
+     */
+    function export()
     {
-		return '</script>';
-	}
-
-	/**
-	 * Start the itemBody
-	 *
-	 */
-	function start_body()
-	{
-		return '<body>'.
-		'<h1>'.$this->exercise->selectTitle().'</h1><p>'.$this->exercise->selectDescription()."</p>".
-		'<form id="dokeos_scorm_form" method="post" action="">'.
-		'<table width="100%">';
-	}
-
-	/**
-	 * End the itemBody part.
-	 *
-	 */
-	function end_body()
-	{
-		return '</table><br /><input class="btn btn-primary" type="button" id="dokeos_scorm_submit" name="dokeos_scorm_submit" value="OK" /></form></body>';
-	}
-
-	/**
-	 * Export the question as a SCORM Item.
-	 *
-	 * This is a default behaviour, some classes may want to override this.
-	 *
-	 * @param $standalone: Boolean stating if it should be exported as a stand-alone question
-	 * @return string string, the XML flow for an Item.
-	 */
-	function export()
-	{
-		global $charset;
-
-		$head = '';
-		if ($this->standalone) {
-			$head = '<?xml version = "1.0" encoding = "' . $charset . '" standalone = "no"?>' . "\n"
-				. '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n";
-		}
-
-		list($js, $html) = $this->export_questions();
-		$res = $this->start_page()
-			. $this->start_header()
-			. $this->css()
+        global $charset;
+
+        $head = '';
+        if ($this->standalone) {
+            $head = '<?xml version = "1.0" encoding = "' . $charset . '" standalone = "no"?>' . "\n"
+                . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n";
+        }
+
+        list($js, $html) = $this->export_questions();
+        $res = $this->start_page()
+            . $this->start_header()
+            . $this->css()
             . $this->globalAssets()
-			. $this->start_js()
-			. $this->common_js()
-			. $js
-			. $this->end_js()
-			. $this->end_header()
-			. $this->start_body()
-			. $html
-			. $this->end_body()
-			. $this->end_page();
-
-		return $res;
-	}
+            . $this->start_js()
+            . $this->common_js()
+            . $js
+            . $this->end_js()
+            . $this->end_header()
+            . $this->start_body()
+            . $html
+            . $this->end_body()
+            . $this->end_page();
+
+        return $res;
+    }
 
     /**
      * @return string
@@ -1144,21 +1144,21 @@ 
         return $assets;
     }
 
-	/**
-	 * Export the questions, as a succession of <items>
-	 * @author Amand Tihon <amand@alrj.org>
-	 */
-	function export_questions()
-	{
-		$js = $html = "";
-		$js_id = 0;
-		foreach ($this->exercise->selectQuestionList() as $q) {
-			list($jstmp, $htmltmp)= ScormQuestion::export_question($q, false, $js_id);
-			$js .= $jstmp."\n";
-			$html .= $htmltmp."\n";
-			++$js_id;
-		}
-
-		return array($js, $html);
-	}
+    /**
+     * Export the questions, as a succession of <items>
+     * @author Amand Tihon <amand@alrj.org>
+     */
+    function export_questions()
+    {
+        $js = $html = "";
+        $js_id = 0;
+        foreach ($this->exercise->selectQuestionList() as $q) {
+            list($jstmp, $htmltmp)= ScormQuestion::export_question($q, false, $js_id);
+            $js .= $jstmp."\n";
+            $html .= $htmltmp."\n";
+            ++$js_id;
+        }
+
+        return array($js, $html);
+    }
 }

main/ticket/tickets.php

Indentation +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
         echo '<div class="actions" >';
         echo '<a href="' . api_get_path(WEB_CODE_PATH) . 'ticket/new_ticket.php?project_id='.$projectId.'">' .
                 Display::return_icon('add.png', get_lang('Add'), '', '32') .
-             '</a>';
+                '</a>';
         echo '</div>';
     }
 }

main/messages/new_message.php

Indentation +35 added lines, -35 removed lines

@@ -77,20 +77,20 @@ 
 
 function show_compose_reply_to_message($message_id, $receiver_id)
 {
-	$table_message = Database::get_main_table(TABLE_MESSAGE);
-	$query = "SELECT user_sender_id
+    $table_message = Database::get_main_table(TABLE_MESSAGE);
+    $query = "SELECT user_sender_id
               FROM $table_message
 			  WHERE user_receiver_id = ".intval($receiver_id)." AND id='".intval($message_id)."';";
-	$result = Database::query($query);
-	$row = Database::fetch_array($result,'ASSOC');
-	if (!isset($row['user_sender_id'])) {
-		$html = get_lang('InvalidMessageId');
+    $result = Database::query($query);
+    $row = Database::fetch_array($result,'ASSOC');
+    if (!isset($row['user_sender_id'])) {
+        $html = get_lang('InvalidMessageId');
 
-		return $html;
-	}
-	$userInfo = api_get_user_info($row['user_sender_id']);
-	$default['users'] = array($row['user_sender_id']);
-	$html = manage_form($default, null, $userInfo['complete_name']);
+        return $html;
+    }
+    $userInfo = api_get_user_info($row['user_sender_id']);
+    $default['users'] = array($row['user_sender_id']);
+    $html = manage_form($default, null, $userInfo['complete_name']);
 
     return $html;
 }
@@ -98,10 +98,10 @@ 
 function show_compose_to_user ($receiver_id)
 {
     $userInfo = api_get_user_info($receiver_id);
-	$html = get_lang('To').':&nbsp;<strong>'.$userInfo['complete_name'].'</strong>';
-	$default['title'] = api_xml_http_response_encode(get_lang('EnterTitle'));
-	$default['users'] = array($receiver_id);
-	$html .= manage_form($default);
+    $html = get_lang('To').':&nbsp;<strong>'.$userInfo['complete_name'].'</strong>';
+    $default['title'] = api_xml_http_response_encode(get_lang('EnterTitle'));
+    $default['users'] = array($receiver_id);
+    $html .= manage_form($default);
 
     return $html;
 }
@@ -273,13 +273,13 @@ 
 
 /* MAIN SECTION */
 if ($socialToolIsActive) {
-	$this_section = SECTION_SOCIAL;
+    $this_section = SECTION_SOCIAL;
     $interbreadcrumb[] = array(
         'url' => api_get_path(WEB_PATH).'main/social/home.php',
         'name' => get_lang('SocialNetwork')
     );
 } else {
-	$this_section = SECTION_MYPROFILE;
+    $this_section = SECTION_MYPROFILE;
     $interbreadcrumb[] = array(
         'url' => api_get_path(WEB_PATH).'main/auth/profile.php',
         'name' => get_lang('Profile')
@@ -289,30 +289,30 @@ 
 $group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null;
 $social_right_content = null;
 if ($group_id != 0) {
-	$social_right_content .= '<div class=actions>';
-	$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/group_view.php?id='.$group_id.'">'.
-		Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
-	$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
-		Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
-	$social_right_content .= '</div>';
+    $social_right_content .= '<div class=actions>';
+    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/group_view.php?id='.$group_id.'">'.
+        Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
+    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
+        Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
+    $social_right_content .= '</div>';
 } else {
-	if ($socialToolIsActive) {
-	} else {
-		$social_right_content .= '<div class=actions>';
-		if (api_get_setting('allow_social_tool') === 'true' && api_get_setting('allow_message_tool') === 'true') {
-			$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.
+    if ($socialToolIsActive) {
+    } else {
+        $social_right_content .= '<div class=actions>';
+        if (api_get_setting('allow_social_tool') === 'true' && api_get_setting('allow_message_tool') === 'true') {
+            $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.
                 Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>';
-		}
-		if (api_get_setting('allow_message_tool') === 'true') {
-			$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
+        }
+        if (api_get_setting('allow_message_tool') === 'true') {
+            $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
                 Display::return_icon('message_new.png',get_lang('ComposeMessage')).'</a>';
-			$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
+            $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
                 Display::return_icon('inbox.png',get_lang('Inbox')).'</a>';
             $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
                 Display::return_icon('outbox.png',get_lang('Outbox')).'</a>';
-		}
-		$social_right_content .= '</div>';
-	}
+        }
+        $social_right_content .= '</div>';
+    }
 }
 
 // LEFT COLUMN

main/mySpace/user_import.php

Indentation +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
 $id_session = '';
 if (isset($_GET['id_session']) && $_GET['id_session'] != '') {
- 	$id_session = intval($_GET['id_session']);
-	$interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
-	$interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
+        $id_session = intval($_GET['id_session']);
+    $interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
+    $interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
 }
 
 // Set this option to true to enforce strict purification for usenames.
@@ -89,7 +89,7 @@ 
 Display :: display_header($tool_name);
 
 if ($_FILES['import_file']['size'] == 0 && $_POST) {
-	Display::display_error_message(get_lang('ThisFieldIsRequired'));
+    Display::display_error_message(get_lang('ThisFieldIsRequired'));
 }
 
 if (count($errors) != 0) {

main/lp/lp_view_item.php

Indentation +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 // Theme calls
 $show_learn_path = true;
 if (isset($_SESSION['oLP']) && is_object($_SESSION['oLP'])) {
-	$lp_theme_css = $_SESSION['oLP']->get_theme();
+    $lp_theme_css = $_SESSION['oLP']->get_theme();
 }
 
 if ($mode == 'fullpage') {

main/admin/dashboard_add_courses_to_user.php

Indentation +29 added lines, -29 removed lines

@@ -36,20 +36,20 @@ 
 
 // setting the name of the tool
 if (UserManager::is_admin($user_id)) {
-	$tool_name= get_lang('AssignCoursesToPlatformAdministrator');
+    $tool_name= get_lang('AssignCoursesToPlatformAdministrator');
 } else if ($user_info['status'] == SESSIONADMIN) {
-	$tool_name= get_lang('AssignCoursesToSessionsAdministrator');
+    $tool_name= get_lang('AssignCoursesToSessionsAdministrator');
 } else {
-	$tool_name= get_lang('AssignCoursesToHumanResourcesManager');
+    $tool_name= get_lang('AssignCoursesToHumanResourcesManager');
 }
 
 $add_type = 'multiple';
 if(isset($_GET['add_type']) && $_GET['add_type']!='') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 if (!api_is_platform_admin()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 function search_courses($needle, $type)
@@ -60,7 +60,7 @@ 
     $return = '';
     if (!empty($needle) && !empty($type)) {
         // xajax send utf8 datas... datas in db can be non-utf8 datas
-		$needle = Database::escape_string($needle);
+        $needle = Database::escape_string($needle);
 
         $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
         $assigned_courses_code = array_keys($assigned_courses_to_hrm);
@@ -88,16 +88,16 @@ 
                 		$without_assigned_courses ";
         }
 
-		$rs	= Database::query($sql);
+        $rs	= Database::query($sql);
 
-		$return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
-		while ($course = Database :: fetch_array($rs)) {
-			$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
-		}
-		$return .= '</select>';
-		$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
-	}
-	return $xajax_response;
+        $return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
+        while ($course = Database :: fetch_array($rs)) {
+            $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
+        }
+        $return .= '</select>';
+        $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+    }
+    return $xajax_response;
 }
 
 $xajax->processRequests();
@@ -187,23 +187,23 @@ 
 $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
 $assigned_courses_code = array_keys($assigned_courses_to_hrm);
 foreach ($assigned_courses_code as &$value) {
-	$value = "'".$value."'";
+    $value = "'".$value."'";
 }
 
 $without_assigned_courses = '';
 if (count($assigned_courses_code) > 0) {
-	$without_assigned_courses = " AND c.code NOT IN(".implode(',', $assigned_courses_code).")";
+    $without_assigned_courses = " AND c.code NOT IN(".implode(',', $assigned_courses_code).")";
 }
 
 $needle = '%';
 $firstLetter = null;
 if (isset($_POST['firstLetterCourse'])) {
-	$firstLetter = $_POST['firstLetterCourse'];
-	$needle = Database::escape_string($firstLetter.'%');
+    $firstLetter = $_POST['firstLetterCourse'];
+    $needle = Database::escape_string($firstLetter.'%');
 }
 
 if (api_is_multiple_url_enabled()) {
-	$sql = " SELECT c.code, c.title
+    $sql = " SELECT c.code, c.title
             FROM $tbl_course c
             LEFT JOIN $tbl_course_rel_access_url a
             ON (a.c_id = c.id)
@@ -213,7 +213,7 @@ 
             ORDER BY c.title";
 
 } else {
-	$sql= " SELECT c.code, c.title
+    $sql= " SELECT c.code, c.title
 	        FROM $tbl_course c
             WHERE  c.code LIKE '$needle' $without_assigned_courses
             ORDER BY c.title";
@@ -227,7 +227,7 @@ 
 <input type="hidden" name="formSent" value="1" />
 <?php
 if(!empty($msg)) {
-	Display::display_normal_message($msg); //main API
+    Display::display_normal_message($msg); //main API
 }
 ?>
 
@@ -272,13 +272,13 @@ 
     </div>
     <div class="col-md-4">
         <h5><?php
-	  	if (UserManager::is_admin($user_id)) {
-			echo get_lang('AssignedCoursesListToPlatformAdministrator');
-		} else if ($user_info['status'] == SESSIONADMIN) {
-			echo get_lang('AssignedCoursesListToSessionsAdministrator');
-		} else {
-			echo get_lang('AssignedCoursesListToHumanResourcesManager');
-		}
+            if (UserManager::is_admin($user_id)) {
+            echo get_lang('AssignedCoursesListToPlatformAdministrator');
+        } else if ($user_info['status'] == SESSIONADMIN) {
+            echo get_lang('AssignedCoursesListToSessionsAdministrator');
+        } else {
+            echo get_lang('AssignedCoursesListToHumanResourcesManager');
+        }
             ?>: </h5>
 
         <select id='destination' name="CoursesList[]" multiple="multiple" size="20" style="width:320px;">

main/admin/skills_import.php

Indentation +12 added lines, -12 removed lines

@@ -70,7 +70,7 @@ 
             $oskill = new Skill();
             $skill_id = $oskill->add($skill);
             $parents[$saved_id] = $skill_id;
-		}
+        }
     }
 }
 
@@ -81,12 +81,12 @@ 
  */
 function parse_csv_data($file)
 {
-	$skills = Import :: csvToArray($file);
-	foreach ($skills as $index => $skill) {
-		$skills[$index] = $skill;
-	}
+    $skills = Import :: csvToArray($file);
+    foreach ($skills as $index => $skill) {
+        $skills[$index] = $skill;
+    }
 
-	return $skills;
+    return $skills;
 }
 
 /**
@@ -94,7 +94,7 @@ 
  */
 function element_start($parser, $data)
 {
-	$data = api_utf8_decode($data);
+    $data = api_utf8_decode($data);
     global $skill;
     global $current_tag;
     switch ($data) {
@@ -111,7 +111,7 @@ 
  */
 function element_end($parser, $data)
 {
-	$data = api_utf8_decode($data);
+    $data = api_utf8_decode($data);
     global $skill;
     global $skills;
     global $current_value;
@@ -130,9 +130,9 @@ 
  */
 function character_data($parser, $data)
 {
-	$data = trim(api_utf8_decode($data));
-	global $current_value;
-	$current_value = $data;
+    $data = trim(api_utf8_decode($data));
+    global $current_value;
+    $current_value = $data;
 }
 
 /**
@@ -154,7 +154,7 @@ 
     xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
     xml_parser_free($parser);
 
-	return $skills;
+    return $skills;
 }
 
 $this_section = SECTION_PLATFORM_ADMIN;

main/admin/ldap_form_add_users_group.php

Indentation +28 added lines, -28 removed lines

@@ -29,35 +29,35 @@
 echo '<input type="hidden" name="confirmed" value="yes">';
 echo '<table border="0" cellspacing="0" width="100%">';
 echo '<tr align="center" id="header3">' .
-		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
-		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
-		($is_western_name_order
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
-			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
-		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
-	  '</tr>'."\n";
+        '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
+        '<td width="40%"><b>'.get_lang('Email').'</b></td>' .
+        ($is_western_name_order
+            ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
+            '<td width="15%"><b>'.get_lang('Name').'</b></td>'
+            : '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
+            '<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
+        '<td width="15%"><b>'.get_lang('Login').'</b></td>' .
+        '</tr>'."\n";
 while (list ($key, $val) = each($nom_form)) {
-	$nbre=$nbre+1;
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
-	echo '<tr align="center" id="header'.$ndiv.'">';
-	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
-	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
-	if ($is_western_name_order)	{
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-	} else {
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
-	}
-	echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
-	echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
-	echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
-	echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
-	echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
-	echo '</td>';
-	echo '</tr>';
+    $nbre=$nbre+1;
+    if($nbre & 1) $ndiv=2; else $ndiv=3;
+    echo '<tr align="center" id="header'.$ndiv.'">';
+    echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
+    echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
+    if ($is_western_name_order)	{
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+    } else {
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+    }
+    echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
+    echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
+    echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
+    echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
+    echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
+    echo '</td>';
+    echo '</tr>';
 }
 echo '</table>';
 echo '<br />';