chamilo / chamilo-lms

main/exercice/fill_blanks.class.php

Spacing +32 added lines, -32 removed lines

@@ -260,10 +260,10 @@ 
             ['id' => 'answer', 'onkeyup' => "javascript: updateBlanks(this);"],
             array('ToolbarSet' => 'TestQuestionDescription')
         );
-        $form->addRule('answer',get_lang('GiveText'),'required');
+        $form->addRule('answer', get_lang('GiveText'), 'required');
 
         //added multiple answers
-        $form->addElement('checkbox','multiple_answer','', get_lang('FillInBlankSwitchable'));
+        $form->addElement('checkbox', 'multiple_answer', '', get_lang('FillInBlankSwitchable'));
         $form->addElement(
             'select',
             'select_separator',
@@ -276,11 +276,11 @@ 
             null,
             '<input type="button" onclick="updateBlanks()" value="'.get_lang('RefreshBlanks').'" class="btn btn-default" />'
         );
-        $form->addElement('html','<div id="blanks_weighting"></div>');
+        $form->addElement('html', '<div id="blanks_weighting"></div>');
 
         global $text;
         // setting the save button here and not in the question class.php
-        $form->addElement('html','<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>');
+        $form->addElement('html', '<div id="defineoneblank" style="color:#D04A66; margin-left:160px">'.get_lang('DefineBlanks').'</div>');
         $form->addButtonSave($text, 'submitQuestion');
 
         if (!empty($this->id)) {
@@ -320,7 +320,7 @@ 
         // remove spaces at the beginning and the end of text in square brackets
         $answer = preg_replace_callback(
             "/".$blankStartSeparatorRegexp."[^]]+".$blankEndSeparatorRegexp."/",
-            function ($matches) use ($blankStartSeparator, $blankEndSeparator) {
+            function($matches) use ($blankStartSeparator, $blankEndSeparator) {
                 $matchingResult = $matches[0];
                 $matchingResult = trim($matchingResult, $blankStartSeparator);
                 $matchingResult = trim($matchingResult, $blankEndSeparator);
@@ -365,7 +365,7 @@ 
         if ($nb > 0) {
             $answer .= '::';
             // weighting
-            for ($i=0; $i < $nb; ++$i) {
+            for ($i = 0; $i < $nb; ++$i) {
                 // enter the weighting of word $i
                 $answer .= $form->getSubmitValue('weighting['.$i.']');
                 // not the last word, add ","
@@ -378,7 +378,7 @@ 
 
             // input width
             $answer .= ":";
-            for ($i=0; $i < $nb; ++$i) {
+            for ($i = 0; $i < $nb; ++$i) {
                 // enter the width of input for word $i
                 $answer .= $form->getSubmitValue('sizeofinput['.$i.']');
                 // not the last word, add ","
@@ -403,7 +403,7 @@ 
 
         // Allow answers order switches
         $is_multiple = $form -> getSubmitValue('multiple_answer');
-        $answer.= '@'.$is_multiple;
+        $answer .= '@'.$is_multiple;
 
         $this->save();
         $objAnswer = new Answer($this->id);
@@ -420,7 +420,7 @@ 
     public function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="'.$this->question_table_class .'">
+        $header .= '<table class="'.$this->question_table_class.'">
             <tr>
                 <th>'.get_lang("Answer").'</th>
             </tr>';
@@ -464,13 +464,13 @@ 
                 // if display for student, shuffle the correct answer menu
                 $listMenu = self::getFillTheBlankMenuAnswers($inTeacherSolution, $displayForStudent);
                 $result .= '<select name="choice['.$questionId.'][]">';
-                for ($k=0; $k < count($listMenu); $k++) {
+                for ($k = 0; $k < count($listMenu); $k++) {
                     $selected = "";
                     if ($correctItem == $listMenu[$k]) {
                         $selected = " selected=selected ";
                     }
                     // if in teacher view, display the first item by default, which is the right answer
-                    if ($k==0 && !$displayForStudent) {
+                    if ($k == 0 && !$displayForStudent) {
                         $selected = " selected=selected ";
                     }
                     $optionMenu .= '<option '.$selected.' value="'.$listMenu[$k].'">'.$listMenu[$k].'</option>';
@@ -642,10 +642,10 @@ 
         if (count($listDetails) < 3) {
             $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = array();
-            for ($i=0; $i < count($listWeightings); $i++) {
+            for ($i = 0; $i < count($listWeightings); $i++) {
                 $listSizeOfInput[] = 200;
             }
-            $blankSeparatorNumber = 0;    // 0 is [...]
+            $blankSeparatorNumber = 0; // 0 is [...]
         } else {
             $listWeightings = explode(',', $listDetails[0]);
             $listSizeOfInput = explode(',', $listDetails[1]);
@@ -677,9 +677,9 @@ 
             // remove [ and ] in string
             array_walk(
                 $listWords[0],
-                function (&$value, $key, $tabBlankChar) {
+                function(&$value, $key, $tabBlankChar) {
                     $trimChars = "";
-                    for ($i=0; $i < count($tabBlankChar); $i++) {
+                    for ($i = 0; $i < count($tabBlankChar); $i++) {
                         $trimChars .= $tabBlankChar[$i];
                     }
                     $value = trim($value, $trimChars);
@@ -699,18 +699,18 @@ 
         // if student answer, the second [] is the student answer,
         // the third is if student scored or not
         $listBrackets = array();
-        $listWords =  array();
+        $listWords = array();
 
         if ($isStudentAnswer) {
-            for ($i=0; $i < count($listAnswerResults['tabwords']); $i++) {
+            for ($i = 0; $i < count($listAnswerResults['tabwords']); $i++) {
                 $listBrackets[] = $listAnswerResults['tabwordsbracket'][$i];
                 $listWords[] = $listAnswerResults['tabwords'][$i];
-                if ($i+1 < count($listAnswerResults['tabwords'])) {
+                if ($i + 1 < count($listAnswerResults['tabwords'])) {
                     // should always be
                     $i++;
                 }
                 $listAnswerResults['studentanswer'][] = $listAnswerResults['tabwords'][$i];
-                if ($i+1 < count($listAnswerResults['tabwords'])) {
+                if ($i + 1 < count($listAnswerResults['tabwords'])) {
                     // should always be
                     $i++;
                 }
@@ -802,9 +802,9 @@ 
                            break;
                        default :
                            if (FillBlanks::isGoodStudentAnswer($tabAnswer['studentanswer'][$bracketNumber], $tabAnswer['tabwords'][$bracketNumber])) {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
+                               $tabUserResult[$data['user_id']][$bracketNumber] = 0; //  right answer
                            } else {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
+                               $tabUserResult[$data['user_id']][$bracketNumber] = -1; // wrong answer
                            }
                    }
                } else {
@@ -812,11 +812,11 @@ 
                    if ($useLastAnswerredAttempt) {
                        // if we take into account the last answered attempt
                        if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
-                           $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                           $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered
                        }
                    } else {
                        // we take the last attempt, even if the student answer the question before
-                       $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                       $tabUserResult[$data['user_id']][$bracketNumber] = -2; // not answered
                    }
                }
            }
@@ -837,10 +837,10 @@ 
     {
         $outRes = 0;
         // for each student in group
-        foreach($resultList as $userId => $tabValue) {
+        foreach ($resultList as $userId => $tabValue) {
             $trouve = false;
             // for each bracket, if student has at leat one answer ( choice > -2) then he pass the question
-            foreach($tabValue as $i => $choice) {
+            foreach ($tabValue as $i => $choice) {
                 if ($choice > -2 && !$trouve) {
                     $outRes++;
                     $trouve = true;
@@ -862,7 +862,7 @@ 
         $separatorEnd = $listWithStudentAnswer['blankseparatorend'];
         // lets rebuild the sentence with [correct answer][student answer][answer is correct]
         $result = "";
-        for ($i=0; $i < count($listWithStudentAnswer['commonwords']) - 1; $i++) {
+        for ($i = 0; $i < count($listWithStudentAnswer['commonwords']) - 1; $i++) {
             $result .= $listWithStudentAnswer['commonwords'][$i];
             $result .= $listWithStudentAnswer['tabwordsbracket'][$i];
             $result .= $separatorStart.$listWithStudentAnswer['studentanswer'][$i].$separatorEnd;
@@ -944,7 +944,7 @@ 
             ")",
         ];
         $result = $text;
-        for ($i=0; $i < count($listRegexpCharacters); $i++) {
+        for ($i = 0; $i < count($listRegexpCharacters); $i++) {
             $result = str_replace($listRegexpCharacters[$i], "\\".$listRegexpCharacters[$i], $result);
         }
 
@@ -1006,7 +1006,7 @@ 
     {
         $listResults = array();
         $fillBlanksAllowedSeparator = self::getAllowedSeparator();
-        for ($i=0; $i < count($fillBlanksAllowedSeparator); $i++) {
+        for ($i = 0; $i < count($fillBlanksAllowedSeparator); $i++) {
             $listResults[] = $fillBlanksAllowedSeparator[$i][0]."...".$fillBlanksAllowedSeparator[$i][1];
         }
 
@@ -1024,7 +1024,7 @@ 
     {
         $listSeparators = self::getAllowedSeparator();
         $result = 0;
-        for ($i=0; $i < count($listSeparators); $i++) {
+        for ($i = 0; $i < count($listSeparators); $i++) {
             if ($listSeparators[$i][0] == $startSeparator &&
                 $listSeparators[$i][1] == $endSeparator
             ) {
@@ -1049,7 +1049,7 @@ 
 
         // rebuild the answer with good HTML style
         // this is the student answer, right or wrong
-        for ($i=0; $i < count($listStudentAnswerInfo['studentanswer']); $i++) {
+        for ($i = 0; $i < count($listStudentAnswerInfo['studentanswer']); $i++) {
             if ($listStudentAnswerInfo['studentscore'][$i] == 1) {
                 $listStudentAnswerInfo['studentanswer'][$i] = self::getHtmlRightAnswer(
                     $listStudentAnswerInfo['studentanswer'][$i],
@@ -1067,7 +1067,7 @@ 
 
 
         // rebuild the sentence with student answer inserted
-        for ($i=0; $i < count($listStudentAnswerInfo['commonwords']); $i++) {
+        for ($i = 0; $i < count($listStudentAnswerInfo['commonwords']); $i++) {
             $result .= isset($listStudentAnswerInfo['commonwords'][$i]) ? $listStudentAnswerInfo['commonwords'][$i] : '';
             $result .= isset($listStudentAnswerInfo['studentanswer'][$i]) ? $listStudentAnswerInfo['studentanswer'][$i] : '';
         }
@@ -1100,7 +1100,7 @@ 
                 $listPossibleAnswers = FillBlanks::getFillTheBlankMenuAnswers($correct, false);
                 $correctAnswerHtml .= "<span style='color: green'>".$listPossibleAnswers[0]."</span>";
                 $correctAnswerHtml .= " <span style='font-weight:normal'>(";
-                for ($i=1; $i < count($listPossibleAnswers); $i++) {
+                for ($i = 1; $i < count($listPossibleAnswers); $i++) {
                     $correctAnswerHtml .= $listPossibleAnswers[$i];
                     if ($i != count($listPossibleAnswers) - 1) {
                         $correctAnswerHtml .= " | ";

main/exercice/exercise.php

Spacing +8 added lines, -8 removed lines

@@ -108,7 +108,7 @@ 
 
 if (!empty($gradebook) && $gradebook == 'view') {
     $interbreadcrumb[] = array(
-        'url' => '../gradebook/' . $_SESSION['gradebook_dest'],
+        'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook')
     );
 }
@@ -698,7 +698,7 @@ 
                     );
 
                     // Exercise results
-                    $actions .='<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'.
+                    $actions .= '<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'.
                         Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>';
 
                     // Export
@@ -762,7 +762,7 @@ 
                         }
                     }
 
-                    $actions .='<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'.
+                    $actions .= '<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'.
                         Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>';
                     $actions .= Display::url(Display::return_icon('cd.gif', get_lang('CopyExercise')), '', array('onclick' => "javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'), ENT_QUOTES, $charset))." ".addslashes($row['title'])."?"."')) return false;", 'href' => 'exercise.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id']));
                 }
@@ -952,7 +952,7 @@ 
                 $item .= Display::tag('td', $actions, array('class' => 'td_actions'));
             } else {
                 if ($isDrhOfCourse) {
-                    $actions ='<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'.
+                    $actions = '<a href="exercise_report.php?'.api_get_cidreq().'&exerciseId='.$row['id'].'">'.
                         Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>';
                     $item .= Display::tag('td', $actions, array('class' => 'td_actions'));
                 }
@@ -962,7 +962,7 @@ 
                 'tr',
                 $item,
                 array(
-                    'id' => 'exercise_list_' . $my_exercise_id,
+                    'id' => 'exercise_list_'.$my_exercise_id,
                 )
             );
 
@@ -1033,7 +1033,7 @@ 
                 'adminhp.php?'.api_get_cidreq().'&hotpotatoesName='.$path
             );
 
-            $actions .='<a href="hotpotatoes_exercise_report.php?'.api_get_cidreq().'&path='.$path.'">'.
+            $actions .= '<a href="hotpotatoes_exercise_report.php?'.api_get_cidreq().'&path='.$path.'">'.
                 Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>';
 
             // if active
@@ -1042,7 +1042,7 @@ 
                 $actions .= '      <a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=disable&page='.$page.'&file='.$path.'">'.
                     Display::return_icon('visible.png', get_lang('Deactivate'), '', ICON_SIZE_SMALL).'</a>';
             } else { // else if not active
-                $actions .='    <a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=enable&page='.$page.'&file='.$path.'">'.
+                $actions .= '    <a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=enable&page='.$page.'&file='.$path.'">'.
                     Display::return_icon('invisible.png', get_lang('Activate'), '', ICON_SIZE_SMALL).'</a>';
             }
             $actions .= '<a href="'.$exercisePath.'?'.api_get_cidreq().'&hpchoice=delete&file='.$path.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('AreYouSureToDeleteJS'), ENT_QUOTES, $charset).' '.$title."?").'\')) return false;">'.
@@ -1075,7 +1075,7 @@ 
                 $item .= Display::tag('td', $attemptText);
 
                 if ($isDrhOfCourse) {
-                    $actions ='<a href="hotpotatoes_exercise_report.php?'.api_get_cidreq().'&path='.$path.'">'.
+                    $actions = '<a href="hotpotatoes_exercise_report.php?'.api_get_cidreq().'&path='.$path.'">'.
                         Display :: return_icon('test_results.png', get_lang('Results'), '', ICON_SIZE_SMALL).'</a>';
 
                     $item .= Display::tag('td', $actions, array('class' => 'td_actions'));

main/exercice/Draggable.php

Spacing +13 added lines, -13 removed lines

@@ -63,13 +63,13 @@ 
                 for ($i = 1; $i <= $answer->nbrAnswers; $i++) {
                     if ($answer->isCorrect($i)) {
                         $nb_matches++;
-                        $defaults['answer[' . $nb_matches . ']'] = $answer->selectAnswer($i);
-                        $defaults['weighting[' . $nb_matches . ']'] = float_format($answer->selectWeighting($i), 1);
+                        $defaults['answer['.$nb_matches.']'] = $answer->selectAnswer($i);
+                        $defaults['weighting['.$nb_matches.']'] = float_format($answer->selectWeighting($i), 1);
                         $answerInfo = $answer->getAnswerByAutoId($answer->correct[$i]);
-                        $defaults['matches[' . $nb_matches . ']'] = isset($answerInfo['answer']) ? $answerInfo['answer'] : '';
+                        $defaults['matches['.$nb_matches.']'] = isset($answerInfo['answer']) ? $answerInfo['answer'] : '';
                     } else {
                         $nb_options++;
-                        $defaults['option[' . $nb_options . ']'] = $answer->selectAnswer($i);
+                        $defaults['option['.$nb_options.']'] = $answer->selectAnswer($i);
                     }
                 }
             }
@@ -92,9 +92,9 @@ 
         $html = '<table class="table table-striped table-hover">
             <thead>
                 <tr>
-                    <th width="85%">' . get_lang('Answer') . '</th>
-                    <th width="15%">' . get_lang('MatchesTo') . '</th>
-                    <th width="10">' . get_lang('Weighting') . '</th>
+                    <th width="85%">' . get_lang('Answer').'</th>
+                    <th width="15%">' . get_lang('MatchesTo').'</th>
+                    <th width="10">' . get_lang('Weighting').'</th>
                 </tr>
             </thead>
             <tbody>';
@@ -189,9 +189,9 @@ 
         for ($i = 1; $i <= $nb_matches; ++$i) {
             $position++;
 
-            $answer = $form->getSubmitValue('answer[' . $i . ']');
-            $matches = $form->getSubmitValue('matches[' . $i . ']');
-            $weighting = $form->getSubmitValue('weighting[' . $i . ']');
+            $answer = $form->getSubmitValue('answer['.$i.']');
+            $matches = $form->getSubmitValue('matches['.$i.']');
+            $weighting = $form->getSubmitValue('weighting['.$i.']');
             $this->weighting += $weighting;
             $objAnswer->createAnswer(
                 $answer,
@@ -216,10 +216,10 @@ 
     public function return_header($feedback_type = null, $counter = null, $score = null)
     {
         $header = parent::return_header($feedback_type, $counter, $score);
-        $header .= '<table class="' . $this->question_table_class . '">
+        $header .= '<table class="'.$this->question_table_class.'">
             <tr>
-                <th>' . get_lang('ElementList') . '</th>
-                <th>' . get_lang('Status') . '</th>
+                <th>' . get_lang('ElementList').'</th>
+                <th>' . get_lang('Status').'</th>
             </tr>';
 
         return $header;

main/exercice/exercise_reminder.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 // notice for unauthorized people.
 api_protect_course_script(true);
 
-if ($debug>0) {
+if ($debug > 0) {
     error_log('Entered exercise_result.php: '.print_r($_POST, 1));
 }
 
@@ -93,7 +93,7 @@ 
 if (isset($_SESSION['exe_id'])) {
     $exe_id = intval($_SESSION['exe_id']);
 }
-$exercise_stat_info	= $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
+$exercise_stat_info = $objExercise->get_stat_track_exercise_info_by_exe_id($exe_id);
 if (!empty($exercise_stat_info['data_tracking'])) {
     $question_list = explode(',', $exercise_stat_info['data_tracking']);
 }
@@ -173,7 +173,7 @@ 
 $remind_list = $exercise_stat_info['questions_to_check'];
 $remind_list = explode(',', $remind_list);
 
-$exercise_result    = array();
+$exercise_result = array();
 
 foreach ($attempt_list as $question_id => $options) {
     foreach ($options as $item) {
@@ -204,10 +204,10 @@ 
     unset($objQuestionTmp);
 
     // creates a temporary Question object
-    $objQuestionTmp        = Question :: read($questionId);
+    $objQuestionTmp = Question :: read($questionId);
 
     $quesId         = $objQuestionTmp->selectId();
-    $check_id 		= 'remind_list['.$questionId.']';
+    $check_id = 'remind_list['.$questionId.']';
     $attributes     = array('id'=>$check_id, 'onclick'=>"save_remind_item(this, '$questionId');");
 
     if (in_array($questionId, $remind_list)) {
@@ -239,7 +239,7 @@ 
 echo Display::div($table, array('class'=>'span10'));
 
 $exercise_actions = Display::url(get_lang('EndTest'), 'javascript://', array('onclick'=>'final_submit();', 'class'=>'btn btn-warning'));
-$exercise_actions .=  ' '.Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();','class'=>'btn btn-success'));
+$exercise_actions .= ' '.Display::url(get_lang('ReviewQuestions'), 'javascript://', array('onclick'=>'review_questions();', 'class'=>'btn btn-success'));
 
 echo Display::div('', array('class'=>'clear'));
 echo Display::div($exercise_actions, array('class'=>'form-actions'));

main/exercice/exercise_result.class.php

Spacing +50 added lines, -50 removed lines

@@ -59,7 +59,7 @@ 
         $course_id = api_get_course_int_id();
         $user_id = intval($user_id);
         $sessionId = api_get_session_id();
-        $session_id_and = ' AND te.session_id = ' . $sessionId . ' ';
+        $session_id_and = ' AND te.session_id = '.$sessionId.' ';
         $exercise_id = intval($exercise_id);
 
         if (!empty($exercise_id)) {
@@ -92,9 +92,9 @@ 
                     te.c_id = ce.c_id $user_id_and  $session_id_and AND
                     ce.active <>-1";
 		} else {
-            $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
+            $user_id_and = ' AND te.exe_user_id = '.api_get_user_id().' ';
 			// get only this user's results
-            $sql="SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
+            $sql = "SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
                     official_code,
                     ce.title as extitle,
                     te.exe_result as exresult,
@@ -124,7 +124,7 @@ 
 		$results = array();
 		$resx = Database::query($sql);
         $bestAttemptPerUser = array();
-		while ($rowx = Database::fetch_array($resx,'ASSOC')) {
+		while ($rowx = Database::fetch_array($resx, 'ASSOC')) {
             if ($this->onlyBestAttempts) {
                 if (!isset($bestAttemptPerUser[$rowx['excruid']])) {
                     $bestAttemptPerUser[$rowx['excruid']] = $rowx;
@@ -192,7 +192,7 @@ 
 
 				$return[$i] = array();
 				if (empty($user_id)) {
-                    $return[$i]['official_code']   = $result['official_code'];
+                    $return[$i]['official_code'] = $result['official_code'];
                     if (api_is_western_name_order()) {
                         $return[$i]['first_name']   = $results[$i]['userpart1'];
                         $return[$i]['last_name']    = $results[$i]['userpart2'];
@@ -236,7 +236,7 @@ 
                         $isWestern = api_is_western_name_order();
 
                         if (empty($user_id)) {
-                            $return[$i]['official_code']   = $student['official_code'];
+                            $return[$i]['official_code'] = $student['official_code'];
                             if ($isWestern) {
                                 $return[$i]['first_name']   = $student['firstname'];
                                 $return[$i]['last_name']    = $student['lastname'];
@@ -289,22 +289,22 @@ 
 		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
 
 		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if(!empty($user_id)) {
+		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'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
         } else {
-            if(!empty($this->results[0]['last_name'])) {
+            if (!empty($this->results[0]['last_name'])) {
                 $data .= get_lang('LastName').';';
             }
-            if(!empty($this->results[0]['first_name'])) {
+            if (!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
             }
         }
@@ -318,17 +318,17 @@ 
 
 		if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+			$extra_user_fields = UserManager::get_extra_fields(0, 1000, 5, 'ASC', false, 1);
 			$num = count($extra_user_fields);
-			foreach($extra_user_fields as $field) {
-				$data .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
+			foreach ($extra_user_fields as $field) {
+				$data .= '"'.str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset)).'";';
 			}
 		}
 
 		$data .= get_lang('Title').';';
 		$data .= get_lang('StartDate').';';
         $data .= get_lang('EndDate').';';
-        $data .= get_lang('Duration'). ' ('.get_lang('MinMinutes').') ;';
+        $data .= get_lang('Duration').' ('.get_lang('MinMinutes').') ;';
 		$data .= get_lang('Score').';';
 		$data .= get_lang('Total').';';
         $data .= get_lang('Status').';';
@@ -340,37 +340,37 @@ 
 		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)).';';
             }
 
             if ($officialCodeInList) {
                 $data .= $row['official_code'].';';
             }
 
-            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
-            $data .= str_replace("\r\n",'  ',implode(", ", GroupManager :: get_user_group_name($row['user_id']))).';';
+            $data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n", '  ', implode(", ", GroupManager :: get_user_group_name($row['user_id']))).';';
 
 			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) {
-					$data .= '"'.str_replace('"','""',api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
+				$user_fields_values = UserManager::get_extra_user_data($row['user_id'], false, false, false, true);
+				foreach ($user_fields_values as $value) {
+					$data .= '"'.str_replace('"', '""', api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset)).'";';
 				}
 			}
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['start_date']).';';
-            $data .= str_replace("\r\n",'  ',$row['end_date']).';';
-            $data .= str_replace("\r\n",'  ',$row['duration']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-            $data .= str_replace("\r\n",'  ',$row['status']).';';
-            $data .= str_replace("\r\n",'  ',$row['lp_name']).';';
-            $data .= str_replace("\r\n",'  ',$row['is_user_subscribed']).';';
+			$data .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+			$data .= str_replace("\r\n", '  ', $row['start_date']).';';
+            $data .= str_replace("\r\n", '  ', $row['end_date']).';';
+            $data .= str_replace("\r\n", '  ', $row['duration']).';';
+			$data .= str_replace("\r\n", '  ', $row['result']).';';
+			$data .= str_replace("\r\n", '  ', $row['max']).';';
+            $data .= str_replace("\r\n", '  ', $row['status']).';';
+            $data .= str_replace("\r\n", '  ', $row['lp_name']).';';
+            $data .= str_replace("\r\n", '  ', $row['is_user_subscribed']).';';
 			$data .= "\n";
 		}
 
@@ -434,14 +434,14 @@ 
 
 		if ($with_column_user) {
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
+    			$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
     			$column++;
-                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
             } else {
-                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('LastName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('LastName'));
                 $column++;
-                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('FirstName'));
                 $column++;
             }
 
@@ -458,11 +458,11 @@ 
 
 		if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+			$extra_user_fields = UserManager::get_extra_fields(0, 1000, 5, 'ASC', false, 1);
 
 			//show the fields names for user fields
 			foreach ($extra_user_fields as $field) {
-				$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+				$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
 				$column++;
 			}
 		}
@@ -491,39 +491,39 @@ 
 
             if ($with_column_user) {
                 if (api_is_western_name_order()) {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
                 } else {
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset));
                     $column++;
-                    $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
 
                 if ($officialCodeInList === 'true') {
-                    $worksheet->SetCellValueByColumnAndRow($line, $column,api_html_entity_decode(strip_tags($row['official_code']), ENT_QUOTES, $charset));
+                    $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['official_code']), ENT_QUOTES, $charset));
                     $column++;
                 }
 
-                $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
+                $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset));
                 $column++;
 			}
 
-            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags(implode(", ", GroupManager :: get_user_group_name($row['user_id']))), ENT_QUOTES, $charset));
+            $worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags(implode(", ", GroupManager :: get_user_group_name($row['user_id']))), ENT_QUOTES, $charset));
             $column++;
 
 			if ($export_user_fields) {
 				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+				$user_fields_values = UserManager::get_extra_user_data($row['user_id'], false, false, false, true);
+				foreach ($user_fields_values as $value) {
+					$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
 					$column++;
 				}
 			}
 
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+			$worksheet->SetCellValueByColumnAndRow($line, $column, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
 			$column++;
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['start_date']);
             $column++;

main/exercice/upload_exercise.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 require_once '../inc/global.inc.php';
 
-require_once api_get_path(LIBRARY_PATH) . 'pear/excelreader/reader.php';
+require_once api_get_path(LIBRARY_PATH).'pear/excelreader/reader.php';
 
 // Security check
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -59,14 +59,14 @@ 
 function lp_upload_quiz_actions()
 {
     $return = '<a href="exercise.php?'.api_get_cidReq().'">'.
-        Display::return_icon('back.png', get_lang('BackToExercisesList'),'',ICON_SIZE_MEDIUM).'</a>';
+        Display::return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
     return $return;
 }
 
 function lp_upload_quiz_secondary_actions()
 {
-    $return = '<a href="exercise_report.php?' . api_get_cidreq() . '">' .
-        Display :: return_icon('reporting32.png', get_lang('Tracking')) . get_lang('Tracking') . '</a>';
+    $return = '<a href="exercise_report.php?'.api_get_cidreq().'">'.
+        Display :: return_icon('reporting32.png', get_lang('Tracking')).get_lang('Tracking').'</a>';
     return $return;
 }
 
@@ -104,7 +104,7 @@ 
     $table->setHeaderContents(0, 1, '#');
 
     $row = 1;
-    foreach ($tableList as $key => $label ) {
+    foreach ($tableList as $key => $label) {
         $table->setCellContents($row, 0, $label);
         $table->setCellContents($row, 1, $key);
         $row++;
@@ -443,7 +443,7 @@ 
                                     $comment = $feedback_true_list[$i][2];
                                 } else {
                                     $comment = $feedback_false_list[$i][2];
-                                    $floatVal = (float)$answer_data[3];
+                                    $floatVal = (float) $answer_data[3];
                                     if (is_numeric($floatVal)) {
                                         $score = $answer_data[3];
                                     }

main/exercice/export/qti2/qti2_export.php

Spacing +23 added lines, -23 removed lines

@@ -8,7 +8,7 @@ 
 /**
  * Code
  */
-require dirname(__FILE__) . '/qti2_classes.php';
+require dirname(__FILE__).'/qti2_classes.php';
 /**
  * Classes
 */
@@ -38,7 +38,7 @@ 
      {
         $this->question = $question;
         $this->answer = $this->question->setAnswer();
-        $this->questionIdent = "QST_" . $question->id ;
+        $this->questionIdent = "QST_".$question->id;
      }
 
      /**
@@ -73,7 +73,7 @@ 
       */
      function start_item_body()
      {
-        return '  <itemBody>' . "\n";
+        return '  <itemBody>'."\n";
      }
 
      /**
@@ -92,7 +92,7 @@ 
 
       function add_response_processing()
       {
-          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>' . "\n";
+          return '  <responseProcessing template="http://www.imsglobal.org/question/qti_v2p1/rptemplates/map_correct"/>'."\n";
       }
 
      /**
@@ -108,7 +108,7 @@ 
         $head = $foot = "";
 
         if ($standalone) {
-            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . "\n";
+            $head = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'."\n";
         }
         //TODO understand why answer might be a non-object sometimes
         if (!is_object($this->answer)) {
@@ -164,7 +164,7 @@ 
 
     function start_section()
     {
-        $out = '<section ident="EXO_' . $this->exercise->selectId() . '" title="' .cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())) . '">' . "\n";
+        $out = '<section ident="EXO_'.$this->exercise->selectId().'" title="'.cleanAttribute(formatExerciseQtiDescription($this->exercise->selectTitle())).'">'."\n";
         return $out;
     }
 
@@ -180,7 +180,7 @@ 
             // return exercise duration in ISO8601 format.
             $minutes = floor($max_time / 60);
             $seconds = $max_time % 60;
-            return '<duration>PT' . $minutes . 'M' . $seconds . "S</duration>\n";
+            return '<duration>PT'.$minutes.'M'.$seconds."S</duration>\n";
         } else {
             return '';
         }
@@ -193,7 +193,7 @@ 
     function export_presentation()
     {
         $out = "<presentation_material><flow_mat><material>\n"
-             . "  <mattext><![CDATA[" . formatExerciseQtiDescription($this->exercise->selectDescription()) . "]]></mattext>\n"
+             . "  <mattext><![CDATA[".formatExerciseQtiDescription($this->exercise->selectDescription())."]]></mattext>\n"
              . "</material></flow_mat></presentation_material>\n";
         return $out;
     }
@@ -207,14 +207,14 @@ 
     {
         $out = '';
         if ($n = $this->exercise->getShuffle()) {
-            $out.= "<selection_ordering>"
+            $out .= "<selection_ordering>"
                  . "  <selection>\n"
-                 . "    <selection_number>" . $n . "</selection_number>\n"
+                 . "    <selection_number>".$n."</selection_number>\n"
                  . "  </selection>\n"
                  . '  <order order_type="Random" />'
                  . "\n</selection_ordering>\n";
         } else {
-            $out.= '<selection_ordering sequence_type="Normal">' . "\n"
+            $out .= '<selection_ordering sequence_type="Normal">'."\n"
                  . "  <selection />\n"
                  . "</selection_ordering>\n";
         }
@@ -246,8 +246,8 @@ 
     {
         $head = $foot = "";
         if ($standalone) {
-            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+            $head = '<?xml version = "1.0" encoding = "UTF-8" standalone = "no"?>'."\n"
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
                   . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
@@ -308,7 +308,7 @@ 
      {
         $this->question = $question;
         $this->answer = $question->answer;
-        $this->questionIdent = "QST_" . $question->selectId() ;
+        $this->questionIdent = "QST_".$question->selectId();
      }
 
      /**
@@ -320,7 +320,7 @@ 
       */
       function start_item()
       {
-        return '<item title="' . cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())) . '" ident="' . $this->questionIdent . '">' . "\n";
+        return '<item title="'.cleanAttribute(formatExerciseQtiDescription($this->question->selectTitle())).'" ident="'.$this->questionIdent.'">'."\n";
       }
 
       /**
@@ -343,8 +343,8 @@ 
       */
      function start_presentation()
      {
-        return '<presentation label="' . $this->questionIdent . '"><flow>' . "\n"
-             . '<material><mattext>' . formatExerciseQtiDescription($this->question->selectDescription()) . "</mattext></material>\n";
+        return '<presentation label="'.$this->questionIdent.'"><flow>'."\n"
+             . '<material><mattext>'.formatExerciseQtiDescription($this->question->selectDescription())."</mattext></material>\n";
      }
 
      /**
@@ -364,7 +364,7 @@ 
       */
      function start_processing()
      {
-        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>' . "\n";
+        return '<resprocessing><outcomes><decvar vartype="Integer" defaultval="0" /></outcomes>'."\n";
      }
 
      /**
@@ -392,8 +392,8 @@ 
         $head = $foot = "";
 
         if ($standalone) {
-            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>' . "\n"
-                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">' . "\n"
+            $head = '<?xml version = "1.0" encoding = "'.$charset.'" standalone = "no"?>'."\n"
+                  . '<!DOCTYPE questestinterop SYSTEM "ims_qtiasiv2p1.dtd">'."\n"
                   . "<questestinterop>\n";
             $foot = "</questestinterop>\n";
         }
@@ -447,9 +447,9 @@ 
     $question->type = $qst->type;
     $question->question = $qst->question;
     $question->description = $qst->description;
-	$question->weighting=$qst->weighting;
-	$question->position=$qst->position;
-	$question->picture=$qst->picture;
+	$question->weighting = $qst->weighting;
+	$question->position = $qst->position;
+	$question->picture = $qst->picture;
     $ims = new ImsAssessmentItem($question);
 
     return $ims->export($standalone);

main/exercice/export/qti2/qti2_classes.php

Spacing +58 added lines, -58 removed lines

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

main/exercice/export/exercise_import.inc.php

Spacing +18 added lines, -18 removed lines

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