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 .= " | ";

Indentation +68 added lines, -68 removed lines

@@ -728,43 +728,43 @@ 
     }
 
     /**
-    * Return an array of student state answers for fill the blank questions
-    * for each students that answered the question
-    * -2  : didn't answer
-    * -1  : student answer is wrong
-    *  0  : student answer is correct
-    * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
-    *
-    * @param integer $testId
-    * @param integer $questionId
-    * @param $studentsIdList
-    * @param string $startDate
-    * @param string $endDate
-    * @param bool $useLastAnswerredAttempt
-    * @return array
-    * (
-    *     [student_id] => Array
-    *         (
-    *             [first fill the blank for question] => -1
-    *             [second fill the blank for question] => 2
-    *             [third fill the blank for question] => -1
-    *         )
-    * )
-    */
+     * Return an array of student state answers for fill the blank questions
+     * for each students that answered the question
+     * -2  : didn't answer
+     * -1  : student answer is wrong
+     *  0  : student answer is correct
+     * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
+     *
+     * @param integer $testId
+     * @param integer $questionId
+     * @param $studentsIdList
+     * @param string $startDate
+     * @param string $endDate
+     * @param bool $useLastAnswerredAttempt
+     * @return array
+     * (
+     *     [student_id] => Array
+     *         (
+     *             [first fill the blank for question] => -1
+     *             [second fill the blank for question] => 2
+     *             [third fill the blank for question] => -1
+     *         )
+     * )
+     */
     public static function getFillTheBlankTabResult($testId, $questionId, $studentsIdList, $startDate, $endDate, $useLastAnswerredAttempt = true) {
 
-       $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-       $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-       $courseId = api_get_course_int_id();
+        $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+        $courseId = api_get_course_int_id();
 
-       require_once api_get_path(SYS_PATH).'main/exercice/fill_blanks.class.php';
+        require_once api_get_path(SYS_PATH).'main/exercice/fill_blanks.class.php';
 
-       // request to have all the answers of student for this question
-       // student may have doing it several time
-       // student may have not answered the bracket id, in this case, is result of the answer is empty
+        // request to have all the answers of student for this question
+        // student may have doing it several time
+        // student may have not answered the bracket id, in this case, is result of the answer is empty
 
-       // we got the less recent attempt first
-       $sql = '
+        // we got the less recent attempt first
+        $sql = '
            SELECT * FROM '.$tblTrackEAttempt.' tea
 
            LEFT JOIN '.$tblTrackEExercise.' tee
@@ -780,49 +780,49 @@ 
            ORDER BY user_id, tea.exe_id;
        ';
 
-       $res = Database::query($sql);
-       $tabUserResult = array();
-       $bracketNumber = 0;
-       // foreach attempts for all students starting with his older attempt
-       while ($data = Database::fetch_array($res)) {
-           $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
+        $res = Database::query($sql);
+        $tabUserResult = array();
+        $bracketNumber = 0;
+        // foreach attempts for all students starting with his older attempt
+        while ($data = Database::fetch_array($res)) {
+            $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
 
-           // for each bracket to find in this question
-           foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
+            // for each bracket to find in this question
+            foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
 
-               if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
-                   // student has answered this bracket, cool
-                   switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
-                       case self::FILL_THE_BLANK_MENU :
+                if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
+                    // student has answered this bracket, cool
+                    switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
+                        case self::FILL_THE_BLANK_MENU :
                            // get the indice of the choosen answer in the menu
                            // we know that the right answer is the first entry of the menu, ie 0
                            // (remember, menu entries are shuffled when taking the test)
                            $tabUserResult[$data['user_id']][$bracketNumber] = FillBlanks::getFillTheBlankMenuAnswerNum($tabAnswer['tabwords'][$bracketNumber], $tabAnswer['studentanswer'][$bracketNumber]);
-                           break;
-                       default :
+                            break;
+                        default :
                            if (FillBlanks::isGoodStudentAnswer($tabAnswer['studentanswer'][$bracketNumber], $tabAnswer['tabwords'][$bracketNumber])) {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
-                           } else {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
-                           }
-                   }
-               } else {
-                   // student didn't answer this bracket
-                   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
-                       }
-                   } else {
-                       // we take the last attempt, even if the student answer the question before
-                       $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
-                   }
-               }
-           }
-
-
-       }
-       return $tabUserResult;
+                                $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
+                            } else {
+                                $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
+                            }
+                    }
+                } else {
+                    // student didn't answer this bracket
+                    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
+                        }
+                    } else {
+                        // we take the last attempt, even if the student answer the question before
+                        $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                    }
+                }
+            }
+
+
+        }
+        return $tabUserResult;
     }
 
 

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_admin.php

Braces +3 added lines, -2 removed lines

@@ -171,10 +171,11 @@
     }
     echo '</div>';
 
-    if ($objExercise->feedback_type == 1)
-        Display::display_normal_message(
+    if ($objExercise->feedback_type == 1) {
+            Display::display_normal_message(
             get_lang('DirectFeedbackCantModifyTypeQuestion')
         );
+    }
 
     if (api_get_setting('search_enabled')=='true' && !extension_loaded('xapian')) {
         Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
 
-if (!api_is_allowed_to_edit(null,true)) {
+if (!api_is_allowed_to_edit(null, true)) {
     api_not_allowed(true);
 }
 
@@ -166,8 +166,8 @@ 
         $gradebook = $_SESSION['gradebook'];
     }
 
-    if (!empty($gradebook) && $gradebook=='view') {
-        $interbreadcrumb[]= array (
+    if (!empty($gradebook) && $gradebook == 'view') {
+        $interbreadcrumb[] = array(
             'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
             'name' => get_lang('ToolGradebook')
         );
@@ -187,19 +187,19 @@ 
     echo '<div class="actions">';
 
     if ($objExercise->id != 0) {
-        echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">' .
+        echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
             Display :: return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
     } else {
-        if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])){
-            if (!empty($_POST['lp_id'])){
+        if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])) {
+            if (!empty($_POST['lp_id'])) {
                 $lp_id = intval($_POST['lp_id']);
                 //TODO:this remains to be implemented after press the first post
             } else {
                 $lp_id = intval($_GET['lp_id']);
             }
-            echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-2\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'',ICON_SIZE_MEDIUM)."</a>";
+            echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-2\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"), '', ICON_SIZE_MEDIUM)."</a>";
         } else {
-            echo '<a href="exercise.php?'.api_get_cidreq().'">' .
+            echo '<a href="exercise.php?'.api_get_cidreq().'">'.
                 Display :: return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).
                 '</a>';
         }
@@ -211,7 +211,7 @@ 
             get_lang('DirectFeedbackCantModifyTypeQuestion')
         );
 
-    if (api_get_setting('search_enabled')=='true' && !extension_loaded('xapian')) {
+    if (api_get_setting('search_enabled') == 'true' && !extension_loaded('xapian')) {
         Display::display_error_message(get_lang('SearchXapianModuleNotInstalled'));
     }
 

main/exercice/exercise_reminder.php

Indentation +3 added lines, -3 removed lines

@@ -223,10 +223,10 @@
 
     $counter++;
     if ($objExercise->type == ONE_PER_PAGE) {
-       $question_title = Display::url($counter.'. '.cut($objQuestionTmp->selectTitle(), 40), $url);
-       $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
+        $question_title = Display::url($counter.'. '.cut($objQuestionTmp->selectTitle(), 40), $url);
+        $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
     } else {
-       $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
+        $question_title = $counter.'. '.cut($objQuestionTmp->selectTitle(), 40);
     }
     //Check if the question doesn't have an answer
     if (!in_array($questionId, $exercise_result)) {

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.php

Indentation +15 added lines, -15 removed lines

@@ -59,7 +59,7 @@ 
 
 $gradebook = '';
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	$_SESSION['gradebook'];
+    $gradebook=	$_SESSION['gradebook'];
 }
 if (!empty($gradebook) && $gradebook=='view') {
     $interbreadcrumb[] = array(
@@ -79,8 +79,8 @@ 
 $htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
 
 if ($origin != 'learnpath') {
-	// So we are not in learnpath tool
-	Display::display_header($nameTools, get_lang('Exercise'));
+    // So we are not in learnpath tool
+    Display::display_header($nameTools, get_lang('Exercise'));
 } else {
     $htmlHeadXtra[] = "
     <style>
@@ -94,19 +94,19 @@ 
 
 // I'm in a preview mode as course admin. Display the action menu.
 if (api_is_course_admin() && $origin != 'learnpath') {
-	echo '<div class="actions">';
-	echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
+    echo '<div class="actions">';
+    echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'.
         Display::return_icon('back.png', get_lang('GoBackToQuestionList'), array(), 32).'</a>';
-	echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
+    echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
         Display::return_icon('edit.png', get_lang('ModifyExercise'), array(), 32).'</a>';
-	echo '</div>';
+    echo '</div>';
 }
 
 $feedback_type = $objExercise->feedback_type;
 $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']);
+    $question_list = explode(',', $exercise_stat_info['data_tracking']);
 }
 
 $learnpath_id = $exercise_stat_info['orig_lp_id'];
@@ -180,19 +180,19 @@ 
         Session::erase('exe_id');
     }
 
-	Display::display_footer();
+    Display::display_footer();
 } else {
-	$lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
-	$url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
-	$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
+    $lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
+    $url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
+    $href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
 
     if (api_is_allowed_to_session_edit()) {
         Session::erase('objExercise');
         Session::erase('exe_id');
     }
 
-	// Record the results in the learning path, using the SCORM interface (API)
-	echo "<script>window.parent.API.void_save_asset('$total_score', '$max_score', 0, 'completed');</script>";
+    // Record the results in the learning path, using the SCORM interface (API)
+    echo "<script>window.parent.API.void_save_asset('$total_score', '$max_score', 0, 'completed');</script>";
     echo '<script type="text/javascript">'.$href.'</script>';
-	echo '</body></html>';
+    echo '</body></html>';
 }

Spacing +6 added lines, -6 removed lines

@@ -59,9 +59,9 @@ 
 
 $gradebook = '';
 if (isset($_SESSION['gradebook'])) {
-	$gradebook=	$_SESSION['gradebook'];
+	$gradebook = $_SESSION['gradebook'];
 }
-if (!empty($gradebook) && $gradebook=='view') {
+if (!empty($gradebook) && $gradebook == 'view') {
     $interbreadcrumb[] = array(
         'url' => '../gradebook/'.$_SESSION['gradebook_dest'],
         'name' => get_lang('ToolGradebook'),
@@ -75,8 +75,8 @@ 
     "name" => get_lang('Exercises'),
 );
 
-$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/js/hotspot.js"></script>';
-$htmlHeadXtra[] = '<link rel="stylesheet" href="' . api_get_path(WEB_LIBRARY_JS_PATH) . 'hotspot/css/hotspot.css">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/js/hotspot.js"></script>';
+$htmlHeadXtra[] = '<link rel="stylesheet" href="'.api_get_path(WEB_LIBRARY_JS_PATH).'hotspot/css/hotspot.css">';
 
 if ($origin != 'learnpath') {
 	// So we are not in learnpath tool
@@ -154,7 +154,7 @@ 
 
 $max_score = $objExercise->get_max_score();
 
-Display::display_normal_message(get_lang('Saved').'<br />',false);
+Display::display_normal_message(get_lang('Saved').'<br />', false);
 
 // Display and save questions
 ExerciseLib::display_question_list_by_attempt($objExercise, $exe_id, true);
@@ -186,7 +186,7 @@ 
 } else {
 	$lp_mode = isset($_SESSION['lp_mode']) ? $_SESSION['lp_mode'] : null;
 	$url = '../newscorm/lp_controller.php?cidReq='.api_get_course_id().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type;
-	$href = ($lp_mode == 'fullscreen')?' window.opener.location.href="'.$url.'" ':' top.location.href="'.$url.'"';
+	$href = ($lp_mode == 'fullscreen') ? ' window.opener.location.href="'.$url.'" ' : ' top.location.href="'.$url.'"';
 
     if (api_is_allowed_to_session_edit()) {
         Session::erase('objExercise');

main/exercice/exercise_result.class.php

Indentation +157 added lines, -157 removed lines

@@ -9,7 +9,7 @@ 
 */
 class ExerciseResult
 {
-	private $results = array();
+    private $results = array();
     public $includeAllUsers = false;
     public $onlyBestAttempts = false;
 
@@ -46,7 +46,7 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		$return = array();
+        $return = array();
 
         $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST);
         $TBL_TABLE_LP_MAIN = Database::get_course_table(TABLE_LP_MAIN);
@@ -66,9 +66,9 @@ 
             $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
-		if (empty($user_id)) {
+        if (empty($user_id)) {
             $user_id_and = null;
-			$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 ,
@@ -91,9 +91,9 @@ 
                     te.status != 'incomplete' AND
                     te.c_id = ce.c_id $user_id_and  $session_id_and AND
                     ce.active <>-1";
-		} else {
+        } else {
             $user_id_and = ' AND te.exe_user_id = ' . api_get_user_id() . ' ';
-			// get only this user's results
+            // get only this user's results
             $sql="SELECT ".(api_is_western_name_order() ? "firstname as userpart1, lastname userpart2" : "lastname as userpart1, firstname as userpart2").",
                     official_code,
                     ce.title as extitle,
@@ -119,12 +119,12 @@ 
                         te.c_id = ce.c_id $user_id_and $session_id_and AND
                         ce.active <>-1 AND
                     ORDER BY userpart2, te.c_id ASC, ce.title ASC, te.exe_date DESC";
-		}
+        }
 
-		$results = array();
-		$resx = Database::query($sql);
+        $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;
@@ -136,7 +136,7 @@ 
             } else {
                 $results[] = $rowx;
             }
-		}
+        }
 
         if ($this->onlyBestAttempts) {
             $results = $bestAttemptPerUser;
@@ -190,8 +190,8 @@ 
                     continue;
                 }
 
-				$return[$i] = array();
-				if (empty($user_id)) {
+                $return[$i] = array();
+                if (empty($user_id)) {
                     $return[$i]['official_code']   = $result['official_code'];
                     if (api_is_western_name_order()) {
                         $return[$i]['first_name']   = $results[$i]['userpart1'];
@@ -200,15 +200,15 @@ 
                         $return[$i]['first_name']   = $results[$i]['userpart2'];
                         $return[$i]['last_name']    = $results[$i]['userpart1'];
                     }
-					$return[$i]['user_id']      = $results[$i]['excruid'];
-					$return[$i]['email']        = $results[$i]['exemail'];
-				}
-				$return[$i]['title'] = $result['extitle'];
-				$return[$i]['start_date'] = api_get_local_time($result['exstart']);
+                    $return[$i]['user_id']      = $results[$i]['excruid'];
+                    $return[$i]['email']        = $results[$i]['exemail'];
+                }
+                $return[$i]['title'] = $result['extitle'];
+                $return[$i]['start_date'] = api_get_local_time($result['exstart']);
                 $return[$i]['end_date'] = api_get_local_time($result['exdate']);
                 $return[$i]['duration'] = $result['duration'];
-				$return[$i]['result'] = $result['exresult'];
-				$return[$i]['max'] = $result['exweight'];
+                $return[$i]['result'] = $result['exresult'];
+                $return[$i]['max'] = $result['exweight'];
                 $return[$i]['status'] = $revised ? get_lang('Validated') : get_lang('NotValidated');
                 $return[$i]['lp_id'] = $result['orig_lp_id'];
                 $return[$i]['lp_name'] = $result['lp_name'];
@@ -221,8 +221,8 @@ 
 
                 $userWithResults[$result['excruid']] = 1;
                 $i++;
-			}
-		}
+            }
+        }
 
         if ($this->includeAllUsers) {
             $latestId = count($return);
@@ -265,18 +265,18 @@ 
             }
         }
 
-		$this->results = $return;
+        $this->results = $return;
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportCSV(
         $document_path = '',
         $user_id = null,
@@ -285,14 +285,14 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if(!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if(!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
         if (api_is_western_name_order()) {
             if(!empty($this->results[0]['first_name'])) {
                 $data .= get_lang('FirstName').';';
@@ -316,28 +316,28 @@ 
         $data .= get_lang('Email').';';
         $data .= get_lang('Groups').';';
 
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
-			$num = count($extra_user_fields);
-			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').';';
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+            $num = count($extra_user_fields);
+            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('Score').';';
-		$data .= get_lang('Total').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
         $data .= get_lang('Status').';';
         $data .= get_lang('ToolLearnpath').';';
         $data .= get_lang('UserIsCurrentlySubscribed').';';
-		$data .= "\n";
+        $data .= "\n";
 
-		//results
-		foreach ($this->results as $row) {
+        //results
+        foreach ($this->results as $row) {
 
             if (api_is_western_name_order()) {
                 $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
@@ -354,51 +354,51 @@ 
             $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)).'";';
-				}
-			}
+            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)).'";';
+                }
+            }
 
-			$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",'  ',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['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";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		}
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $data .= "\n";
+        }
+
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -407,35 +407,35 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
         $officialCodeInList = api_get_setting('show_official_code_exercise_result_list');
 
-		if ($with_column_user) {
+        if ($with_column_user) {
             if (api_is_western_name_order()) {
-    			$worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
-    			$column++;
+                $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('FirstName'));
+                $column++;
                 $worksheet->SetCellValueByColumnAndRow($line, $column,get_lang('LastName'));
                 $column++;
             } else {
@@ -451,43 +451,43 @@ 
             }
 
             $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Email'));
-		    $column++;
-		}
+            $column++;
+        }
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Groups'));
-	    $column++;
-
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
-
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
-				$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
-				$column++;
-			}
-		}
-
-		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Title'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('StartDate'));
+        $column++;
+
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
+                $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES, $charset));
+                $column++;
+            }
+        }
+
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Title'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('StartDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('EndDate'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Score'));
-		$column++;
-		$worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Score'));
+        $column++;
+        $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Total'));
+        $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Status'));
-		$column++;
+        $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('ToolLearnpath'));
         $column++;
         $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('UserIsCurrentlySubscribed'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 if (api_is_western_name_order()) {
@@ -509,22 +509,22 @@ 
 
                 $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));
             $column++;
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
-
-			$worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $worksheet->SetCellValueByColumnAndRow($line,$column, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
+
+            $worksheet->SetCellValueByColumnAndRow($line,$column,api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['start_date']);
             $column++;
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['end_date']);
@@ -540,14 +540,14 @@ 
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['lp_name']);
             $column++;
             $worksheet->SetCellValueByColumnAndRow($line, $column, $row['is_user_subscribed']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }

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/addlimits.php

Spacing +9 added lines, -9 removed lines

@@ -51,24 +51,24 @@ 
     $objExercise = $_SESSION['objExercise'];
 }
 $exercise_id = intval($_GET['exercise_id']);
-$is_allowedToEdit=$is_courseAdmin;
+$is_allowedToEdit = $is_courseAdmin;
 
-if (isset($_SESSION['gradebook'])){
-	$gradebook=	$_SESSION['gradebook'];
+if (isset($_SESSION['gradebook'])) {
+	$gradebook = $_SESSION['gradebook'];
 }
 
-if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array (
+if (!empty($gradebook) && $gradebook == 'view') {
+	$interbreadcrumb[] = array(
 			'url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),
 			'name' => get_lang('ToolGradebook')
 		);
 }
-$nameTools=get_lang('Exercises');
+$nameTools = get_lang('Exercises');
 $interbreadcrumb[] = array(
     "url" => "exercise.php",
     "name" => get_lang('Exercises'),
 );
-Display::display_header($nameTools,"Exercises");
+Display::display_header($nameTools, "Exercises");
 
 if (isset($_POST['ok'])) {
 	$message = get_lang('TestLimitsAdded');
@@ -140,7 +140,7 @@ 
  */
 if (isset($_POST['ok'])) {
 	$exercise_id = intval($_POST['exe_id']);
-	if ($_POST['limit']==1) {
+	if ($_POST['limit'] == 1) {
 		$minutes = intval($_POST['minutes']);
 		$query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= $minutes WHERE id= $exercise_id";
 		Database::query($query);
@@ -149,7 +149,7 @@ 
 		Database::query($query);
 	}
 
-	if ($_POST['attempt']==1) {
+	if ($_POST['attempt'] == 1) {
 		$attempts = intval($_POST['attempts']);
 		$query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = $attempts WHERE id= $exercise_id";
 		Database::query($query);

Indentation +24 added lines, -24 removed lines

@@ -54,14 +54,14 @@ 
 $is_allowedToEdit=$is_courseAdmin;
 
 if (isset($_SESSION['gradebook'])){
-	$gradebook=	$_SESSION['gradebook'];
+    $gradebook=	$_SESSION['gradebook'];
 }
 
 if (!empty($gradebook) && $gradebook=='view') {
-	$interbreadcrumb[]= array (
-			'url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),
-			'name' => get_lang('ToolGradebook')
-		);
+    $interbreadcrumb[]= array (
+            'url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),
+            'name' => get_lang('ToolGradebook')
+        );
 }
 $nameTools=get_lang('Exercises');
 $interbreadcrumb[] = array(
@@ -71,8 +71,8 @@ 
 Display::display_header($nameTools,"Exercises");
 
 if (isset($_POST['ok'])) {
-	$message = get_lang('TestLimitsAdded');
-	Display::display_normal_message($message);
+    $message = get_lang('TestLimitsAdded');
+    Display::display_normal_message($message);
 }
 ?>
 <script type="text/javascript">
@@ -139,22 +139,22 @@ 
  * @todo shouldn't this be moved to the part above (around line 111: action handling)
  */
 if (isset($_POST['ok'])) {
-	$exercise_id = intval($_POST['exe_id']);
-	if ($_POST['limit']==1) {
-		$minutes = intval($_POST['minutes']);
-		$query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= $minutes WHERE id= $exercise_id";
-		Database::query($query);
-	} else {
-		$query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= 0 WHERE id= $exercise_id";
-		Database::query($query);
-	}
+    $exercise_id = intval($_POST['exe_id']);
+    if ($_POST['limit']==1) {
+        $minutes = intval($_POST['minutes']);
+        $query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= $minutes WHERE id= $exercise_id";
+        Database::query($query);
+    } else {
+        $query = "UPDATE ".$TBL_EXERCISES." SET ques_time_limit= 0 WHERE id= $exercise_id";
+        Database::query($query);
+    }
 
-	if ($_POST['attempt']==1) {
-		$attempts = intval($_POST['attempts']);
-		$query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = $attempts WHERE id= $exercise_id";
-		Database::query($query);
-	} else {
-		$query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = 0 WHERE id= $exercise_id";
-		Database::query($query);
-	}
+    if ($_POST['attempt']==1) {
+        $attempts = intval($_POST['attempts']);
+        $query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = $attempts WHERE id= $exercise_id";
+        Database::query($query);
+    } else {
+        $query = "UPDATE ".$TBL_EXERCISES." SET num_attempts = 0 WHERE id= $exercise_id";
+        Database::query($query);
+    }
 }

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];
                                     }