chamilo / chamilo-lms

main/inc/lib/exercise.lib.php

Doc Comments +9 added lines, -6 removed lines

@@ -1255,6 +1255,7 @@ 
 
     /**
      * Validates the time control key
+     * @param integer $exercise_id
      */
     public static function exercise_time_control_is_valid(
         $exercise_id,
@@ -1388,7 +1389,7 @@ 
      * @param int $in_direction
      * @param string $in_hotpot_path
      * @param bool $in_get_count
-     * @param null $where_condition
+     * @param string $where_condition
      * @return array|int
      */
     public static function get_exam_results_hotpotatoes_data(
@@ -2179,7 +2180,7 @@ 
     /**
      * Return true if pass_pourcentage activated (we use the pass pourcentage feature
      * return false if pass_percentage = 0 (we don't use the pass pourcentage feature
-     * @param $in_pass_pourcentage
+     * @param string $in_pass_pourcentage
      * @return boolean
      * In this version, pass_percentage and show_success_message are disabled if
      * pass_percentage is set to 0
@@ -2192,7 +2193,7 @@ 
     /**
      * Converts a numeric value in a percentage example 0.66666 to 66.67 %
      * @param $value
-     * @return float Converted number
+     * @return string Converted number
      */
     public static function convert_to_percentage($value)
     {
@@ -2208,7 +2209,7 @@ 
      * @param   float $score
      * @param   float $weight
      * @deprecated seem not to be used
-     * @return  float   the score rounded converted to the new range
+     * @return  string|null   the score rounded converted to the new range
      */
     public static function convert_score($score, $weight)
     {
@@ -2759,6 +2760,7 @@ 
      * @param    int        exercise id
      * @param    int    $courseId
      * @param    int        session id
+     * @param integer $user_count
      * @return    float    Best average score
      */
     public static function get_best_average_score_by_exercise(
@@ -3198,8 +3200,9 @@ 
     }
 
     /**
-     * @param array $answer
+     * @param string|null $answer
      * @param string $user_answer
+     * @param string|null $current_answer
      * @return array
      */
     public static function check_fill_in_blanks($answer, $user_answer, $current_answer)
@@ -3805,7 +3808,7 @@ 
 
     /**
      * @param int $countLetter
-     * @return mixed
+     * @return string
      */
     public static function detectInputAppropriateClass($countLetter)
     {

Spacing +117 added lines, -117 removed lines

@@ -65,7 +65,7 @@ 
                 if ($show_title) {
                     TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
                     echo Display::div(
-                        $current_item . '. ' . $objQuestionTmp->selectTitle(),
+                        $current_item.'. '.$objQuestionTmp->selectTitle(),
                         array('class' => 'question_title')
                     );
                 }
@@ -161,8 +161,8 @@ 
                 $config = array(
                     'ToolbarSet' => 'TestFreeAnswer'
                 );
-                $form->addHtmlEditor("choice[" . $questionId . "]", null, false, false, $config);
-                $form->setDefaults(array("choice[" . $questionId . "]" => $fck_content));
+                $form->addHtmlEditor("choice[".$questionId."]", null, false, false, $config);
+                $form->setDefaults(array("choice[".$questionId."]" => $fck_content));
                 $s .= $form->returnForm();
             } elseif ($answerType == ORAL_EXPRESSION) {
                 // Add nanog
@@ -191,7 +191,7 @@ 
                 $config = array(
                     'ToolbarSet' => 'TestFreeAnswer'
                 );
-                $form->addHtmlEditor("choice[" . $questionId . "]", null, false, false, $config);
+                $form->addHtmlEditor("choice[".$questionId."]", null, false, false, $config);
                 //$form->setDefaults(array("choice[" . $questionId . "]" => $fck_content));
                 $s .= $form->returnForm();
             }
@@ -272,7 +272,7 @@ 
 
                 // Unique answer
                 if (in_array($answerType, [UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION, UNIQUE_ANSWER_IMAGE])) {
-                    $input_id = 'choice-' . $questionId . '-' . $answerId;
+                    $input_id = 'choice-'.$questionId.'-'.$answerId;
                     if (isset($user_choice[0]) && $user_choice[0]->getAnswer() == $numAnswer) {
                         $attributes = array(
                             'id' => $input_id,
@@ -297,14 +297,14 @@ 
                     if ($answerType == UNIQUE_ANSWER_IMAGE) {
                         if ($show_comment) {
                             if (empty($comment)) {
-                                $s .= '<div id="answer' . $questionId . $numAnswer . '" '
+                                $s .= '<div id="answer'.$questionId.$numAnswer.'" '
                                     . 'class="exercise-unique-answer-image" style="text-align: center">';
                             } else {
-                                $s .= '<div id="answer' . $questionId . $numAnswer . '" '
+                                $s .= '<div id="answer'.$questionId.$numAnswer.'" '
                                     . 'class="exercise-unique-answer-image col-xs-6 col-sm-12" style="text-align: center">';
                             }
                         } else {
-                            $s .= '<div id="answer' . $questionId . $numAnswer . '" '
+                            $s .= '<div id="answer'.$questionId.$numAnswer.'" '
                                 . 'class="exercise-unique-answer-image col-xs-6 col-md-3" style="text-align: center">';
                         }
                     }
@@ -312,7 +312,7 @@ 
                     $answer = Security::remove_XSS($answer, STUDENT);
                     $s .= Display::input(
                         'hidden',
-                        'choice2[' . $questionId . ']',
+                        'choice2['.$questionId.']',
                         '0'
                     );
 
@@ -320,13 +320,13 @@ 
 
                     if ($answerType == UNIQUE_ANSWER_IMAGE) {
                         $attributes['style'] = 'display: none;';
-                        $answer = '<div class="thumbnail">' . $answer . '</div>';
+                        $answer = '<div class="thumbnail">'.$answer.'</div>';
                     }
 
                     $answer_input .= '<label class="radio">';
                     $answer_input .= Display::input(
                         'radio',
-                        'choice[' . $questionId . ']',
+                        'choice['.$questionId.']',
                         $numAnswer,
                         $attributes
                     );
@@ -353,7 +353,7 @@ 
                     $answerType == MULTIPLE_ANSWER_TRUE_FALSE ||
                     $answerType == GLOBAL_MULTIPLE_ANSWER
                 ) {
-                    $input_id = 'choice-' . $questionId . '-' . $answerId;
+                    $input_id = 'choice-'.$questionId.'-'.$answerId;
                     $answer = Security::remove_XSS($answer, STUDENT);
 
                     if (in_array($numAnswer, $user_choice_array)) {
@@ -374,12 +374,12 @@ 
                     }
 
                     if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) {
-                        $s .= '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />';
+                        $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
 
                         $answer_input = '<label class="checkbox">';
                         $answer_input .= Display::input(
                             'checkbox',
-                            'choice[' . $questionId . '][' . $numAnswer . ']',
+                            'choice['.$questionId.']['.$numAnswer.']',
                             $numAnswer,
                             $attributes
                         );
@@ -432,7 +432,7 @@ 
                                     'td',
                                     Display::input(
                                         'radio',
-                                        'choice[' . $questionId . '][' . $numAnswer . ']',
+                                        'choice['.$questionId.']['.$numAnswer.']',
                                         $id,
                                         $attributes
                                     ),
@@ -450,7 +450,7 @@ 
                     }
                 } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION) {
                     // multiple answers
-                    $input_id = 'choice-' . $questionId . '-' . $answerId;
+                    $input_id = 'choice-'.$questionId.'-'.$answerId;
 
                     if (in_array($numAnswer, $user_choice_array)) {
                         $attributes = array(
@@ -470,11 +470,11 @@ 
                     }
 
                     $answer = Security::remove_XSS($answer, STUDENT);
-                    $answer_input = '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />';
+                    $answer_input = '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
                     $answer_input .= '<label class="checkbox">';
                     $answer_input .= Display::input(
                         'checkbox',
-                        'choice[' . $questionId . '][' . $numAnswer . ']',
+                        'choice['.$questionId.']['.$numAnswer.']',
                         1,
                         $attributes
                     );
@@ -495,7 +495,7 @@ 
                     }
 
                 } elseif ($answerType == MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE) {
-                    $s .= '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />';
+                    $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
 
                     $my_choice = array();
                     if (!empty($user_choice_array)) {
@@ -530,7 +530,7 @@ 
                             'td',
                             Display::input(
                                 'radio',
-                                'choice[' . $questionId . '][' . $numAnswer . ']',
+                                'choice['.$questionId.']['.$numAnswer.']',
                                 $key,
                                 $attributes
                             )
@@ -627,8 +627,8 @@ 
                             TABLE_STATISTIC_TRACK_E_ATTEMPT
                         );
                         $sql = 'SELECT answer
-                                FROM ' . $trackAttempts . '
-                                WHERE exe_id=' . $exe_id . ' AND question_id=' . $questionId;
+                                FROM ' . $trackAttempts.'
+                                WHERE exe_id=' . $exe_id.' AND question_id='.$questionId;
                         $rsLastAttempt = Database::query($sql);
                         $rowLastAttempt = Database::fetch_array($rsLastAttempt);
                         $answer = $rowLastAttempt['answer'];
@@ -687,7 +687,7 @@ 
                                 '',
                                 $answerCorrected
                             );
-                            $answerCorrected = '[' . $answerCorrected . ']';
+                            $answerCorrected = '['.$answerCorrected.']';
                             $studentAnswerList[] = $answerCorrected;
                         }
                     }
@@ -706,7 +706,7 @@ 
                     */
                     $tabComments = api_preg_split(
                         '/\[[^]]+\]/',
-                        ' ' . $answer . ' '
+                        ' '.$answer.' '
                     );
                     if (!empty($correctAnswerList) && !empty($studentAnswerList)) {
                         $answer = "";
@@ -723,7 +723,7 @@ 
                                 $size
                             );
 
-                            $answer .= $tabComments[$i] .
+                            $answer .= $tabComments[$i].
                                 Display::input(
                                     'text',
                                     "choice[$questionId][]",
@@ -769,12 +769,12 @@ 
                         $s .= '<tr><td width="45%" valign="top">';
                         $parsed_answer = $answer;
                         //left part questions
-                        $s .= '<p class="indent">' . $lines_count . '.&nbsp;' . $parsed_answer . '</p></td>';
+                        $s .= '<p class="indent">'.$lines_count.'.&nbsp;'.$parsed_answer.'</p></td>';
                         //middle part (matches selects)
 
                         $s .= '<td width="10%" valign="top" align="center" >
                                 <div class="select-matching">
-                                <select name="choice[' . $questionId . '][' . $numAnswer . ']">';
+                                <select name="choice[' . $questionId.']['.$numAnswer.']">';
 
                         // fills the list-box
                         foreach ($select_items as $key => $val) {
@@ -790,14 +790,14 @@ 
                             if (isset($user_choice_array_position[$numAnswer]) && $val['id'] == $user_choice_array_position[$numAnswer]) {
                                 $selected = 'selected="selected"';
                             }
-                            $s .= '<option value="' . $val['id'] . '" ' . $selected . '>' . $val['letter'] . '</option>';
+                            $s .= '<option value="'.$val['id'].'" '.$selected.'>'.$val['letter'].'</option>';
 
                         }  // end foreach()
 
                         $s .= '</select></div></td><td width="5%" class="separate">&nbsp;</td>';
                         $s .= '<td width="40%" valign="top" >';
                         if (isset($select_items[$lines_count])) {
-                            $s .= '<div class="text-right"><p class="indent">' . $select_items[$lines_count]['letter'].'.&nbsp; '. $select_items[$lines_count]['answer'].'</p></div>';
+                            $s .= '<div class="text-right"><p class="indent">'.$select_items[$lines_count]['letter'].'.&nbsp; '.$select_items[$lines_count]['answer'].'</p></div>';
                         } else {
                             $s .= '&nbsp;';
                         }
@@ -812,7 +812,7 @@ 
                                 $s .= '<tr>
                                       <td colspan="2"></td>
                                       <td valign="top">';
-                                $s .= '<b>' . $select_items[$lines_count]['letter'] . '.</b> ' . $select_items[$lines_count]['answer'];
+                                $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer'];
                                 $s .= "</td>
                                 </tr>";
                                 $lines_count++;
@@ -828,9 +828,9 @@ 
                         $data = $objAnswerTmp->getAnswerByAutoId($data['correct']);
                         $lines_count = $data['answer'];*/
 
-                        $windowId = $questionId . '_' . $lines_count;
+                        $windowId = $questionId.'_'.$lines_count;
 
-                        $s .= '<li class="touch-items" id="' . $windowId . '">';
+                        $s .= '<li class="touch-items" id="'.$windowId.'">';
                         $s .= Display::div(
                             $parsed_answer,
                             [
@@ -888,7 +888,7 @@ 
                                 Display::tag(
                                     'b',
                                     $select_items[$lines_count]['letter']
-                                ) . $select_items[$lines_count]['answer'],
+                                ).$select_items[$lines_count]['answer'],
                                 [
                                     'id' => "window_{$windowId}_answer",
                                     'style' => 'display: none;'
@@ -1032,7 +1032,7 @@ 
 
             if ($show_comment) {
                 $s .= '</table>';
-            } elseif(
+            } elseif (
                 in_array(
                     $answerType,
                     [
@@ -1057,7 +1057,7 @@ 
 
                 for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
                     $answerCorrect = $objAnswerTmp->isCorrect($answerId);
-                    $windowId = $questionId . '_' . $counterAnswer;
+                    $windowId = $questionId.'_'.$counterAnswer;
 
                     if ($answerCorrect) {
                         $s .= Display::div(
@@ -1102,7 +1102,7 @@ 
                 $course = api_get_course_info();
                 $doc_id = DocumentManager::get_document_id(
                     $course,
-                    '/images/' . $pictureName
+                    '/images/'.$pictureName
                 );
                 if (is_numeric($doc_id)) {
                     $images_folder_visibility = api_get_item_visibility(
@@ -1127,7 +1127,7 @@ 
                 echo "
                     <script>
                         $(document).on('ready', function () {
-                            new " . ($answerType == HOT_SPOT ?  "HotspotQuestion" : "DelineationQuestion" ) . "({
+                            new " . ($answerType == HOT_SPOT ? "HotspotQuestion" : "DelineationQuestion")."({
                                 questionId: $questionId,
                                 exerciseId: $exerciseId,
                                 selector: '#hotspot-preview-$questionId',
@@ -1161,7 +1161,7 @@ 
             if ($answerType != HOT_SPOT_DELINEATION) {
                 $answerList = '
                     <div class="well well-sm">
-                        <h5 class="page-header">' . get_lang('HotspotZones') . '</h5>
+                        <h5 class="page-header">' . get_lang('HotspotZones').'</h5>
                         <ol>
                 ';
 
@@ -1186,7 +1186,7 @@ 
             if (!$only_questions) {
                 if ($show_title) {
                     TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
-                    echo '<div class="question_title">' . $current_item . '. ' . $questionName . '</div>';
+                    echo '<div class="question_title">'.$current_item.'. '.$questionName.'</div>';
                 }
                 //@todo I need to the get the feedback type
                 echo <<<HOTSPOT
@@ -1204,7 +1204,7 @@ 
                                 <div class=\"hotspot-image\"></div>
                                 <script>
                                     $(document).on('ready', function () {
-                                        new " . ($answerType == HOT_SPOT_DELINEATION ? 'DelineationQuestion' : 'HotspotQuestion') . "({
+                                        new " . ($answerType == HOT_SPOT_DELINEATION ? 'DelineationQuestion' : 'HotspotQuestion')."({
                                             questionId: $questionId,
                                             exerciseId: $exe_id,
                                             selector: '#question_div_' + $questionId + ' .hotspot-image',
@@ -1323,11 +1323,11 @@ 
         $lp_id = intval($lp_id);
         $lp_item_id = intval($lp_item_id);
         return
-            api_get_course_int_id() . '_' .
-            api_get_session_id() . '_' .
-            $exercise_id . '_' .
-            api_get_user_id() . '_' .
-            $lp_id . '_' .
+            api_get_course_int_id().'_'.
+            api_get_session_id().'_'.
+            $exercise_id.'_'.
+            api_get_user_id().'_'.
+            $lp_id.'_'.
             $lp_item_id;
     }
 
@@ -1439,14 +1439,14 @@ 
         $res = Database::query($sql);
         $result = array();
         $apiIsAllowedToEdit = api_is_allowed_to_edit();
-        $urlBase = api_get_path(WEB_CODE_PATH) .
-            'exercice/hotpotatoes_exercise_report.php?action=delete&' .
-            api_get_cidreq() . '&id=';
+        $urlBase = api_get_path(WEB_CODE_PATH).
+            'exercice/hotpotatoes_exercise_report.php?action=delete&'.
+            api_get_cidreq().'&id=';
         while ($data = Database::fetch_array($res)) {
             $actions = null;
 
             if ($apiIsAllowedToEdit) {
-                $url = $urlBase . $data['id'] . '&path=' . $data['exe_name'];
+                $url = $urlBase.$data['id'].'&path='.$data['exe_name'];
                 $actions = Display::url(
                     Display::return_icon('delete.png', get_lang('Delete')),
                     $url
@@ -1462,7 +1462,7 @@ 
                     GroupManager::get_user_group_name($data['user_id'])
                 ),
                 'exe_date' => $data['exe_date'],
-                'score' => $data['exe_result'] . ' / ' . $data['exe_weighting'],
+                'score' => $data['exe_result'].' / '.$data['exe_weighting'],
                 'actions' => $actions,
             );
         }
@@ -1545,18 +1545,18 @@ 
         $TBL_TRACK_HOTPOTATOES = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
         $TBL_TRACK_ATTEMPT_RECORDING = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
 
-        $session_id_and = ' AND te.session_id = ' . $sessionId . ' ';
+        $session_id_and = ' AND te.session_id = '.$sessionId.' ';
         $exercise_id = intval($exercise_id);
 
         $exercise_where = '';
         if (!empty($exercise_id)) {
-            $exercise_where .= ' AND te.exe_exo_id = ' . $exercise_id . '  ';
+            $exercise_where .= ' AND te.exe_exo_id = '.$exercise_id.'  ';
         }
 
         $hotpotatoe_where = '';
         if (!empty($_GET['path'])) {
             $hotpotatoe_path = Database::escape_string($_GET['path']);
-            $hotpotatoe_where .= ' AND exe_name = "' . $hotpotatoe_path . '"  ';
+            $hotpotatoe_where .= ' AND exe_name = "'.$hotpotatoe_path.'"  ';
         }
 
         // sql for chamilo-type tests for teacher / tutor view
@@ -1568,7 +1568,7 @@ 
             WHERE
                 c_id = $course_id AND
                 exe_exo_id = $exercise_id AND
-                ttte.session_id = " . $sessionId . "
+                ttte.session_id = ".$sessionId."
         )";
 
         if ($is_allowedToEdit) {
@@ -1591,9 +1591,9 @@ 
                         g.id as group_id
                     FROM $TBL_USER u
                     INNER JOIN $TBL_GROUP_REL_USER gru
-                    ON (gru.user_id = u.user_id AND gru.c_id=" . $course_id . ")
+                    ON (gru.user_id = u.user_id AND gru.c_id=".$course_id.")
                     INNER JOIN $TBL_GROUP g
-                    ON (gru.group_id = g.id AND g.c_id=" . $course_id . ")
+                    ON (gru.group_id = g.id AND g.c_id=".$course_id.")
                 )";
             }
 
@@ -1655,9 +1655,9 @@ 
                     g.id as group_id
                 FROM $TBL_USER u
                 LEFT OUTER JOIN $TBL_GROUP_REL_USER gru
-                ON ( gru.user_id = u.user_id AND gru.c_id=" . $course_id . " )
+                ON ( gru.user_id = u.user_id AND gru.c_id=".$course_id." )
                 LEFT OUTER JOIN $TBL_GROUP g
-                ON (gru.group_id = g.id AND g.c_id = " . $course_id . ")
+                ON (gru.group_id = g.id AND g.c_id = ".$course_id.")
             )";
             }
 
@@ -1670,12 +1670,12 @@ 
             (
                 SELECT u.user_id, firstname, lastname, email, username, ' ' as group_name, '' as group_id, official_code
                 FROM $TBL_USER u
-                WHERE u.status NOT IN(" . api_get_users_status_ignored_in_reports('string') . ")
+                WHERE u.status NOT IN(".api_get_users_status_ignored_in_reports('string').")
             )";
             }
 
             $sqlFromOption = " , $TBL_GROUP_REL_USER AS gru ";
-            $sqlWhereOption = "  AND gru.c_id = " . $course_id ." AND gru.user_id = user.user_id ";
+            $sqlWhereOption = "  AND gru.c_id = ".$course_id." AND gru.user_id = user.user_id ";
             $first_and_last_name = api_is_western_name_order() ? "firstname, lastname" : "lastname, firstname";
 
             if ($get_count) {
@@ -1712,8 +1712,8 @@ 
                 ON (user.user_id = exe_user_id)
                 WHERE
                     te.status != 'incomplete' AND
-                    te.c_id = " . $course_id . " $session_id_and AND
-                    ce.active <>-1 AND ce.c_id = " . $course_id . "
+                    te.c_id = ".$course_id." $session_id_and AND
+                    ce.active <>-1 AND ce.c_id = ".$course_id."
                     $exercise_where
                     $extra_where_conditions
                 ";
@@ -1740,12 +1740,12 @@ 
                     $sqlFromOption
                 WHERE
                     user.user_id=tth.exe_user_id
-                    AND tth.c_id = " . $course_id . "
+                    AND tth.c_id = ".$course_id."
                     $hotpotatoe_where
                     $sqlWhereOption
-                    AND user.status NOT IN(" . api_get_users_status_ignored_in_reports(
+                    AND user.status NOT IN(".api_get_users_status_ignored_in_reports(
                     'string'
-                ) . ")
+                ).")
                 ORDER BY
                     tth.c_id ASC,
                     tth.exe_date DESC";
@@ -1821,12 +1821,12 @@ 
 
                     if ($from_gradebook && ($is_allowedToEdit)) {
                         if (in_array(
-                            $results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname'],
+                            $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname'],
                             $users_array_id
                         )) {
                             continue;
                         }
-                        $users_array_id[] = $results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname'];
+                        $users_array_id[] = $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname'];
                     }
 
                     $lp_obj = isset($results[$i]['orig_lp_id']) && isset($lp_list[$results[$i]['orig_lp_id']]) ? $lp_list[$results[$i]['orig_lp_id']] : null;
@@ -1835,8 +1835,8 @@ 
                     if ($lp_obj) {
                         $url = api_get_path(
                                 WEB_CODE_PATH
-                            ) . 'newscorm/lp_controller.php?' . api_get_cidreq(
-                            ) . '&action=view&lp_id=' . $results[$i]['orig_lp_id'];
+                            ).'newscorm/lp_controller.php?'.api_get_cidreq(
+                            ).'&action=view&lp_id='.$results[$i]['orig_lp_id'];
                         $lp_name = Display::url(
                             $lp_obj['lp_name'],
                             $url,
@@ -1854,7 +1854,7 @@ 
                         );
 
                         foreach ($group_list as $id) {
-                            $group_name_list .= $clean_group_list[$id] . '<br/>';
+                            $group_name_list .= $clean_group_list[$id].'<br/>';
                         }
                         $results[$i]['group_name'] = $group_name_list;
                     }
@@ -1910,8 +1910,8 @@ 
                                 }
                             }
                             if ($revised) {
-                                $actions .= "<a href='exercise_show.php?" . api_get_cidreq(
-                                    ) . "&action=edit&id=$id'>" .
+                                $actions .= "<a href='exercise_show.php?".api_get_cidreq(
+                                    )."&action=edit&id=$id'>".
                                     Display:: return_icon(
                                         'edit.png',
                                         get_lang('Edit'),
@@ -1920,8 +1920,8 @@ 
                                     );
                                 $actions .= '&nbsp;';
                             } else {
-                                $actions .= "<a href='exercise_show.php?" . api_get_cidreq(
-                                    ) . "&action=qualify&id=$id'>" .
+                                $actions .= "<a href='exercise_show.php?".api_get_cidreq(
+                                    )."&action=qualify&id=$id'>".
                                     Display:: return_icon(
                                         'quiz.gif',
                                         get_lang('Qualify')
@@ -1931,12 +1931,12 @@ 
                             $actions .= "</a>";
 
                             if ($filter == 2) {
-                                $actions .= ' <a href="exercise_history.php?' . api_get_cidreq(
-                                    ) . '&exe_id=' . $id . '">' .
+                                $actions .= ' <a href="exercise_history.php?'.api_get_cidreq(
+                                    ).'&exe_id='.$id.'">'.
                                     Display:: return_icon(
                                         'history.gif',
                                         get_lang('ViewHistoryChange')
-                                    ) . '</a>';
+                                    ).'</a>';
                             }
 
                             //Admin can always delete the attempt
@@ -1948,35 +1948,35 @@ 
                                     date('Y-m-d h:i:s'),
                                     false
                                 );
-                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip=' . $ip . '" target="_blank">';
+                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip='.$ip.'" target="_blank">';
                                 $actions .= Display::return_icon('info.png', $ip, ['title' => $ip]);
                                 $actions .= '</a>';
 
-                                $delete_link = '<a href="exercise_report.php?' . api_get_cidreq(
-                                    ) . '&filter_by_user=' . intval(
+                                $delete_link = '<a href="exercise_report.php?'.api_get_cidreq(
+                                    ).'&filter_by_user='.intval(
                                         $_GET['filter_by_user']
-                                    ) . '&filter=' . $filter . '&exerciseId=' . $exercise_id . '&delete=delete&did=' . $id . '"
+                                    ).'&filter='.$filter.'&exerciseId='.$exercise_id.'&delete=delete&did='.$id.'"
                                 onclick="javascript:if(!confirm(\'' . sprintf(
                                         get_lang('DeleteAttempt'),
                                         $results[$i]['username'],
                                         $dt
-                                    ) . '\')) return false;">' . Display:: return_icon(
+                                    ).'\')) return false;">'.Display:: return_icon(
                                         'delete.png',
                                         get_lang('Delete')
-                                    ) . '</a>';
+                                    ).'</a>';
                                 $delete_link = utf8_encode($delete_link);
 
                                 if (api_is_drh() && !api_is_platform_admin()) {
                                     $delete_link = null;
                                 }
-                                $actions .= $delete_link . '&nbsp;';
+                                $actions .= $delete_link.'&nbsp;';
                             }
 
                         } else {
                             $attempt_url = api_get_path(
                                     WEB_CODE_PATH
-                                ) . 'exercice/result.php?' . api_get_cidreq(
-                                ) . '&id=' . $results[$i]['exe_id'] . '&id_session=' . $sessionId;
+                                ).'exercice/result.php?'.api_get_cidreq(
+                                ).'&id='.$results[$i]['exe_id'].'&id_session='.$sessionId;
                             $attempt_link = Display::url(
                                 get_lang('Show'),
                                 $attempt_url,
@@ -2033,7 +2033,7 @@ 
                     $hp_result = round(
                             ($hpresults[$i][4] / ($hpresults[$i][5] != 0 ? $hpresults[$i][5] : 1)) * 100,
                             2
-                        ) . '% (' . $hpresults[$i][4] . ' / ' . $hpresults[$i][5] . ')';
+                        ).'% ('.$hpresults[$i][4].' / '.$hpresults[$i][5].')';
                     if ($is_allowedToEdit) {
                         $list_info[] = array(
                             $hpresults[$i][0],
@@ -2106,13 +2106,13 @@ 
 
         $html = null;
         if ($show_percentage) {
-            $parent = '(' . $score . ' / ' . $weight . ')';
-            $html = $percentage . "%  $parent";
+            $parent = '('.$score.' / '.$weight.')';
+            $html = $percentage."%  $parent";
             if ($show_only_percentage) {
-                $html = $percentage . "% ";
+                $html = $percentage."% ";
             }
         } else {
-            $html = $score . ' / ' . $weight;
+            $html = $score.' / '.$weight;
         }
         $html = Display::span($html, array('class' => 'score_exercise'));
 
@@ -2206,7 +2206,7 @@ 
     {
         $return = '-';
         if ($value != '') {
-            $return = float_format($value * 100, 1) . ' %';
+            $return = float_format($value * 100, 1).' %';
         }
         return $return;
     }
@@ -2284,7 +2284,7 @@ 
         }
 
         $needle_where = !empty($search) ? " AND title LIKE '?' " : '';
-        $needle = !empty($search) ? "%" . $search . "%" : '';
+        $needle = !empty($search) ? "%".$search."%" : '';
 
         // Show courses by active status
         $active_sql = '';
@@ -2299,7 +2299,7 @@ 
         if ($search_all_sessions == true) {
             $conditions = array(
                 'where' => array(
-                    $active_sql . ' c_id = ? ' . $needle_where . $time_conditions => array(
+                    $active_sql.' c_id = ? '.$needle_where.$time_conditions => array(
                         $course_id,
                         $needle
                     )
@@ -2310,7 +2310,7 @@ 
             if ($session_id == 0) {
                 $conditions = array(
                     'where' => array(
-                        $active_sql . ' session_id = ? AND c_id = ? ' . $needle_where . $time_conditions => array(
+                        $active_sql.' session_id = ? AND c_id = ? '.$needle_where.$time_conditions => array(
                             $session_id,
                             $course_id,
                             $needle
@@ -2321,7 +2321,7 @@ 
             } else {
                 $conditions = array(
                     'where' => array(
-                        $active_sql . ' (session_id = 0 OR session_id = ? ) AND c_id = ? ' . $needle_where . $time_conditions => array(
+                        $active_sql.' (session_id = 0 OR session_id = ? ) AND c_id = ? '.$needle_where.$time_conditions => array(
                             $session_id,
                             $course_id,
                             $needle
@@ -2500,7 +2500,7 @@ 
 
             if ($return_string) {
                 if (!empty($position) && !empty($my_ranking)) {
-                    $return_value = $position . '/' . count($my_ranking);
+                    $return_value = $position.'/'.count($my_ranking);
                 } else {
                     $return_value = '-';
                 }
@@ -2580,7 +2580,7 @@ 
 
             if ($return_string) {
                 if (!empty($position) && !empty($my_ranking)) {
-                    return $position . '/' . count($my_ranking);
+                    return $position.'/'.count($my_ranking);
                 }
             }
             return $return_value;
@@ -2980,7 +2980,7 @@ 
             $courseCondition = "
             INNER JOIN $courseUser cu
             ON cu.c_id = c.id AND cu.user_id  = exe_user_id";
-            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT;
+            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT;
         } else {
             $courseCondition = "
             INNER JOIN $courseUserSession cu
@@ -3056,7 +3056,7 @@ 
             $courseCondition = "
             INNER JOIN $courseUser cu
             ON cu.c_id = c.id AND cu.user_id  = exe_user_id";
-            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT;
+            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT;
         } else {
             $courseCondition = "
             INNER JOIN $courseUserSession cu
@@ -3148,7 +3148,7 @@ 
             $courseCondition = "
             INNER JOIN $courseUser cu
             ON cu.c_id = c.id AND cu.user_id  = exe_user_id";
-            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT;
+            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT;
         } else {
             $courseCondition = "
             INNER JOIN $courseUserSession cu
@@ -3330,7 +3330,7 @@ 
                 }
             }
             // adds the correct word, followed by ] to close the blank
-            $answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]';
+            $answer .= ' / <font color="green"><b>'.$real_correct_tags[$i].'</b></font>]';
             if (isset ($real_text[$i + 1])) {
                 $answer .= $real_text[$i + 1];
             }
@@ -3390,13 +3390,13 @@ 
         // check the default value of option
         $tabSelected = array($in_default => " selected='selected' ");
         $res = "";
-        $res .= "<select name='$in_name' id='$in_name' onchange='" . $in_onchange . "' >";
-        $res .= "<option value='-1'" . $tabSelected["-1"] . ">-- " . get_lang(
+        $res .= "<select name='$in_name' id='$in_name' onchange='".$in_onchange."' >";
+        $res .= "<option value='-1'".$tabSelected["-1"].">-- ".get_lang(
                 'AllGroups'
-            ) . " --</option>";
-        $res .= "<option value='0'" . $tabSelected["0"] . ">- " . get_lang(
+            )." --</option>";
+        $res .= "<option value='0'".$tabSelected["0"].">- ".get_lang(
                 'NotInAGroup'
-            ) . " -</option>";
+            )." -</option>";
         $tabGroups = GroupManager::get_group_list();
         $currentCatId = 0;
         for ($i = 0; $i < count($tabGroups); $i++) {
@@ -3404,10 +3404,10 @@ 
                 $tabGroups[$i]["id"]
             );
             if ($tabCategory["id"] != $currentCatId) {
-                $res .= "<option value='-1' disabled='disabled'>" . $tabCategory["title"] . "</option>";
+                $res .= "<option value='-1' disabled='disabled'>".$tabCategory["title"]."</option>";
                 $currentCatId = $tabCategory["id"];
             }
-            $res .= "<option " . $tabSelected[$tabGroups[$i]["id"]] . "style='margin-left:40px' value='" . $tabGroups[$i]["id"] . "'>" . $tabGroups[$i]["name"] . "</option>";
+            $res .= "<option ".$tabSelected[$tabGroups[$i]["id"]]."style='margin-left:40px' value='".$tabGroups[$i]["id"]."'>".$tabGroups[$i]["name"]."</option>";
         }
         $res .= "</select>";
         return $res;
@@ -3612,14 +3612,14 @@ 
                 if ($show_results) {
                     $comnt = Event::get_comments($exe_id, $questionId);
                     if (!empty($comnt)) {
-                        echo '<b>' . get_lang('Feedback') . '</b>';
-                        echo '<div id="question_feedback">' . $comnt . '</div>';
+                        echo '<b>'.get_lang('Feedback').'</b>';
+                        echo '<div id="question_feedback">'.$comnt.'</div>';
                     }
                 }
 
                 if ($show_results) {
                     $score = array(
-                        'result' => get_lang('Score') . " : " . self::show_score(
+                        'result' => get_lang('Score')." : ".self::show_score(
                                 $my_total_score,
                                 $my_total_weight,
                                 false,
@@ -3693,13 +3693,13 @@ 
         }
 
         if ($show_all_but_expected_answer) {
-            $exercise_content .= "<div class='normal-message'>" . get_lang(
+            $exercise_content .= "<div class='normal-message'>".get_lang(
                     "ExerciseWithFeedbackWithoutCorrectionComment"
-                ) . "</div>";
+                )."</div>";
         }
         // Remove audio auto play from questions on results page - refs BT#7939
         $exercise_content = preg_replace(
-            ['/autoplay[\=\".+\"]+/','/autostart[\=\".+\"]+/'],
+            ['/autoplay[\=\".+\"]+/', '/autostart[\=\".+\"]+/'],
             '',
             $exercise_content
         );
@@ -3793,11 +3793,11 @@ 
                     $ribbon_total_success_or_error = ' ribbon-total-error';
                 }
             }
-            $ribbon .= '<div class="total ' . $ribbon_total_success_or_error . '">';
+            $ribbon .= '<div class="total '.$ribbon_total_success_or_error.'">';
         } else {
             $ribbon .= '<div class="total">';
         }
-        $ribbon .= '<h3>' . get_lang('YourTotalScore') . ":&nbsp;";
+        $ribbon .= '<h3>'.get_lang('YourTotalScore').":&nbsp;";
         $ribbon .= self::show_score($score, $weight, false, true);
 
         $ribbon .= '</h3>';

main/inc/lib/exercise_show_functions.lib.php

Doc Comments +38 added lines

@@ -24,6 +24,10 @@ 
 	 * @param int       Question ID
      * @param int $resultsDisabled
      * @param string $originalStudentAnswer
+     * @param integer $feedbackType
+     * @param string $answer
+     * @param integer $id
+     * @param integer $questionId
 	 * @return void
 	 */
 	public static function display_fill_in_blanks_answer($feedbackType, $answer, $id, $questionId, $resultsDisabled, $originalStudentAnswer = '')
@@ -62,6 +66,10 @@ 
      * @param string    Answer text
      * @param int       Exercise ID
      * @param int       Question ID
+     * @param integer $feedback_type
+     * @param string $answer
+     * @param integer $id
+     * @param integer $questionId
      * @return void
      */
     static function display_calculated_answer($feedback_type, $answer, $id, $questionId)
@@ -95,6 +103,9 @@ 
 	 * @param string    Answer text
 	 * @param int       Exercise ID
 	 * @param int       Question ID
+	 * @param integer $feedback_type
+	 * @param integer $exe_id
+	 * @param integer $questionId
 	 * @return void
 	 */
 	static function display_free_answer($feedback_type, $answer, $exe_id, $questionId, $questionScore = null)
@@ -117,6 +128,12 @@ 
         }
 	}
 
+	/**
+	 * @param integer $feedback_type
+	 * @param integer $id
+	 * @param integer $questionId
+	 * @param Nanogong $nano
+	 */
 	static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $nano = null)
     {
         if (isset($nano)) {
@@ -158,6 +175,7 @@ 
 	 * @param string $answer
 	 * @param string $studentChoice
 	 * @param string $answerComment
+	 * @param integer $feedback_type
 	 */
 	static function display_hotspot_answer($feedback_type, $answerId, $answer, $studentChoice, $answerComment, $in_results_disabled)
 	 {
@@ -224,6 +242,12 @@ 
 	 * @param integer Exercise ID
 	 * @param integer Question ID
 	 * @param boolean Whether to show the answer comment or not
+	 * @param integer $answerType
+	 * @param string $answer
+	 * @param string $answerComment
+	 * @param integer $answerCorrect
+	 * @param integer $id
+	 * @param integer $questionId
 	 * @return void
 	 */
 	static function display_unique_or_multiple_answer(
@@ -308,6 +332,13 @@ 
      * @param integer Exercise ID
      * @param integer Question ID
      * @param boolean Whether to show the answer comment or not
+     * @param integer $feedback_type
+     * @param integer $answerType
+     * @param string $answer
+     * @param string $answerComment
+     * @param integer $answerCorrect
+     * @param integer $id
+     * @param integer $questionId
      * @return void
      */
     static function display_multiple_answer_true_false(
@@ -398,6 +429,13 @@ 
      * @param integer Exercise ID
      * @param integer Question ID
      * @param boolean Whether to show the answer comment or not
+     * @param integer $feedback_type
+     * @param integer $answerType
+     * @param string $answer
+     * @param string $answerComment
+     * @param integer $answerCorrect
+     * @param integer $id
+     * @param integer $questionId
      * @return void
      */
     static function display_multiple_answer_combination_true_false(

Spacing +14 added lines, -14 removed lines

@@ -45,7 +45,7 @@ 
                 </td>
 
                 <?php
-                if (!api_is_allowed_to_edit(null,true) && $feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
+                if (!api_is_allowed_to_edit(null, true) && $feedbackType != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
                     <td>
                         <?php
                         $comm = Event::get_comments($id, $questionId);
@@ -67,7 +67,7 @@ 
     static function display_calculated_answer($feedback_type, $answer, $id, $questionId)
     {
         if (empty($id)) {
-            echo '<tr><td>'. (Security::remove_XSS($answer)).'</td></tr>';
+            echo '<tr><td>'.(Security::remove_XSS($answer)).'</td></tr>';
         } else {
         ?>
             <tr>
@@ -78,10 +78,10 @@ 
                 </td>
 
             <?php
-            if (!api_is_allowed_to_edit(null,true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
+            if (!api_is_allowed_to_edit(null, true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
                 <td>
                     <?php
-                    $comm = Event::get_comments($id,$questionId);
+                    $comm = Event::get_comments($id, $questionId);
                     ?>
                 </td>
             <?php } ?>
@@ -129,7 +129,7 @@ 
             echo '</tr>';
             if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
                 echo '<tr>';
-                echo Display::tag('td',get_lang('notCorrectedYet'), array('width'=>'45%'));
+                echo Display::tag('td', get_lang('notCorrectedYet'), array('width'=>'45%'));
                 echo '</tr>';
             } else {
                 echo '<tr><td>&nbsp;</td></tr>';
@@ -142,9 +142,9 @@ 
             }
             echo '</td>';
 
-            if (!api_is_allowed_to_edit(null,true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
+            if (!api_is_allowed_to_edit(null, true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
                 echo '<td>';
-                $comm = Event::get_comments($id,$questionId);
+                $comm = Event::get_comments($id, $questionId);
                 echo '</td>';
             }
             echo '</tr>';
@@ -193,7 +193,7 @@ 
 			<td class="text-left" width="10%">
 				<?php
                 if (!$hide_expected_answer) {
-    				$my_choice = ($studentChoice)?get_lang('Correct'):get_lang('Fault');
+    				$my_choice = ($studentChoice) ? get_lang('Correct') : get_lang('Fault');
     				echo $my_choice;
                 }
 				?>
@@ -284,8 +284,8 @@ 
 				}
 			}
 		    echo '</td>';
-		    if ($ans==1) {
-		        $comm = Event::get_comments($id,$questionId);
+		    if ($ans == 1) {
+		        $comm = Event::get_comments($id, $questionId);
 			}
         } else {
 			echo '<td>&nbsp;</td>';
@@ -327,7 +327,7 @@ 
         <td width="5%">
         <?php
 
-        $question 	 = new MultipleAnswerTrueFalse();
+        $question = new MultipleAnswerTrueFalse();
         $course_id   = api_get_course_int_id();
         $new_options = Question::readQuestionOption($questionId, $course_id);
 
@@ -372,7 +372,7 @@ 
             ?>
         </td>
             <?php
-            if ($ans==1) {
+            if ($ans == 1) {
                 $comm = Event::get_comments($id, $questionId);
             }
             ?>
@@ -470,8 +470,8 @@ 
             ?>
         </td>
             <?php
-            if ($ans==1) {
-                $comm = Event::get_comments($id,$questionId);
+            if ($ans == 1) {
+                $comm = Event::get_comments($id, $questionId);
             }
             ?>
          <?php } else { ?>

Braces +1 added lines, -2 removed lines

@@ -434,8 +434,7 @@
             } else {
                 echo $question->options[2];
             }
-        }
-        else {
+        } else {
             echo '-';
         }
         ?>

Indentation +98 added lines, -98 removed lines

@@ -12,21 +12,21 @@ 
 * @todo convert queries to use Database API
 */
 /**
- * Class
- * @package chamilo.library
- */
+     * Class
+     * @package chamilo.library
+     */
 class ExerciseShowFunctions
 {
-	/**
-	 * Shows the answer to a fill-in-the-blanks question, as HTML
-	 * @param string    Answer text
-	 * @param int       Exercise ID
-	 * @param int       Question ID
+    /**
+     * Shows the answer to a fill-in-the-blanks question, as HTML
+     * @param string    Answer text
+     * @param int       Exercise ID
+     * @param int       Question ID
      * @param int $resultsDisabled
      * @param string $originalStudentAnswer
-	 * @return void
-	 */
-	public static function display_fill_in_blanks_answer($feedbackType, $answer, $id, $questionId, $resultsDisabled, $originalStudentAnswer = '')
+     * @return void
+     */
+    public static function display_fill_in_blanks_answer($feedbackType, $answer, $id, $questionId, $resultsDisabled, $originalStudentAnswer = '')
     {
         $answerHTML = FillBlanks::getHtmlDisplayForAnswer($answer, $resultsDisabled);
         if (strpos($originalStudentAnswer, 'font color') !== false) {
@@ -55,7 +55,7 @@ 
             </tr>
         <?php
         }
-	}
+    }
 
     /**
      * Shows the answer to a calculated question, as HTML
@@ -90,14 +90,14 @@ 
         }
     }
 
-	/**
-	 * Shows the answer to a free-answer question, as HTML
-	 * @param string    Answer text
-	 * @param int       Exercise ID
-	 * @param int       Question ID
-	 * @return void
-	 */
-	static function display_free_answer($feedback_type, $answer, $exe_id, $questionId, $questionScore = null)
+    /**
+     * Shows the answer to a free-answer question, as HTML
+     * @param string    Answer text
+     * @param int       Exercise ID
+     * @param int       Question ID
+     * @return void
+     */
+    static function display_free_answer($feedback_type, $answer, $exe_id, $questionId, $questionScore = null)
     {
         $comments = Event::get_comments($exe_id, $questionId);
 
@@ -115,9 +115,9 @@ 
                 echo '</tr>';
             }
         }
-	}
+    }
 
-	static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $nano = null)
+    static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $nano = null)
     {
         if (isset($nano)) {
             echo $nano->show_audio_file();
@@ -151,22 +151,22 @@ 
         }
     }
 
-	/**
-	 * Displays the answer to a hotspot question
-	 *
-	 * @param int $answerId
-	 * @param string $answer
-	 * @param string $studentChoice
-	 * @param string $answerComment
-	 */
-	static function display_hotspot_answer($feedback_type, $answerId, $answer, $studentChoice, $answerComment, $in_results_disabled)
-	 {
+    /**
+     * Displays the answer to a hotspot question
+     *
+     * @param int $answerId
+     * @param string $answer
+     * @param string $studentChoice
+     * @param string $answerComment
+     */
+    static function display_hotspot_answer($feedback_type, $answerId, $answer, $studentChoice, $answerComment, $in_results_disabled)
+        {
         $hide_expected_answer = false;
         if ($feedback_type == 0 && $in_results_disabled == 2) {
             $hide_expected_answer = true;
         }
 
-		$hotspot_colors = array(
+        $hotspot_colors = array(
             "", // $i starts from 1 on next loop (ugly fix)
             "#4271B5",
             "#FE8E16",
@@ -181,7 +181,7 @@ 
             "#ED2024",
             "#3B3B3B",
             "#F7BDE2");
-		?>
+        ?>
 		<table class="data_table">
 		<tr>
             <td class="text-center" width="5%">
@@ -193,10 +193,10 @@ 
 			<td class="text-left" width="10%">
 				<?php
                 if (!$hide_expected_answer) {
-    				$my_choice = ($studentChoice)?get_lang('Correct'):get_lang('Fault');
-    				echo $my_choice;
+                    $my_choice = ($studentChoice)?get_lang('Correct'):get_lang('Fault');
+                    echo $my_choice;
                 }
-				?>
+                ?>
 			</td>
 			<?php if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
 			<td class="text-left" width="60%">
@@ -204,29 +204,29 @@ 
                 if ($studentChoice) {
                     echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
                 }
-				?>
+                ?>
 			</td>
 			<?php } else { ?>
 				<td class="text-left" width="60%">&nbsp;</td>
 			<?php } ?>
 		</tr>
 		<?php
-	}
+    }
 
-	/**
-	 * Display the answers to a multiple choice question
-	 * @param int $feedback_type Feedback type
-	 * @param integer Answer type
-	 * @param integer Student choice
-	 * @param string  Textual answer
-	 * @param string  Comment on answer
-	 * @param string  Correct answer comment
-	 * @param integer Exercise ID
-	 * @param integer Question ID
-	 * @param boolean Whether to show the answer comment or not
-	 * @return void
-	 */
-	static function display_unique_or_multiple_answer(
+    /**
+     * Display the answers to a multiple choice question
+     * @param int $feedback_type Feedback type
+     * @param integer Answer type
+     * @param integer Student choice
+     * @param string  Textual answer
+     * @param string  Comment on answer
+     * @param string  Correct answer comment
+     * @param integer Exercise ID
+     * @param integer Question ID
+     * @param boolean Whether to show the answer comment or not
+     * @return void
+     */
+    static function display_unique_or_multiple_answer(
         $feedback_type,
         $answerType,
         $studentChoice,
@@ -259,39 +259,39 @@ 
         } else {
             echo "-";
         }
-		echo '</td>';
-		echo '<td width="40%">';
+        echo '</td>';
+        echo '<td width="40%">';
         echo $answer;
-		echo '</td>';
+        echo '</td>';
 
         if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
-		    echo '<td width="20%">';
+            echo '<td width="20%">';
             if ($studentChoice) {
-				if ($answerCorrect) {
+                if ($answerCorrect) {
                     $color = 'green';
-					//echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
-				} else {
+                    //echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
+                } else {
                     $color = 'black';
                     //echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br($answerComment).'</span>';
-				}
+                }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
 
-			} else {
-				if ($answerCorrect) {
-					//echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
-				} else {
+            } else {
+                if ($answerCorrect) {
+                    //echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
+                } else {
                     //echo '<span style="font-weight: normal; color: #000;">'.nl2br($answerComment).'</span>';
-				}
-			}
-		    echo '</td>';
-		    if ($ans==1) {
-		        $comm = Event::get_comments($id,$questionId);
-			}
+                }
+            }
+            echo '</td>';
+            if ($ans==1) {
+                $comm = Event::get_comments($id,$questionId);
+            }
         } else {
-			echo '<td>&nbsp;</td>';
-		}
-		echo '</tr>';
-	}
+            echo '<td>&nbsp;</td>';
+        }
+        echo '</tr>';
+    }
 
     /**
      * Display the answers to a multiple choice question
@@ -335,7 +335,7 @@ 
         if (isset($new_options[$studentChoice])) {
             echo get_lang($new_options[$studentChoice]['name']);
         } else {
-        	echo '-';
+            echo '-';
         }
 
         ?>
@@ -343,7 +343,7 @@ 
         <td width="5%">
         <?php
 
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($new_options[$answerCorrect])) {
                 echo get_lang($new_options[$answerCorrect]['name']);
@@ -383,19 +383,19 @@ 
         <?php
     }
 
-     /**
-     * Display the answers to a multiple choice question
-     *
-     * @param integer Answer type
-     * @param integer Student choice
-     * @param string  Textual answer
-     * @param string  Comment on answer
-     * @param string  Correct answer comment
-     * @param integer Exercise ID
-     * @param integer Question ID
-     * @param boolean Whether to show the answer comment or not
-     * @return void
-     */
+        /**
+         * Display the answers to a multiple choice question
+         *
+         * @param integer Answer type
+         * @param integer Student choice
+         * @param string  Textual answer
+         * @param string  Comment on answer
+         * @param string  Correct answer comment
+         * @param integer Exercise ID
+         * @param integer Question ID
+         * @param boolean Whether to show the answer comment or not
+         * @return void
+         */
     static function display_multiple_answer_combination_true_false(
         $feedback_type,
         $answerType,
@@ -416,7 +416,7 @@ 
         <tr>
         <td width="5%">
         <?php
-		//Your choice
+        //Your choice
         $question = new MultipleAnswerCombinationTrueFalse();
         if (isset($question->options[$studentChoice])) {
             echo $question->options[$studentChoice];
@@ -427,7 +427,7 @@ 
         </td>
         <td width="5%">
         <?php
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($question->options[$answerCorrect])) {
                 echo $question->options[$answerCorrect];
@@ -452,20 +452,20 @@ 
             <?php
             //@todo replace this harcoded value
             if ($studentChoice) {
-                 $color = "black";
+                    $color = "black";
                 if ($studentChoice == $answerCorrect) {
                     $color = "green";
                 }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
             if ($studentChoice == 2 || $studentChoice == '') {
-            	//echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
+                //echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
             } else {
-				if ($studentChoice == $answerCorrect) {
-	            	//echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
-				} else {
+                if ($studentChoice == $answerCorrect) {
+                    //echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
+                } else {
                     //echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br($answerComment).'</span>';
-				}
+                }
             }
             ?>
         </td>

main/inc/lib/export.lib.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
      * @param string Name of common tag to place each line in
      * @param string Name of the root element. A root element should always be given.
      * @param string Encoding in which the data is provided
-     * @return void  Prompts the user for a file download
+     * @return boolean  Prompts the user for a file download
      */
     public static function export_complex_table_xml(
         $data,
@@ -283,7 +283,7 @@ 
      * @param string $name
      * @param string $format
      *
-     * @return bool
+     * @return false|null
      */
     public static function htmlToOdt($html, $name, $format = 'odt')
     {

Unused Use Statements -6 removed lines

@@ -3,14 +3,8 @@
 
 use Ddeboer\DataImport\Writer\ExcelWriter;
 use Ddeboer\DataImport\Writer\CsvWriter;
-use Ddeboer\DataImport\Workflow;
-
-use Ddeboer\DataImport\Reader\CsvReader;
-use Ddeboer\DataImport\Reader\ArrayReader;
-use Ddeboer\DataImport\Writer\ArrayWriter;
 use Chamilo\CoreBundle\Component\Editor\Connector;
 use Chamilo\CoreBundle\Component\Filesystem\Data;
-use ChamiloSession as Session;
 use MediaAlchemyst\Alchemyst;
 use MediaAlchemyst\DriversContainer;
 use Neutron\TemporaryFilesystem\Manager;

Indentation +11 added lines, -11 removed lines

@@ -56,7 +56,7 @@ 
 
         DocumentManager::file_send_for_download($filePath, true, $filename.'.csv');
         exit;
-	}
+    }
 
     /**
      * Export tabular data to XLS-file
@@ -79,7 +79,7 @@ 
 
         DocumentManager::file_send_for_download($filePath, true, $filename.'.xlsx');
         exit;
-	}
+    }
 
     /**
      * Export tabular data to XLS-file (as html table)
@@ -112,13 +112,13 @@ 
     }
 
     /**
-    * Export tabular data to XML-file
-    * @param array  Simple array of data to put in XML
-    * @param string Name of file to be given to the user
-    * @param string Name of common tag to place each line in
-    * @param string Name of the root element. A root element should always be given.
-    * @param string Encoding in which the data is provided
-    */
+     * Export tabular data to XML-file
+     * @param array  Simple array of data to put in XML
+     * @param string Name of file to be given to the user
+     * @param string Name of common tag to place each line in
+     * @param string Name of the root element. A root element should always be given.
+     * @param string Encoding in which the data is provided
+     */
     public static function arrayToXml(
         $data,
         $filename = 'export',
@@ -148,7 +148,7 @@ 
         fclose($handle);
         DocumentManager :: file_send_for_download($file, true, $filename.'.xml');
         exit;
-	}
+    }
 
     /**
      * Export hierarchical tabular data to XML-file
@@ -197,7 +197,7 @@ 
         foreach ($data as $row) {
             $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>';
             if (is_array($row['value'])) {
-            	$string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
+                $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
                 $string .= str_repeat("\t",$level).'</'.$row['name'].'>';
             } else {
                 $string .= $row['value'];

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
         $writer->setStream(fopen($filePath, 'w'));
 
         foreach ($data as $item) {
-            $item = is_array($item) ? $item : (array)$item;
+            $item = is_array($item) ? $item : (array) $item;
             $writer->writeItem($item);
         }
         $writer->finish();
@@ -100,7 +100,7 @@ 
         }
         foreach ($data as $row) {
             $string = implode("</td><td>", $row);
-            $string = '<tr><td>' . $string . '</td></tr>';
+            $string = '<tr><td>'.$string.'</td></tr>';
             if ($encoding != 'utf-8') {
                 $string = api_convert_encoding($string, $encoding, $systemEncoding);
             }
@@ -174,7 +174,7 @@ 
             fwrite($handle, '<'.$wrapper_tagname.'>');
         }
         $s = self::_export_complex_table_xml_helper($data);
-        fwrite($handle,$s);
+        fwrite($handle, $s);
         if (!is_null($wrapper_tagname)) {
             fwrite($handle, '</'.$wrapper_tagname.'>'."\n");
         }
@@ -196,10 +196,10 @@ 
         }
         $string = '';
         foreach ($data as $row) {
-            $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>';
+            $string .= "\n".str_repeat("\t", $level).'<'.$row['name'].'>';
             if (is_array($row['value'])) {
-            	$string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
-                $string .= str_repeat("\t",$level).'</'.$row['name'].'>';
+            	$string .= self::_export_complex_table_xml_helper($row['value'], $level + 1)."\n";
+                $string .= str_repeat("\t", $level).'</'.$row['name'].'>';
             } else {
                 $string .= $row['value'];
                 $string .= '</'.$row['name'].'>';

main/inc/lib/extra_field.lib.php

Doc Comments +8 added lines, -9 removed lines

@@ -123,7 +123,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getValidExtraFieldTypes()
     {
@@ -199,7 +199,7 @@ 
 
     /**
      * @param array $conditions
-     * @param null  $order_field_options_by
+     * @param string  $order_field_options_by
      *
      * @return array
      */
@@ -237,7 +237,7 @@ 
     /**
      * @param string $variable
      *
-     * @return array|bool
+     * @return integer
      */
     public function get_handler_field_info_by_field_variable($variable)
     {
@@ -319,7 +319,7 @@ 
     /**
      * @param string $handler
      *
-     * @return array
+     * @return string[]
      */
     public static function get_extra_fields_by_handler($handler)
     {
@@ -496,7 +496,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function get_field_types()
     {
@@ -506,7 +506,7 @@ 
     /**
      * @param int $id
      *
-     * @return null
+     * @return string|null
      */
     public function get_field_type_by_id($id)
     {
@@ -691,7 +691,6 @@ 
      * @param FormValidator $form
      * @param array $extraData
      * @param bool $admin_permissions
-     * @param int $user_id
      * @param array $extra
      * @param int $itemId
      * @param array $exclude variables of extra field to exclude
@@ -1592,7 +1591,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public function getJqgridColumnNames()
     {
@@ -1832,7 +1831,7 @@ 
     }
 
     /**
-     * @param array $columns
+     * @param string[] $columns
      * @param array  $column_model
      * @param array  $extraFields
      * @return array

Indentation +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
         'changeable',
         'filter',
         'extra_field_type',
-         /* Enable this when field_loggeable is introduced as a table field (2.0)
+            /* Enable this when field_loggeable is introduced as a table field (2.0)
         'field_loggeable',
          */
         'created_at'
@@ -523,7 +523,7 @@ 
      * France:Paris;Bretagne;Marseilles;Lyon|Belgique:Bruxelles;Namur;Liège;Bruges|Peru:Lima;Piura;
      * into
      * array(
- *      'France' =>
+     *      'France' =>
      *      array('Paris', 'Bregtane', 'Marseilles'),
      *  'Belgique' =>
      *      array('Namur', 'Liège')
@@ -1184,7 +1184,7 @@ 
 
                         if ($this->type == 'user') {
 
-                           /* //the magic should be here
+                            /* //the magic should be here
                             $user_tags = UserManager::get_user_tags($user_id, $field_details[0]);
 
                             $tag_list = '';

Spacing +33 added lines, -33 removed lines

@@ -26,19 +26,19 @@ 
     );
 
     public $ops = array(
-        'eq' => '=',        //equal
-        'ne' => '<>',       //not equal
-        'lt' => '<',        //less than
-        'le' => '<=',       //less than or equal
-        'gt' => '>',        //greater than
-        'ge' => '>=',       //greater than or equal
-        'bw' => 'LIKE',     //begins with
+        'eq' => '=', //equal
+        'ne' => '<>', //not equal
+        'lt' => '<', //less than
+        'le' => '<=', //less than or equal
+        'gt' => '>', //greater than
+        'ge' => '>=', //greater than or equal
+        'bw' => 'LIKE', //begins with
         'bn' => 'NOT LIKE', //doesn't begin with
-        'in' => 'LIKE',     //is in
+        'in' => 'LIKE', //is in
         'ni' => 'NOT LIKE', //is not in
-        'ew' => 'LIKE',     //ends with
+        'ew' => 'LIKE', //ends with
         'en' => 'NOT LIKE', //doesn't end with
-        'cn' => 'LIKE',     //contains
+        'cn' => 'LIKE', //contains
         'nc' => 'NOT LIKE'  //doesn't contain
     );
 
@@ -323,7 +323,7 @@ 
      */
     public static function get_extra_fields_by_handler($handler)
     {
-        $types= array();
+        $types = array();
         $types[self::FIELD_TYPE_TEXT] = get_lang('FieldTypeText');
         $types[self::FIELD_TYPE_TEXTAREA] = get_lang('FieldTypeTextarea');
         $types[self::FIELD_TYPE_RADIO] = get_lang('FieldTypeRadio');
@@ -962,7 +962,7 @@ 
                         // chzn-select doesn't work for sessions??
                         $form->addElement(
                             'select',
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             $field_details['display_text'],
                             $options,
                             array('id' => 'extra_'.$field_details['variable'])
@@ -1021,7 +1021,7 @@ 
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
-                                $form->freeze('extra_' . $field_details['variable']);
+                                $form->freeze('extra_'.$field_details['variable']);
                             }
                         }
                         break;
@@ -1369,9 +1369,9 @@ 
 
                         if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
 
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::img(
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
                                     $field_details['display_text'],
                                     array('width' => '300')
                                 );
@@ -1388,10 +1388,10 @@ 
                         $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
                         $form->applyFilter('extra_'.$field_details['variable'], 'trim');
 
-                        $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
+                        $allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
                         $form->addRule(
                             'extra_'.$field_details['variable'],
-                            get_lang('OnlyImagesAllowed') . ' ('.implode(',', $allowed_picture_types).')',
+                            get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
                             'filetype',
                             $allowed_picture_types
                         );
@@ -1433,10 +1433,10 @@ 
                         if (is_array($extraData) &&
                             array_key_exists($fieldVariable, $extraData)
                         ) {
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::url(
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
                                     array(
                                         'title' => $field_details['display_text'],
                                         'target' => '_blank'
@@ -1486,12 +1486,12 @@ 
                             "extra_{$field_details['variable']}",
                             $field_details['display_text']
                         );
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1502,13 +1502,13 @@ 
                             $field_details['display_text']
                         );
                         $form->applyFilter(
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             'stripslashes'
                         );
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1518,12 +1518,12 @@ 
                             "extra_{$field_details['variable']}",
                             $field_details['display_text']
                         );
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1534,13 +1534,13 @@ 
                             $field_details['display_text']
                         );
                         $form->applyFilter(
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             'stripslashes'
                         );
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -2221,19 +2221,19 @@ 
                         break;
                     }
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
                         break;
                     }
 
                     $image = Display::img(
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         $field['display_text'],
                         array('width' => '300')
                     );
 
                     $displayedValue = Display::url(
                         $image,
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         array('target' => '_blank')
                     );
                     break;
@@ -2242,13 +2242,13 @@ 
                         break;
                     }
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
                         break;
                     }
 
                     $displayedValue = Display::url(
                         get_lang('Download'),
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         array(
                             'title' => $field['display_text'],
                             'target' => '_blank'

main/inc/lib/extra_field_value.lib.php

Doc Comments +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
     }
 
     /**
-     * @return ExtraField
+     * @return string
      */
     public function getExtraField()
     {
@@ -72,7 +72,7 @@ 
      * This function is used with $extraField->addElements()
      * @param array $params array for the insertion into the *_field_values table
      *
-     * @return mixed false on empty params, void otherwise
+     * @return false|null false on empty params, void otherwise
      * @assert (array()) === false
      */
     public function saveFieldValues($params)
@@ -500,7 +500,7 @@ 
      * @param int $item_id Item ID (It could be a session_id, course_id or user_id)
      * @param int $field_id Field ID (the ID from the *_field table)
      * @param bool $transform Whether to transform the result to a human readable strings
-     * @return mixed A structured array with the field_id and field_value, or false on error
+     * @return string A structured array with the field_id and field_value, or false on error
      * @assert (-1,-1) === false
      */
     public function get_values_by_handler_and_field_id($item_id, $field_id, $transform = false)
@@ -593,7 +593,7 @@ 
      * @param int $item_id Item ID from the original table
      * @param string $field_variable The name of the field we are looking for
      * @param bool $transform
-     * @param bool $allVisibility
+     * @param bool $visibility
      *
      * @return mixed Array of results, or false on error or not found
      * @assert (-1,'') === false

Indentation +5 added lines, -6 removed lines

@@ -720,11 +720,11 @@ 
         return false;
     }
 
-     /**
-     * @param int $itemId
-     * @param int $fieldId
-     * @return array
-     */
+        /**
+         * @param int $itemId
+         * @param int $fieldId
+         * @return array
+         */
     public function getAllValuesByItemAndField($itemId, $fieldId)
     {
         $fieldId = intval($fieldId);
@@ -847,7 +847,6 @@ 
     /**
      * Deletes all values from an item
      * @param int $itemId (session id, course id, etc)
-
      * @assert (-1,-1) == null
      */
     public function deleteValuesByItem($itemId)

Spacing +8 added lines, -8 removed lines

@@ -209,7 +209,7 @@ 
                             break;
                     }
 
-                    $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE . "_{$params['item_id']}.png";
+                    $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE."_{$params['item_id']}.png";
 
                     if (!file_exists($fileDir)) {
                         mkdir($fileDir, $dirPermissions, true);
@@ -217,11 +217,11 @@ 
 
                     if ($value['error'] == 0) {
                         $imageExtraField = new Image($value['tmp_name']);
-                        $imageExtraField->send_image($fileDir . $fileName, -1, 'png');
+                        $imageExtraField->send_image($fileDir.$fileName, -1, 'png');
                         $newParams = array(
                             'item_id' => $params['item_id'],
                             'field_id' => $extraFieldInfo['id'],
-                            'value' => $fileDirStored . $fileName,
+                            'value' => $fileDirStored.$fileName,
                             'comment' => $comment
                         );
 
@@ -247,18 +247,18 @@ 
                     }
 
                     $cleanedName = api_replace_dangerous_char($value['name']);
-                    $fileName = ExtraField::FIELD_TYPE_FILE . "_{$params['item_id']}_$cleanedName";
+                    $fileName = ExtraField::FIELD_TYPE_FILE."_{$params['item_id']}_$cleanedName";
                     if (!file_exists($fileDir)) {
                         mkdir($fileDir, $dirPermissions, true);
                     }
 
                     if ($value['error'] == 0) {
-                        moveUploadedFile($value, $fileDir . $fileName);
+                        moveUploadedFile($value, $fileDir.$fileName);
 
                         $new_params = array(
                             'item_id' => $params['item_id'],
                             'field_id' => $extraFieldInfo['id'],
-                            'value' => $fileDirStored . $fileName
+                            'value' => $fileDirStored.$fileName
                         );
 
                         if ($this->type !== 'session' && $this->type !== 'course') {
@@ -380,7 +380,7 @@ 
                 */
                 if (false) {
                     global $app;
-                    switch($this->type) {
+                    switch ($this->type) {
                         case 'question':
                             $extraFieldValue = new ChamiloLMS\Entity\QuestionFieldValues();
                             $extraFieldValue->setUserId(api_get_user_id());
@@ -442,7 +442,7 @@ 
                 */
                 if (false) {
                     global $app;
-                    switch($this->type) {
+                    switch ($this->type) {
                         case 'question':
                             $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\QuestionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());

main/inc/lib/formvalidator/Element/DateRangePicker.php

Doc Comments +1 added lines

@@ -145,6 +145,7 @@
 
     /**
     * @param array $dates result of parseDateRange()
+    * @param string $format
     *
     * @return bool
     */

Indentation +6 added lines, -6 removed lines

@@ -7,8 +7,8 @@ 
 class DateRangePicker extends HTML_QuickForm_text
 {
     /**
-    * Constructor
-    */
+     * Constructor
+     */
     public function __construct($elementName = null, $elementLabel = null, $attributes = null)
     {
         if (!isset($attributes['id'])) {
@@ -144,10 +144,10 @@ 
     }
 
     /**
-    * @param array $dates result of parseDateRange()
-    *
-    * @return bool
-    */
+     * @param array $dates result of parseDateRange()
+     *
+     * @return bool
+     */
     public function validateDates($dates, $format = null)
     {
         if (empty($dates['start']) || empty($dates['end'])) {

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
         }
 
         $timePicker = 'true';
-        $timePickerValue =  $this->getAttribute('timePicker');
+        $timePickerValue = $this->getAttribute('timePicker');
         if (!empty($timePickerValue)) {
             $timePicker = $timePickerValue;
         }

main/inc/lib/formvalidator/Rule/HTML.php

Doc Comments +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
      * Get allowed tags
      * @param int $mode NO_HTML, STUDENT_HTML, TEACHER_HTML,
      * STUDENT_HTML_FULLPAGE or TEACHER_HTML_FULLPAGE
-     * @param boolean $fullpage If true, the allowed tags for full-page editing
-     * are returned.
+     * @return string
      */
     static function get_allowed_tags($mode)
     {

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
      */
     function validate($html, $mode = NO_HTML)
     {
-        $allowed_tags = self::get_allowed_tags ($mode, $fullpage);
+        $allowed_tags = self::get_allowed_tags($mode, $fullpage);
         $cleaned_html = kses($html, $allowed_tags);
         return $html == $cleaned_html;
     }
@@ -33,7 +33,7 @@ 
         // Include the allowed tags.
         //include(dirname(__FILE__).'/allowed_tags.inc.php');
         global $allowed_tags_student, $allowed_tags_student_full_page, $allowed_tags_teacher, $allowed_tags_teacher_full_page;
-        switch($mode)
+        switch ($mode)
         {
             case NO_HTML:
                 return array();

main/inc/lib/formvalidator/Rule/MaxFileSize.php

Doc Comments -1 removed lines

@@ -9,7 +9,6 @@
 {
 	/**
 	 * @param $value array     Uploaded file info (from $_FILES)
-	 * @param null $options
 	 * @return bool
 	 */
 	public function validate($elementValue, $maxSize)

Indentation +17 added lines, -17 removed lines

@@ -7,22 +7,22 @@
  */
 class HTML_QuickForm_Rule_MaxFileSize extends HTML_QuickForm_Rule
 {
-	/**
-	 * @param $value array     Uploaded file info (from $_FILES)
-	 * @param null $options
-	 * @return bool
-	 */
-	public function validate($elementValue, $maxSize)
-	{
-		if (!empty($elementValue['error']) &&
-			(UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error'])
-		) {
-			return false;
-		}
-		if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
-			return true;
-		}
+    /**
+     * @param $value array     Uploaded file info (from $_FILES)
+     * @param null $options
+     * @return bool
+     */
+    public function validate($elementValue, $maxSize)
+    {
+        if (!empty($elementValue['error']) &&
+            (UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error'])
+        ) {
+            return false;
+        }
+        if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
+            return true;
+        }
 
-		return ($maxSize >= @filesize($elementValue['tmp_name']));
-	}
+        return ($maxSize >= @filesize($elementValue['tmp_name']));
+    }
 }

main/inc/lib/formvalidator/Rule/MobilePhoneNumber.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      *
      * @param string Mobile phone number to be validated
      * @param string Not using it. Just to respect the declaration
-     * @return boolean Returns true if valid, false otherwise.
+     * @return integer Returns true if valid, false otherwise.
      */
     function validate($mobilePhoneNumber, $options = null)
     {