chamilo / chamilo-lms

main/survey/fillsurvey.php

Indentation +1 added lines, -2 removed lines

@@ -6,8 +6,7 @@
 * @author unknown, the initial survey that did not make it in 1.8 because of bad code
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
 * @author Julio Montoya Armas <gugli100@gmail.com>, Chamilo: Personality Test modification and rewriting large parts of the code as well
-
-* @todo check if the user already filled the survey and if this is the case then the answers have to be updated and not stored again.
+ * @todo check if the user already filled the survey and if this is the case then the answers have to be updated and not stored again.
 * @todo performance could be improved if not the survey_id was stored with the invitation but the survey_code
  */
 // Unsetting the course id (because it is in the URL)

Spacing +6 added lines, -6 removed lines

@@ -112,7 +112,7 @@ 
         $now = api_get_utc_datetime();
         if (Database :: num_rows($result) == 0) {
             $params = [
-                'c_id' => $course_id ,
+                'c_id' => $course_id,
                 'survey_code' => $surveyCode,
                 'user' => $userid,
                 'invitation_code' => $autoInvitationcode,
@@ -471,7 +471,7 @@ 
     $jquery_ready_content = $returnParams['jquery_ready_content'];
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
-    $htmlHeadXtra[] ='<script>
+    $htmlHeadXtra[] = '<script>
     $(document).ready(function(){
         '.$jquery_ready_content.'
     });
@@ -904,16 +904,16 @@ 
                             $group2 = $groups[0];
                             $secondary .= " OR ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
                             $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
-                            $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
+                            $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
                         } else {
                             if ($i != 0) {
                                 $secondary .= " OR ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
                                 $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
-                                $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
+                                $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
                             } else {
                                 $secondary .= " ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
                                 $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
-                                $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
+                                $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
                             }
                         }
                     }
@@ -1132,7 +1132,7 @@ 
                         $questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1'];
                         $questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2'];
                         $questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri'];
-                    }  else {
+                    } else {
                         // If the type is a page break we are finished loading the questions for this page
                         break;
                     }

Braces +1 added lines, -1 removed lines

@@ -1132,7 +1132,7 @@
                         $questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1'];
                         $questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2'];
                         $questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri'];
-                    }  else {
+                    } else {
                         // If the type is a page break we are finished loading the questions for this page
                         break;
                     }

main/survey/ch_yesno.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
                 $class = 'radio-inline';
             }
 
-            $name = 'question' . $questionData['question_id'];
+            $name = 'question'.$questionData['question_id'];
 
             $form->addRadio(
                 $name,

main/survey/reporting.php

Indentation +3 added lines, -3 removed lines

@@ -83,15 +83,15 @@
 
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true) || $isDrhOfCourse) {
-	Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_header(get_lang('ToolSurvey'));
     // Show error message if the survey can be seen only by tutors
     if ($survey_data['visible_results'] != SURVEY_VISIBLE_TUTOR) {
         SurveyUtil::handle_reporting_actions($survey_data, $people_filled);
     } else {
         Display :: display_error_message(get_lang('NotAllowed'), false);
     }
-	Display :: display_footer();
-	exit;
+    Display :: display_footer();
+    exit;
 }
 
 // Database table definitions

Spacing +6 added lines, -6 removed lines

@@ -149,7 +149,7 @@ 
 // Actions bar
 echo '<div class="actions">';
 echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'">'.
-    Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackToSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 // Content
@@ -159,15 +159,15 @@ 
 ) {
     $myweb_survey_id = $survey_id;
     echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=questionreport&amp;survey_id='.$myweb_survey_id.'&amp;'.$cidReq.'&amp;single_page=1">'.
-        Display::return_icon('survey_reporting_overall.png',get_lang('QuestionsOverallReport')).' '.get_lang('QuestionsOverallReport').'</a></div><div class="sectioncomment">'.get_lang('QuestionsOverallReportDetail').' </div>';
+        Display::return_icon('survey_reporting_overall.png', get_lang('QuestionsOverallReport')).' '.get_lang('QuestionsOverallReport').'</a></div><div class="sectioncomment">'.get_lang('QuestionsOverallReportDetail').' </div>';
     echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=questionreport&amp;survey_id='.$myweb_survey_id.'&'.$cidReq.'">'.
-        Display::return_icon('survey_reporting_question.gif',get_lang('DetailedReportByQuestion')).' '.get_lang('DetailedReportByQuestion').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByQuestionDetail').' </div>';
+        Display::return_icon('survey_reporting_question.gif', get_lang('DetailedReportByQuestion')).' '.get_lang('DetailedReportByQuestion').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByQuestionDetail').' </div>';
     echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&amp;survey_id='.$myweb_survey_id.'&'.$cidReq.'">'.
-        Display::return_icon('survey_reporting_user.gif',get_lang('DetailedReportByUser')).' '.get_lang('DetailedReportByUser').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByUserDetail').'.</div>';
+        Display::return_icon('survey_reporting_user.gif', get_lang('DetailedReportByUser')).' '.get_lang('DetailedReportByUser').'</a></div><div class="sectioncomment">'.get_lang('DetailedReportByUserDetail').'.</div>';
     echo '<div class="sectiontitle"><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=comparativereport&amp;survey_id='.$myweb_survey_id.'&'.$cidReq.'">'.
-        Display::return_icon('survey_reporting_comparative.gif',get_lang('ComparativeReport')).' '.get_lang('ComparativeReport').'</a></div><div class="sectioncomment">'.get_lang('ComparativeReportDetail').'.</div>';
+        Display::return_icon('survey_reporting_comparative.gif', get_lang('ComparativeReport')).' '.get_lang('ComparativeReport').'</a></div><div class="sectioncomment">'.get_lang('ComparativeReportDetail').'.</div>';
     echo '<div class="sectiontitle"><a href="reporting.php?action=completereport&amp;survey_id='.$myweb_survey_id.'&'.$cidReq.'">'.
-        Display::return_icon('survey_reporting_complete.gif',get_lang('CompleteReport')).' '.get_lang('CompleteReport').'</a></div><div class="sectioncomment">'.get_lang('CompleteReportDetail').'</div>';
+        Display::return_icon('survey_reporting_complete.gif', get_lang('CompleteReport')).' '.get_lang('CompleteReport').'</a></div><div class="sectioncomment">'.get_lang('CompleteReportDetail').'</div>';
 }
 
 // Footer

main/survey/ch_multiplechoice.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
             foreach ($formData['answers'] as $key => $value) {
                 $this->getForm()->addHtmlEditor('answers['.$key.']', null, false, false, $config);
 
-                if ($key < $total-1) {
+                if ($key < $total - 1) {
                     //$this->getForm()->addButton("move_down[$key]", get_lang('Down'));
                 }
 
@@ -39,7 +39,7 @@ 
                     //$this->getForm()->addButton("move_up[$key]", get_lang('Up'));
                 }
 
-                if ($total> 2) {
+                if ($total > 2) {
                     $this->getForm()->addButton("delete_answer[$key]", get_lang('Delete'), 'trash', 'danger');
                 }
             }

main/survey/question.php

Indentation +38 added lines, -38 removed lines

@@ -19,10 +19,10 @@ 
 
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true)) {
-	Display :: display_header();
-	Display :: display_error_message(get_lang('NotAllowed'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header();
+    Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_footer();
+    exit;
 }
 
 // Is valid request
@@ -42,30 +42,30 @@ 
 $surveyData = SurveyManager::get_survey($_GET['survey_id']);
 
 if (empty($surveyData)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
+    Display :: display_footer();
+    exit;
 }
 
 $urlname = api_substr(api_html_entity_decode($surveyData['title'], ENT_QUOTES), 0, 40);
 if (api_strlen(strip_tags($surveyData['title'])) > 40) {
-	$urlname .= '...';
+    $urlname .= '...';
 }
 
 if ($surveyData['survey_type'] == 1) {
-	$sql = 'SELECT id FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP).'
+    $sql = 'SELECT id FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP).'
 	        WHERE
                 c_id = '.$course_id.' AND
                 survey_id = '.(int)$_GET['survey_id'].' LIMIT 1';
-	$rs = Database::query($sql);
-	if (Database::num_rows($rs)===0) {
+    $rs = Database::query($sql);
+    if (Database::num_rows($rs)===0) {
         Display::addFlash(
             Display::return_message(get_lang('YouNeedToCreateGroups'))
         );
-		header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.(int)$_GET['survey_id']);
-		exit;
-	}
+        header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.(int)$_GET['survey_id']);
+        exit;
+    }
 }
 
 // Breadcrumbs
@@ -80,10 +80,10 @@ 
 
 // Tool name
 if ($_GET['action'] == 'add') {
-	$tool_name = get_lang('AddQuestion');
+    $tool_name = get_lang('AddQuestion');
 }
 if ($_GET['action'] == 'edit') {
-	$tool_name = get_lang('EditQuestion');
+    $tool_name = get_lang('EditQuestion');
 }
 
 // The possible question types
@@ -103,14 +103,14 @@ 
 // Actions
 $actions = '<div class="actions">';
 $actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.intval($_GET['survey_id']).'">'.
-	Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
 $actions .= '</div>';
 // Checking if it is a valid type
 if (!in_array($_GET['type'], $possible_types)) {
-	Display :: display_header($tool_name, 'Survey');
-	echo $actions;
-	Display :: display_error_message(get_lang('TypeDoesNotExist'), false);
-	Display :: display_footer();
+    Display :: display_header($tool_name, 'Survey');
+    echo $actions;
+    Display :: display_error_message(get_lang('TypeDoesNotExist'), false);
+    Display :: display_footer();
 }
 
 $error_message = '';
@@ -126,27 +126,27 @@ 
 $formData['answers'] = array('', '');
 
 if ($_GET['type'] == 'yesno') {
-	$formData['answers'][0] = get_lang('Yes');
-	$formData['answers'][1] = get_lang('No');
+    $formData['answers'][0] = get_lang('Yes');
+    $formData['answers'][1] = get_lang('No');
 }
 
 if ($_GET['type'] == 'personality') {
-	$formData['answers'][0] = 1;
-	$formData['answers'][1] = 2;
-	$formData['answers'][2] = 3;
-	$formData['answers'][3] = 4;
-	$formData['answers'][4] = 5;
-
-	$formData['values'][0] = 0;
-	$formData['values'][1] = 0;
-	$formData['values'][2] = 1;
-	$formData['values'][3] = 2;
-	$formData['values'][4] = 3;
+    $formData['answers'][0] = 1;
+    $formData['answers'][1] = 2;
+    $formData['answers'][2] = 3;
+    $formData['answers'][3] = 4;
+    $formData['answers'][4] = 5;
+
+    $formData['values'][0] = 0;
+    $formData['values'][1] = 0;
+    $formData['values'][2] = 1;
+    $formData['values'][3] = 2;
+    $formData['values'][4] = 3;
 }
 
 // We are editing a question
 if (isset($_GET['question_id']) && !empty($_GET['question_id'])) {
-	$formData = SurveyManager::get_question($_GET['question_id']);
+    $formData = SurveyManager::get_question($_GET['question_id']);
 }
 
 $formData = $surveyQuestion->preSave($formData);
@@ -155,8 +155,8 @@ 
 $surveyQuestion->renderForm();
 
 if ($surveyQuestion->getForm()->validate()) {
-	$values = $surveyQuestion->getForm()->getSubmitValues();
-	$surveyQuestion->save($surveyData, $values);
+    $values = $surveyQuestion->getForm()->getSubmitValues();
+    $surveyQuestion->save($surveyData, $values);
 }
 
 Display::display_header($tool_name, 'Survey');

Spacing +4 added lines, -4 removed lines

@@ -57,13 +57,13 @@ 
 	$sql = 'SELECT id FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP).'
 	        WHERE
                 c_id = '.$course_id.' AND
-                survey_id = '.(int)$_GET['survey_id'].' LIMIT 1';
+                survey_id = '.(int) $_GET['survey_id'].' LIMIT 1';
 	$rs = Database::query($sql);
-	if (Database::num_rows($rs)===0) {
+	if (Database::num_rows($rs) === 0) {
         Display::addFlash(
             Display::return_message(get_lang('YouNeedToCreateGroups'))
         );
-		header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.(int)$_GET['survey_id']);
+		header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.(int) $_GET['survey_id']);
 		exit;
 	}
 }
@@ -103,7 +103,7 @@ 
 // Actions
 $actions = '<div class="actions">';
 $actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.intval($_GET['survey_id']).'">'.
-	Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+	Display::return_icon('back.png', get_lang('BackToSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
 $actions .= '</div>';
 // Checking if it is a valid type
 if (!in_array($_GET['type'], $possible_types)) {

main/survey/survey.lib.php

Indentation +10 added lines, -10 removed lines

@@ -1207,16 +1207,16 @@
     }
 
     /**
-    * This function saves the question in the shared database
-    *
-    * @param array $form_content all the information of the form
-    * @param array $survey_data all the information of the survey
-    *
-    * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-    * @version February 2007
-    *
-    * @todo editing of a shared question
-    */
+     * This function saves the question in the shared database
+     *
+     * @param array $form_content all the information of the form
+     * @param array $survey_data all the information of the survey
+     *
+     * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+     * @version February 2007
+     *
+     * @todo editing of a shared question
+     */
     public function save_shared_question($form_content, $survey_data)
     {
         $_course = api_get_course_info();

Braces +3 added lines, -5 removed lines

@@ -1247,7 +1247,7 @@ 
                     '".Database::escape_string($_course['id'])."')";
             Database::query($sql);
             $shared_question_id = Database::insert_id();
-        }  else {
+        } else {
             // Updating an existing question
             // adding the question to the survey_question table
             $sql = "UPDATE $tbl_survey_question SET
@@ -2776,14 +2776,12 @@ 
                                 echo $answers_of_user[$question_id][$option_id]['value'];
                                 echo "</td>";
                             }
-                        }
-                        else {
+                        } else {
                             echo '<td align="center">';
                             if (!empty($answers_of_user[$question_id][$option_id])) {
                                 if ($answers_of_user[$question_id][$option_id]['value'] != 0) {
                                     echo $answers_of_user[$question_id][$option_id]['value'];
-                                }
-                                else {
+                                } else {
                                     echo 'v';
                                 }
                             }

Doc Comments +18 added lines, -15 removed lines

@@ -47,7 +47,7 @@ 
      * Deletes all survey invitations of a user
      * @param int $user_id
      *
-     * @return boolean
+     * @return false|null
      * @assert ('') === false
      */
     public static function delete_all_survey_invitations_by_user($user_id)
@@ -104,7 +104,7 @@ 
      * Retrieves all the survey information
      *
      * @param integer $survey_id the id of the survey
-     * @param boolean $shared this parameter determines if
+     * @param integer $shared this parameter determines if
      * we have to get the information of a survey from the central (shared) database or from the
      * 		  course database
      * @param string course code optional
@@ -571,7 +571,7 @@ 
      * This function deletes a survey (and also all the question in that survey
      *
      * @param int $survey_id id of the survey that has to be deleted
-     * @return true
+     * @return boolean
      *
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
      * @version January 2007
@@ -756,7 +756,7 @@ 
      *
      * @param int $survey_id id of the survey that has to be duplicated
      * @param int $courseId id of the course which survey has to be duplicated
-     * @return true
+     * @return boolean
      *
      * @author Eric Marguin <e.marguin@elixir-interactive.com>, Elixir Interactive
      * @version October 2007
@@ -796,7 +796,7 @@ 
     /**
      * This function recalculates the number of people who have taken the survey (=filled at least one question)
      *
-     * @param int $survey_id the id of the survey somebody
+     * @param int $survey_data the id of the survey somebody
      * @return true
      *
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
@@ -1367,7 +1367,7 @@ 
      * This function deletes a shared survey question from the main database and all its options
      *
      * @param int $question_id the id of the question
-     * @param int $shared
+     * @param integer $survey_id
      *
      * @todo delete all the options of this question
      *
@@ -1494,8 +1494,8 @@ 
      * This function deletes all the options of the questions of a given survey
      * This function is normally only called when a survey is deleted
      *
-     * @param $survey_id the id of the survey that has to be deleted
-     * @return true
+     * @param integer $survey_id the id of the survey that has to be deleted
+     * @return boolean
      *
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
      * @version January 2007
@@ -1562,8 +1562,8 @@ 
      * This function deletes all the answers anyone has given on this survey
      * This function is normally only called when a survey is deleted
      *
-     * @param $survey_id the id of the survey that has to be deleted
-     * @return true
+     * @param integer $survey_id the id of the survey that has to be deleted
+     * @return boolean
      *
      * @todo write the function
      *
@@ -1838,7 +1838,7 @@ 
     /**
      * This function checks the parameters that are used in this page
      *
-     * @return 	string 	The header, an error and the footer if any parameter fails, else it returns true
+     * @return 	null|boolean 	The header, an error and the footer if any parameter fails, else it returns true
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
      * @version February 2007
      */
@@ -2389,6 +2389,7 @@ 
      * Display score data about a survey question
      * @param	array	Question info
      * @param	integer	The offset of results shown
+     * @param integer $offset
      * @return	void 	(direct output)
      */
     public static function display_question_report_score($survey_data, $question, $offset)
@@ -3024,7 +3025,7 @@ 
      * Quite similar to display_complete_report(), returns an HTML string
      * that can be used in a csv file
      * @todo consider merging this function with display_complete_report
-     * @return	string	The contents of a csv file
+     * @return	false|null	The contents of a csv file
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
      * @version February 2007
      */
@@ -3246,7 +3247,7 @@ 
      * @param	array	User's answers
      * @param 	mixed	User ID or user details as string - Used as a string in the result string
      * @param	boolean	Whether to display user fields or not
-     * @return	string	One line of the csv file
+     * @return	string[]	One line of the csv file
      */
     public static function export_complete_report_row_xls(
         $survey_data,
@@ -3552,6 +3553,7 @@ 
      *
      * @param	integer	Survey ID
      * @param	integer	Question ID
+     * @param integer $survey_id
      * @return 	Array	Array containing all answers of all users, grouped by user
      *
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
@@ -3846,7 +3848,7 @@ 
 
     /**
      * @param $params
-     * @return bool|int
+     * @return false|string
      */
     public static function save_invitation($params)
     {
@@ -3900,6 +3902,7 @@ 
      *
      * @param int invitedUser - the userId (course user) or emailaddress of additional user
      * $param string $invitation_code - the unique invitation code for the URL
+     * @param string|null $invitation_text
      * @return	void
      */
     public static function send_invitation_mail($invitedUser, $invitation_code, $invitation_title, $invitation_text)
@@ -4794,7 +4797,7 @@ 
      * @author Isaac Flores Paz <florespaz@bidsoftperu.com>
      * @param int $user_id - User ID
      * @param string $survey_code
-     * @param int $user_id_answer - User in survey answer table (user id or anonymus)
+     * @param int $user_answer - User in survey answer table (user id or anonymus)
      *
      * @return boolean
      */

Spacing +151 added lines, -152 removed lines

@@ -35,7 +35,7 @@ 
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
                 $num++;
-                $new_code = $code . $num;
+                $new_code = $code.$num;
             } else {
                 break;
             }
@@ -63,7 +63,7 @@ 
         $sql = "SELECT survey_invitation_id, survey_code
                 FROM $table_survey_invitation WHERE user = '$user_id' AND c_id <> 0 ";
         $result = Database::query($sql);
-        while ($row = Database::fetch_array($result ,'ASSOC')){
+        while ($row = Database::fetch_array($result, 'ASSOC')) {
             $survey_invitation_id = $row['survey_invitation_id'];
             $survey_code = $row['survey_code'];
             $sql2 = "DELETE FROM $table_survey_invitation
@@ -129,7 +129,7 @@ 
         $table_survey = Database :: get_course_table(TABLE_SURVEY);
 
         if ($shared != 0) {
-            $table_survey	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
+            $table_survey = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
             $sql = "SELECT * FROM $table_survey
                     WHERE survey_id='".intval($survey_id)."' ";
         } else {
@@ -142,8 +142,8 @@ 
         $result = Database::query($sql);
         $return = array();
 
-        if (Database::num_rows($result)> 0) {
-            $return = Database::fetch_array($result,'ASSOC');
+        if (Database::num_rows($result) > 0) {
+            $return = Database::fetch_array($result, 'ASSOC');
             if ($simple_return) {
                 return $return;
             }
@@ -187,7 +187,7 @@ 
         $course_id = api_get_course_int_id();
         $session_id = api_get_session_id();
         $courseCode = api_get_course_id();
-        $table_survey 	= Database :: get_course_table(TABLE_SURVEY);
+        $table_survey = Database :: get_course_table(TABLE_SURVEY);
         $shared_survey_id = 0;
 
         if (!isset($values['survey_id'])) {
@@ -233,7 +233,7 @@ 
                             if ($values[$field] == '') {
                                 $values[$field] = 0;
                             }
-                            $field_values.= $field.':'.$values[$field].'@';
+                            $field_values .= $field.':'.$values[$field].'@';
                         }
                     }
                     $extraParams['form_fields'] = $field_values;
@@ -385,7 +385,7 @@ 
             if ($values['anonymous'] == 0) {
                 $extraParams['show_form_profile'] = $values['show_form_profile'];
                 if ($values['show_form_profile'] == 1) {
-                    $fields = explode(',',$values['input_name_list']);
+                    $fields = explode(',', $values['input_name_list']);
                     $field_values = '';
                     foreach ($fields as &$field) {
                         if ($field != '') {
@@ -394,7 +394,7 @@ 
                             ) {
                                 $values[$field] = 0;
                             }
-                            $field_values.= $field.':'.$values[$field].'@';
+                            $field_values .= $field.':'.$values[$field].'@';
                         }
                     }
                     $extraParams['form_fields'] = $field_values;
@@ -526,7 +526,7 @@ 
         $_course = api_get_course_info();
 
         // Table definitions
-        $table_survey	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
+        $table_survey = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
 
         if (!$values['survey_id'] ||
             !is_numeric($values['survey_id']) ||
@@ -544,7 +544,7 @@ 
                     '".api_get_utc_datetime()."',
                     '".$_course['id']."')";
             Database::query($sql);
-            $return	= Database::insert_id();
+            $return = Database::insert_id();
 
             $sql = "UPDATE $table_survey SET survey_id = $return WHERE iid = $return";
             Database::query($sql);
@@ -561,7 +561,7 @@ 
                         surveythanks	= '".Database::escape_string($values['survey_thanks'])."'
 					WHERE survey_id = '".Database::escape_string($values['survey_share']['survey_share'])."'";
             Database::query($sql);
-            $return	= $values['survey_share']['survey_share'];
+            $return = $values['survey_share']['survey_share'];
         }
 
         return $return;
@@ -659,7 +659,7 @@ 
             $params['c_id'] = $targetCourseId;
             unset($params['survey_id']);
             $params['session_id'] = api_get_session_id();
-            $params['title'] = $params['title'] . ' ' . get_lang('Copy');
+            $params['title'] = $params['title'].' '.get_lang('Copy');
             unset($params['iid']);
             Database::insert($table_survey, $params);
             $new_survey_id = Database::insert_id();
@@ -685,7 +685,7 @@ 
         $sql = "SELECT * FROM $table_survey_question_group
                 WHERE c_id = $course_id AND  survey_id='".$survey_id."'";
         $res = Database::query($sql);
-        while($row = Database::fetch_array($res, 'ASSOC')) {
+        while ($row = Database::fetch_array($res, 'ASSOC')) {
             $params = array(
                 'c_id' =>  $targetCourseId,
                 'name' => $row['name'],
@@ -732,7 +732,7 @@ 
                 WHERE c_id = $course_id AND survey_id='".$survey_id."'";
 
         $res = Database::query($sql);
-        while ($row = Database::fetch_array($res ,'ASSOC')) {
+        while ($row = Database::fetch_array($res, 'ASSOC')) {
             $params = array(
                 'c_id' =>  $targetCourseId,
                 'question_id' => $question_id[$row['question_id']],
@@ -897,7 +897,7 @@ 
     {
         // Table definitions
         $tbl_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
         $course_id = api_get_course_int_id();
 
         $sql = "SELECT * FROM $tbl_survey_question
@@ -923,7 +923,7 @@ 
         // Getting the information of the question
 
         $result = Database::query($sql);
-        $row = Database::fetch_array($result,'ASSOC');
+        $row = Database::fetch_array($result, 'ASSOC');
 
         $return['survey_id'] = $row['survey_id'];
         $return['question_id'] = $row['question_id'];
@@ -971,8 +971,8 @@ 
     public static function get_questions($survey_id, $course_id = '')
     {
         // Table definitions
-        $tbl_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
-        $table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+        $tbl_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 
         if (empty($course_id)) {
             $course_id = api_get_course_int_id();
@@ -1076,7 +1076,7 @@ 
 					        FROM $tbl_survey_question
                             WHERE c_id = $course_id AND survey_id='".intval($form_content['survey_id'])."'";
                     $result = Database::query($sql);
-                    $row = Database::fetch_array($result,'ASSOC');
+                    $row = Database::fetch_array($result, 'ASSOC');
                     $max_sort = $row['max_sort'];
 
                     // Some variables defined for survey-test type
@@ -1213,7 +1213,7 @@ 
                     WHERE survey_id='".intval($survey_data['survey_share'])."'
                     AND code='".Database::escape_string($_course['id'])."'";
             $result = Database::query($sql);
-            $row = Database::fetch_array($result,'ASSOC');
+            $row = Database::fetch_array($result, 'ASSOC');
             $max_sort = $row['max_sort'];
 
             // Adding the question to the survey_question table
@@ -1223,11 +1223,11 @@ 
                     '".Database::escape_string($form_content['question_comment'])."',
                     '".Database::escape_string($form_content['type'])."',
                     '".Database::escape_string($form_content['horizontalvertical'])."',
-                    '".Database::escape_string($max_sort+1)."',
+                    '".Database::escape_string($max_sort + 1)."',
                     '".Database::escape_string($_course['id'])."')";
             Database::query($sql);
             $shared_question_id = Database::insert_id();
-        }  else {
+        } else {
             // Updating an existing question
             // adding the question to the survey_question table
             $sql = "UPDATE $tbl_survey_question SET
@@ -1257,7 +1257,7 @@ 
     public static function move_survey_question($direction, $survey_question_id, $survey_id)
     {
         // Table definition
-        $table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
         $course_id = api_get_course_int_id();
 
         if ($direction == 'moveup') {
@@ -1309,11 +1309,11 @@ 
         $course_id = api_get_course_int_id();
 
         // Table definitions
-        $table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
         $course_condition = " c_id = $course_id AND ";
         if ($shared) {
             $course_condition = "";
-            $table_survey_question 	= Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
+            $table_survey_question = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
         }
 
         $sql = "DELETE FROM $table_survey_question
@@ -1346,7 +1346,7 @@ 
     {
         $course_id = api_get_course_int_id();
         // Table definitions
-        $table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
         if ($shared) {
             SurveyManager::delete_shared_survey_question($survey_id, $question_id);
         }
@@ -1408,7 +1408,7 @@ 
         $course_id = api_get_course_int_id();
         // A percentage question type has options 1 -> 100
         if ($form_content['type'] == 'percentage') {
-            for($i = 1; $i < 101; $i++) {
+            for ($i = 1; $i < 101; $i++) {
                 $form_content['answers'][] = $i;
             }
         }
@@ -1589,7 +1589,7 @@ 
     {
         $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
 
-        $user_id	= intval($user_id);
+        $user_id = intval($user_id);
         $course_id	= intval($course_id);
         $survey_id	= intval($survey_id);
 
@@ -1774,7 +1774,7 @@ 
     public static function remove_answer($user, $survey_id, $question_id, $course_id) {
         $course_id = intval($course_id);
         // table definition
-        $table_survey_answer 		= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
         $sql = "DELETE FROM $table_survey_answer
 				WHERE
 				    c_id = $course_id AND
@@ -2009,19 +2009,19 @@ 
         // Actions bar
         echo '<div class="actions">';
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?survey_id='.$surveyId.'&'.api_get_cidreq().'">'.
-            Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ReportingOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ReportingOverview'), '', ICON_SIZE_MEDIUM).'</a>';
         if (isset($_GET['user'])) {
             if (api_is_allowed_to_edit()) {
                 // The delete link
                 echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=deleteuserreport&survey_id='.$surveyId.'&'.api_get_cidreq().'&user='.Security::remove_XSS($_GET['user']).'" >'.
-                    Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_MEDIUM).'</a>';
+                    Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_MEDIUM).'</a>';
             }
 
             // Export the user report
             echo '<a href="javascript: void(0);" onclick="document.form1a.submit();">'.
-                Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
+                Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a> ';
             echo '<a href="javascript: void(0);" onclick="document.form1b.submit();">'.
-                Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a> ';
+                Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a> ';
             echo '<form id="form1a" name="form1a" method="post" action="'.api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&survey_id='.$surveyId.'&'.api_get_cidreq().'&user_id='.Security::remove_XSS($_GET['user']).'">';
             echo '<input type="hidden" name="export_report" value="export_report">';
             echo '<input type="hidden" name="export_format" value="csv">';
@@ -2054,7 +2054,7 @@ 
                     $name = $person['invited_user'];
                 }
             } else {
-                $name  = get_lang('Anonymous') . ' ' . ($key + 1);
+                $name = get_lang('Anonymous').' '.($key + 1);
                 $id = $person;
             }
             echo '<option value="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.Security::remove_XSS($_GET['action']).'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&user='.Security::remove_XSS($id).'" ';
@@ -2197,7 +2197,7 @@ 
 
         echo '<div class="actions">';
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?survey_id='.$surveyId.'">'.
-            Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ReportingOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ReportingOverview'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
 
         if ($survey_data['number_of_questions'] > 0) {
@@ -2205,18 +2205,18 @@ 
             if (!$singlePage) {
                 echo '<div id="question_report_questionnumbers" class="pagination">';
                 if ($currentQuestion != 0) {
-                    echo '<li><a href="' . api_get_path(WEB_CODE_PATH) . 'survey/reporting.php?action=' . $action . '&' . api_get_cidreq() . '&survey_id=' . $surveyId . '&question=' . ($offset - 1) . '">' . get_lang('PreviousQuestion') . '</a></li>';
+                    echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.$action.'&'.api_get_cidreq().'&survey_id='.$surveyId.'&question='.($offset - 1).'">'.get_lang('PreviousQuestion').'</a></li>';
                 }
 
                 for ($i = 1; $i <= $survey_data['number_of_questions']; $i++) {
                     if ($offset != $i - 1) {
-                        echo '<li><a href="' . api_get_path(WEB_CODE_PATH) . 'survey/reporting.php?action=' . $action . '&' . api_get_cidreq() . '&survey_id=' . $surveyId . '&question=' . ($i - 1) . '">' . $i . '</a></li>';
+                        echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.$action.'&'.api_get_cidreq().'&survey_id='.$surveyId.'&question='.($i - 1).'">'.$i.'</a></li>';
                     } else {
-                        echo '<li class="disabled"s><a href="#">' . $i . '</a></li>';
+                        echo '<li class="disabled"s><a href="#">'.$i.'</a></li>';
                     }
                 }
                 if ($currentQuestion < ($survey_data['number_of_questions'] - 1)) {
-                    echo '<li><a href="' . api_get_path(WEB_CODE_PATH) . 'survey/reporting.php?action=' . $action . '&' . api_get_cidreq() . '&survey_id=' . $surveyId . '&question=' . ($offset + 1) . '">' . get_lang('NextQuestion') . '</li></a>';
+                    echo '<li><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.$action.'&'.api_get_cidreq().'&survey_id='.$surveyId.'&question='.($offset + 1).'">'.get_lang('NextQuestion').'</li></a>';
                 }
                 echo '</ul>';
                 echo '</div>';
@@ -2254,19 +2254,19 @@ 
                 $sql = "SELECT * FROM $table_survey_answer
                         WHERE
                             c_id = $course_id AND
-                            survey_id='" . intval($_GET['survey_id']) . "' AND
-                            question_id = '" . intval($question['question_id']) . "'";
+                            survey_id='".intval($_GET['survey_id'])."' AND
+                            question_id = '" . intval($question['question_id'])."'";
                 $result = Database::query($sql);
                 while ($row = Database::fetch_array($result, 'ASSOC')) {
-                    echo $row['option_id'] . '<hr noshade="noshade" size="1" />';
+                    echo $row['option_id'].'<hr noshade="noshade" size="1" />';
                 }
             } else {
                 // Getting the options ORDER BY sort ASC
                 $sql = "SELECT * FROM $table_survey_question_option
                         WHERE
                             c_id = $course_id AND
-                            survey_id='" . intval($_GET['survey_id']) . "'
-                            AND question_id = '" . intval($question['question_id']) . "'
+                            survey_id='".intval($_GET['survey_id'])."'
+                            AND question_id = '" . intval($question['question_id'])."'
                         ORDER BY sort ASC";
                 $result = Database::query($sql);
                 while ($row = Database::fetch_array($result, 'ASSOC')) {
@@ -2276,8 +2276,8 @@ 
                 $sql = "SELECT *, count(answer_id) as total FROM $table_survey_answer
                         WHERE
                             c_id = $course_id AND
-                            survey_id='" . intval($_GET['survey_id']) . "'
-                            AND question_id = '" . intval($question['question_id']) . "'
+                            survey_id='".intval($_GET['survey_id'])."'
+                            AND question_id = '" . intval($question['question_id'])."'
                         GROUP BY option_id, value";
                 $result = Database::query($sql);
                 $number_of_answers = array();
@@ -2294,8 +2294,7 @@ 
                     $optionText = strip_tags($option['option_text']);
                     $optionText = html_entity_decode($optionText);
                     $votes = isset($data[$option['question_option_id']]['total']) ?
-                        $data[$option['question_option_id']]['total'] :
-                        '0';
+                        $data[$option['question_option_id']]['total'] : '0';
                     array_push($chartData, array('option' => $optionText, 'votes' => $votes));
                 }
                 $chartContainerId = 'chartContainer'.$question['question_id'];
@@ -2307,9 +2306,9 @@ 
                 echo '<table class="display-survey table">';
                 echo '	<tr>';
                 echo '		<th>&nbsp;</th>';
-                echo '		<th>' . get_lang('AbsoluteTotal') . '</th>';
-                echo '		<th>' . get_lang('Percentage') . '</th>';
-                echo '		<th>' . get_lang('VisualRepresentation') . '</th>';
+                echo '		<th>'.get_lang('AbsoluteTotal').'</th>';
+                echo '		<th>'.get_lang('Percentage').'</th>';
+                echo '		<th>'.get_lang('VisualRepresentation').'</th>';
                 echo '	<tr>';
 
                 // Displaying the table: the content
@@ -2329,22 +2328,22 @@ 
                             $answers_number = $absolute_number / $number_of_answers[$option['question_id']] * 100;
                         }
                         echo '	<tr>';
-                        echo '		<td class="center">' . $value['option_text'] . '</td>';
+                        echo '		<td class="center">'.$value['option_text'].'</td>';
                         echo '		<td class="center">';
                         if ($absolute_number != 0) {
-                            echo '<a href="' . api_get_path(WEB_CODE_PATH) . 'survey/reporting.php?action=' . $action . '&survey_id=' . $surveyId . '&question=' . $offset . '&viewoption=' . $value['question_option_id'] . '">' . $absolute_number . '</a>';
+                            echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.$action.'&survey_id='.$surveyId.'&question='.$offset.'&viewoption='.$value['question_option_id'].'">'.$absolute_number.'</a>';
                         } else {
                             echo '0';
                         }
 
                         echo '      </td>';
-                        echo '		<td class="center">' . round($answers_number, 2) . ' %</td>';
+                        echo '		<td class="center">'.round($answers_number, 2).' %</td>';
                         echo '		<td class="center">';
                         $size = $answers_number * 2;
                         if ($size > 0) {
-                            echo '<div style="border:1px solid #264269; background-color:#aecaf4; height:10px; width:' . $size . 'px">&nbsp;</div>';
+                            echo '<div style="border:1px solid #264269; background-color:#aecaf4; height:10px; width:'.$size.'px">&nbsp;</div>';
                         } else {
-                            echo '<div style="text-align: left;">' . get_lang("NoDataAvailable") . '</div>';
+                            echo '<div style="text-align: left;">'.get_lang("NoDataAvailable").'</div>';
                         }
                         echo ' </td>';
                         echo ' </tr>';
@@ -2352,8 +2351,8 @@ 
                 }
                 // displaying the table: footer (totals)
                 echo '	<tr>';
-                echo '		<td class="total"><b>' . get_lang('Total') . '</b></td>';
-                echo '		<td class="total"><b>' . ($number_of_answers[$option['question_id']] == 0 ? '0' : $number_of_answers[$option['question_id']]) . '</b></td>';
+                echo '		<td class="total"><b>'.get_lang('Total').'</b></td>';
+                echo '		<td class="total"><b>'.($number_of_answers[$option['question_id']] == 0 ? '0' : $number_of_answers[$option['question_id']]).'</b></td>';
                 echo '		<td class="total">&nbsp;</td>';
                 echo '		<td class="total">&nbsp;</td>';
                 echo '	</tr>';
@@ -2397,8 +2396,8 @@ 
     public static function display_question_report_score($survey_data, $question, $offset)
     {
         // Database table definitions
-        $table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-        $table_survey_answer 			= Database :: get_course_table(TABLE_SURVEY_ANSWER);
+        $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+        $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
 
         $course_id = api_get_course_int_id();
 
@@ -2468,9 +2467,9 @@ 
                 echo '		<td>'.$value['option_text'].'</td>';
                 echo '		<td>'.$i.'</td>';
                 echo '		<td><a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action='.$action.'&survey_id='.Security::remove_XSS($_GET['survey_id']).'&question='.Security::remove_XSS($offset).'&viewoption='.$value['question_option_id'].'&value='.$i.'">'.$absolute_number.'</a></td>';
-                echo '		<td>'.round($absolute_number/$number_of_answers*100, 2).' %</td>';
+                echo '		<td>'.round($absolute_number / $number_of_answers * 100, 2).' %</td>';
                 echo '		<td>';
-                $size = ($absolute_number/$number_of_answers*100*2);
+                $size = ($absolute_number / $number_of_answers * 100 * 2);
                 if ($size > 0) {
                     echo '			<div style="border:1px solid #264269; background-color:#aecaf4; height:10px; width:'.$size.'px">&nbsp;</div>';
                 }
@@ -2510,11 +2509,11 @@ 
         // Actions bar
         echo '<div class="actions">';
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?survey_id='.Security::remove_XSS($_GET['survey_id']).'">
-		'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ReportingOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+		'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ReportingOverview'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '<a class="survey_export_link" href="javascript: void(0);" onclick="document.form1a.submit();">
-		'.Display::return_icon('export_csv.png',get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
+		'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '<a class="survey_export_link" href="javascript: void(0);" onclick="document.form1b.submit();">
-		'.Display::return_icon('export_excel.png',get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a>';
+		'.Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
 
         // The form
@@ -2549,8 +2548,8 @@ 
             // Show user fields section with a big th colspan that spans over all fields
             $extra_user_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false, true);
             $num = count($extra_user_fields);
-            if ($num > 0 ) {
-                echo '<th '.($num>0?' colspan="'.$num.'"':'').'>';
+            if ($num > 0) {
+                echo '<th '.($num > 0 ? ' colspan="'.$num.'"' : '').'>';
                 echo '<label><input type="checkbox" name="fields_filter" value="1" checked="checked"/> ';
                 echo get_lang('UserFields');
                 echo '</label>';
@@ -2606,7 +2605,7 @@ 
         if (!(isset($_POST['submit_question_filter']) && $_POST['submit_question_filter'] ||
                 isset($_POST['export_report']) && $_POST['export_report']) || !empty($_POST['fields_filter'])) {
             //show the fields names for user fields
-            foreach($extra_user_fields as & $field) {
+            foreach ($extra_user_fields as & $field) {
                 echo '<th>'.$field[3].'</th>';
             }
         }
@@ -2689,7 +2688,7 @@ 
                     $questions,
                     $display_extra_user_fields
                 );
-                $answers_of_user=array();
+                $answers_of_user = array();
             }
             if (isset($questions[$row['question_id']]) && $questions[$row['question_id']]['type'] != 'open') {
                 $answers_of_user[$row['question_id']][$row['option_id']] = $row;
@@ -2751,7 +2750,7 @@ 
                 echo '<th>'.$user.'</th>'; // the user column
             }
         } else {
-            echo '<th>' . get_lang('Anonymous') . ' ' . $user . '</th>';
+            echo '<th>'.get_lang('Anonymous').' '.$user.'</th>';
         }
 
         if ($display_extra_user_fields) {
@@ -2847,10 +2846,10 @@ 
                 // We do not show comment and pagebreak question types
                 if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
                     if ($row['number_of_options'] == 0 && $row['type'] == 'open') {
-                        $return .= str_replace("\r\n",'  ', api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)).';';
+                        $return .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)).';';
                     } else {
                         for ($ii = 0; $ii < $row['number_of_options']; $ii++) {
-                            $return .= str_replace("\r\n",'  ', api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)).';';
+                            $return .= str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($row['survey_question']), ENT_QUOTES)).';';
                         }
                     }
                 }
@@ -2864,7 +2863,7 @@ 
         // Show the fields names for user fields
         if (!empty($extra_user_fields)) {
             foreach ($extra_user_fields as & $field) {
-                $return .= '"'.str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES)).'";';
+                $return .= '"'.str_replace("\r\n", '  ', api_html_entity_decode(strip_tags($field[3]), ENT_QUOTES)).'";';
             }
         }
 
@@ -2900,7 +2899,7 @@ 
             ) {
                 // We do not show comment and pagebreak question types
                 if ($row['type'] != 'comment' && $row['type'] != 'pagebreak') {
-                    $row['option_text'] = str_replace(array("\r","\n"),array('',''),$row['option_text']);
+                    $row['option_text'] = str_replace(array("\r", "\n"), array('', ''), $row['option_text']);
                     $return .= api_html_entity_decode(strip_tags($row['option_text']), ENT_QUOTES).';';
                     $possible_answers[$row['question_id']][$row['question_option_id']] = $row['question_option_id'];
                     $possible_answers_type[$row['question_id']] = $row['type'];
@@ -2930,9 +2929,9 @@ 
                     $old_user,
                     true
                 );
-                $answers_of_user=array();
+                $answers_of_user = array();
             }
-            if($possible_answers_type[$row['question_id']] == 'open') {
+            if ($possible_answers_type[$row['question_id']] == 'open') {
                 $temp_id = 'open'.$open_question_iterator;
                 $answers_of_user[$row['question_id']][$temp_id] = $row;
                 $open_question_iterator++;
@@ -2991,7 +2990,7 @@ 
 
         if ($display_extra_user_fields) {
             // Show user fields data, if any, for this user
-            $user_fields_values = UserManager::get_extra_user_data($user,false,false, false, true);
+            $user_fields_values = UserManager::get_extra_user_data($user, false, false, false, true);
             foreach ($user_fields_values as & $value) {
                 $return .= '"'.str_replace('"', '""', api_html_entity_decode(strip_tags($value), ENT_QUOTES)).'";';
             }
@@ -3104,7 +3103,7 @@ 
                         );
                         $column++;
                     } else {
-                        for ($ii = 0; $ii < $row['number_of_options']; $ii ++) {
+                        for ($ii = 0; $ii < $row['number_of_options']; $ii++) {
                             $worksheet->setCellValueByColumnAndRow(
                                 $column,
                                 $line,
@@ -3185,7 +3184,7 @@ 
         }
 
         // Getting all the answers of the users
-        $line ++;
+        $line++;
         $column = 0;
         $old_user = '';
         $answers_of_user = array();
@@ -3194,7 +3193,7 @@ 
         if ($user_id != 0) {
             $sql .= " AND user='".intval($user_id)."' ";
         }
-        $sql .=	" ORDER BY user ASC";
+        $sql .= " ORDER BY user ASC";
 
         $open_question_iterator = 1;
         $result = Database::query($sql);
@@ -3270,7 +3269,7 @@ 
                         FROM '.Database::get_main_table(TABLE_MAIN_USER).'
                         WHERE user_id='.intval($user);
                 $rs = Database::query($sql);
-                if($row = Database::fetch_array($rs)) {
+                if ($row = Database::fetch_array($rs)) {
                     $user_displayed = api_get_person_name($row['firstname'], $row['lastname']);
                 } else {
                     $user_displayed = '-';
@@ -3285,7 +3284,7 @@ 
 
         if ($display_extra_user_fields) {
             //show user fields data, if any, for this user
-            $user_fields_values = UserManager::get_extra_user_data(intval($user),false,false, false, true);
+            $user_fields_values = UserManager::get_extra_user_data(intval($user), false, false, false, true);
             foreach ($user_fields_values as $value) {
                 $return[] = api_html_entity_decode(strip_tags($value), ENT_QUOTES);
             }
@@ -3346,7 +3345,7 @@ 
         // Actions bar
         echo '<div class="actions">';
         echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?survey_id='.$surveyId.'&'.api_get_cidreq().'">'.
-                Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ReportingOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ReportingOverview'), '', ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
 
         // Displaying an information message that only the questions with predefined answers can be used in a comparative report
@@ -3411,17 +3410,17 @@ 
             $tableHtml .= '<tr>';
             for ($ii = 0; $ii <= count($question_x['answers']); $ii++) {
                 if ($ii == 0) {
-                    $tableHtml .=  '<th>&nbsp;</th>';
+                    $tableHtml .= '<th>&nbsp;</th>';
                 } else {
                     if ($question_x['type'] == 'score') {
                         for ($x = 1; $x <= $question_x['maximum_score']; $x++) {
-                            $tableHtml .= '<th>'.$question_x['answers'][($ii-1)].'<br />'.$x.'</th>';
+                            $tableHtml .= '<th>'.$question_x['answers'][($ii - 1)].'<br />'.$x.'</th>';
                         }
                         $x = '';
                     } else {
-                        $tableHtml .= '<th>'.$question_x['answers'][($ii-1)].'</th>';
+                        $tableHtml .= '<th>'.$question_x['answers'][($ii - 1)].'</th>';
                     }
-                    $optionText = strip_tags($question_x['answers'][$ii-1]);
+                    $optionText = strip_tags($question_x['answers'][$ii - 1]);
                     $optionText = html_entity_decode($optionText);
                     array_push($xOptions, trim($optionText));
                 }
@@ -3436,15 +3435,15 @@ 
                 // The Y axis is a scoring question type so we have more rows than the options (actually options * maximum score)
                 if ($question_y['type'] == 'score') {
                     for ($y = 1; $y <= $question_y['maximum_score']; $y++) {
-                        $tableHtml .=  '<tr>';
+                        $tableHtml .= '<tr>';
                         for ($ii = 0; $ii <= count($question_x['answers']); $ii++) {
                             if ($question_x['type'] == 'score') {
                                 for ($x = 1; $x <= $question_x['maximum_score']; $x++) {
                                     if ($ii == 0) {
-                                        $tableHtml .=  '<th>'.$question_y['answers'][($ij)].' '.$y.'</th>';
+                                        $tableHtml .= '<th>'.$question_y['answers'][($ij)].' '.$y.'</th>';
                                         break;
                                     } else {
-                                        $tableHtml .=  '<td align="center">';
+                                        $tableHtml .= '<td align="center">';
                                         $votes = SurveyUtil::comparative_check(
                                             $answers_x,
                                             $answers_y,
@@ -3453,16 +3452,16 @@ 
                                             $x,
                                             $y
                                         );
-                                        $tableHtml .=  $votes;
+                                        $tableHtml .= $votes;
                                         array_push(
                                             $chartData,
                                             array(
-                                                'serie' => array($currentYQuestion, $xOptions[$ii-1]),
+                                                'serie' => array($currentYQuestion, $xOptions[$ii - 1]),
                                                 'option' => $x,
                                                 'votes' => $votes
                                             )
                                         );
-                                        $tableHtml .=  '</td>';
+                                        $tableHtml .= '</td>';
                                     }
                                 }
                             } else {
@@ -3482,33 +3481,33 @@ 
                                     array_push(
                                         $chartData,
                                         array(
-                                            'serie' => array($currentYQuestion, $xOptions[$ii-1]),
+                                            'serie' => array($currentYQuestion, $xOptions[$ii - 1]),
                                             'option' => $y,
                                             'votes' => $votes
                                         )
                                     );
-                                    $tableHtml .=  '</td>';
+                                    $tableHtml .= '</td>';
                                 }
                             }
                         }
-                        $tableHtml .=  '</tr>';
+                        $tableHtml .= '</tr>';
                     }
                 }
                 // The Y axis is NOT a score question type so the number of rows = the number of options
                 else {
-                    $tableHtml .=  '<tr>';
+                    $tableHtml .= '<tr>';
                     for ($ii = 0; $ii <= count($question_x['answers']); $ii++) {
                         if ($question_x['type'] == 'score') {
                             for ($x = 1; $x <= $question_x['maximum_score']; $x++) {
                                 if ($ii == 0) {
-                                    $tableHtml .=  '<th>'.$question_y['answers'][$ij].'</th>';
+                                    $tableHtml .= '<th>'.$question_y['answers'][$ij].'</th>';
                                     break;
                                 } else {
-                                    $tableHtml .=  '<td align="center">';
-                                    $votes =  SurveyUtil::comparative_check(
+                                    $tableHtml .= '<td align="center">';
+                                    $votes = SurveyUtil::comparative_check(
                                         $answers_x,
                                         $answers_y,
-                                        $question_x['answersid'][($ii-1)],
+                                        $question_x['answersid'][($ii - 1)],
                                         $question_y['answersid'][($ij)],
                                         $x,
                                         0
@@ -3517,25 +3516,25 @@ 
                                     array_push(
                                         $chartData,
                                         array(
-                                            'serie' => array($currentYQuestion, $xOptions[$ii-1]),
+                                            'serie' => array($currentYQuestion, $xOptions[$ii - 1]),
                                             'option' => $x,
                                             'votes' => $votes
                                         )
                                     );
-                                    $tableHtml .=  '</td>';
+                                    $tableHtml .= '</td>';
                                 }
                             }
                         } else {
                             if ($ii == 0) {
-                                $tableHtml .=  '<th>'.$question_y['answers'][($ij)].'</th>';
+                                $tableHtml .= '<th>'.$question_y['answers'][($ij)].'</th>';
                             } else {
-                                $tableHtml .=  '<td align="center">';
-                                $votes = SurveyUtil::comparative_check($answers_x, $answers_y, $question_x['answersid'][($ii-1)], $question_y['answersid'][($ij)]);
+                                $tableHtml .= '<td align="center">';
+                                $votes = SurveyUtil::comparative_check($answers_x, $answers_y, $question_x['answersid'][($ii - 1)], $question_y['answersid'][($ij)]);
                                 $tableHtml .= $votes;
                                 array_push(
                                     $chartData,
                                     array(
-                                        'serie' => $xOptions[$ii-1],
+                                        'serie' => $xOptions[$ii - 1],
                                         'option' => $currentYQuestion,
                                         'votes' => $votes
                                     )
@@ -3547,7 +3546,7 @@ 
                     $tableHtml .= '</tr>';
                 }
             }
-            $tableHtml .=  '</table>';
+            $tableHtml .= '</table>';
             echo '<div id="chartContainer" class="col-md-12">';
             echo self::drawChart($chartData, true);
             echo '</div>';
@@ -3690,7 +3689,7 @@ 
                     survey_id='".intval($_GET['survey_id'])."' AND
                     session_id='".api_get_session_id()."' ";
         $res = Database::query($sql);
-        $row = Database::fetch_array($res,'ASSOC');
+        $row = Database::fetch_array($res, 'ASSOC');
 
         return $row['total'];
     }
@@ -3764,7 +3763,7 @@ 
             $exclude_users = SurveyManager::get_people_who_filled_survey($_GET['survey_id']);
         }
 
-        $counter = 0;  // Nr of invitations "sent" (if sendmail option)
+        $counter = 0; // Nr of invitations "sent" (if sendmail option)
         $course_id = api_get_course_int_id();
         $session_id = api_get_session_id();
 
@@ -3920,7 +3919,7 @@ 
         $text_link = '<a href="'.$survey_link.'">'.get_lang('ClickHereToAnswerTheSurvey')."</a><br />\r\n<br />\r\n".get_lang('OrCopyPasteTheFollowingUrl')." <br />\r\n ".$survey_link;
 
         $replace_count = 0;
-        $full_invitation_text = api_str_ireplace('**link**', $text_link ,$invitation_text, $replace_count);
+        $full_invitation_text = api_str_ireplace('**link**', $text_link, $invitation_text, $replace_count);
         if ($replace_count < 1) {
             $full_invitation_text = $full_invitation_text."<br />\r\n<br />\r\n".$text_link;
         }
@@ -3992,8 +3991,8 @@ 
         $course_id = api_get_course_int_id();
 
         // Database table definition
-        $table_survey_invitation 	= Database :: get_course_table(TABLE_SURVEY_INVITATION);
-        $table_survey 				= Database :: get_course_table(TABLE_SURVEY);
+        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
+        $table_survey = Database :: get_course_table(TABLE_SURVEY);
 
         // Counting the number of people that are invited
         $sql = "SELECT count(user) as total
@@ -4107,7 +4106,7 @@ 
     {
         $course_id = api_get_course_int_id();
         // Database table definition
-        $table_survey_invitation 	= Database :: get_course_table(TABLE_SURVEY_INVITATION);
+        $table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
 
         $sql = "SELECT * FROM $table_survey_invitation
 		        WHERE
@@ -4216,7 +4215,7 @@ 
     public static function display_survey_list_for_coach()
     {
         $parameters = array();
-        $parameters['cidReq']=api_get_course_id();
+        $parameters['cidReq'] = api_get_course_id();
         if (isset($_GET['do_search'])) {
             $message = get_lang('DisplaySearchResults').'<br />';
             $message .= '<a href="'.api_get_self().'?'.api_get_cidreq().'">'.get_lang('DisplayAll').'</a>';
@@ -4260,17 +4259,17 @@ 
 
         if ($drh) {
             return '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&survey_id='.$survey_id.'">'.
-            Display::return_icon('stats.png', get_lang('Reporting'),'',ICON_SIZE_SMALL).'</a>';
+            Display::return_icon('stats.png', get_lang('Reporting'), '', ICON_SIZE_SMALL).'</a>';
         }
 
         // Coach can see that only if the survey is in his session
         if (api_is_allowed_to_edit() ||
             api_is_element_in_the_session(TOOL_SURVEY, $survey_id)
         ) {
-            $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&action=edit&survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+            $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&action=edit&survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
             if (SurveyManager::survey_generation_hash_available()) {
-                $return .=  Display::url(
-                    Display::return_icon('new_link.png', get_lang('GenerateSurveyAccessLink'),'',ICON_SIZE_SMALL),
+                $return .= Display::url(
+                    Display::return_icon('new_link.png', get_lang('GenerateSurveyAccessLink'), '', ICON_SIZE_SMALL),
                     api_get_path(WEB_CODE_PATH).'survey/generate_link.php?survey_id='.$survey_id.'&'.api_get_cidreq()
                 );
             }
@@ -4280,20 +4279,20 @@ 
             );
 
             $return .= ' <a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&action=empty&survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("EmptySurvey").'?')).'\')) return false;">'.
-                Display::return_icon('clean.png', get_lang('EmptySurvey'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                Display::return_icon('clean.png', get_lang('EmptySurvey'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
         }
         $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&survey_id='.$survey_id.'">'.
-            Display::return_icon('preview_view.png', get_lang('Preview'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+            Display::return_icon('preview_view.png', get_lang('Preview'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
         $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&survey_id='.$survey_id.'">'.
-            Display::return_icon('mail_send.png', get_lang('Publish'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+            Display::return_icon('mail_send.png', get_lang('Publish'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
         $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&survey_id='.$survey_id.'">'.
-            Display::return_icon('stats.png', get_lang('Reporting'),'',ICON_SIZE_SMALL).'</a>';
+            Display::return_icon('stats.png', get_lang('Reporting'), '', ICON_SIZE_SMALL).'</a>';
 
         if (api_is_allowed_to_edit() ||
             api_is_element_in_the_session(TOOL_SURVEY, $survey_id)
         ) {
             $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&action=delete&survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurvey").'?', ENT_QUOTES)).'\')) return false;">'.
-                Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
         }
 
         return $return;
@@ -4306,9 +4305,9 @@ 
         //$return .= '<a href="survey_list.php?'.api_get_cidreq().'&action=delete&survey_id='.$survey_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
         //$return .= '<a href="create_survey_in_another_language.php?id_survey='.$survey_id.'">'.Display::return_icon('copy.gif', get_lang('Copy')).'</a>';
         //$return .= '<a href="survey.php?survey_id='.$survey_id.'">'.Display::return_icon('add.gif', get_lang('Add')).'</a>';
-        $return = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
-        $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
-        $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&action=empty&survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("EmptySurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('clean.png', get_lang('EmptySurvey'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
+        $return = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
+        $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
+        $return .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&action=empty&survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("EmptySurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('clean.png', get_lang('EmptySurvey'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
 
         return $return;
     }
@@ -4463,7 +4462,7 @@ 
 
             // Validation when belonging to a session
             $session_img = api_get_session_image($survey['session_id'], $_user['status']);
-            $array[2] = $survey[2] . $session_img;
+            $array[2] = $survey[2].$session_img;
             $array[3] = $survey[3];
             $array[4] = $survey[4];
             $array[5] = $survey[5];
@@ -4505,10 +4504,10 @@ 
         $last_version_surveys = $survey_tree->surveylist;
         $list = array();
         foreach ($last_version_surveys as & $survey) {
-            $list[]=$survey['id'];
+            $list[] = $survey['id'];
         }
         if (count($list) > 0) {
-            $list_condition = " AND survey.survey_id IN (".implode(',',$list).") ";
+            $list_condition = " AND survey.survey_id IN (".implode(',', $list).") ";
         } else {
             $list_condition = '';
         }
@@ -4636,11 +4635,11 @@ 
             echo '<tr>';
             if ($row['answered'] == 0) {
                 echo '<td>';
-                echo Display::return_icon('statistics.png', get_lang('CreateNewSurvey'), array(),ICON_SIZE_TINY);
+                echo Display::return_icon('statistics.png', get_lang('CreateNewSurvey'), array(), ICON_SIZE_TINY);
                 echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/fillsurvey.php?course='.$_course['sysCode'].'&invitationcode='.$row['invitation_code'].'&cidReq='.$_course['sysCode'].'">'.$row['title'].'</a></td>';
             } else {
                 echo '<td>';
-                echo Display::return_icon('statistics_na.png', get_lang('CreateNewSurvey'), array(),ICON_SIZE_TINY);
+                echo Display::return_icon('statistics_na.png', get_lang('CreateNewSurvey'), array(), ICON_SIZE_TINY);
                 echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=questionreport&cidReq='.$_course['sysCode'].'&id_session='.$row['session_id'].'&gidReq=0&origin=&survey_id='.$row['survey_id'].'">'.$row['title'].'</a></td>';
             }
             echo '<td class="center">';
@@ -4787,7 +4786,7 @@ 
                     if ($field_details[7] == 0) {
                         $field_list_array['extra_'.$field_details[1]]['visibility'] = 0;
                     } else {
-                        $field_list_array['extra_'.$field_details[1]]['visibility']=1;
+                        $field_list_array['extra_'.$field_details[1]]['visibility'] = 1;
                     }
                     break;
                 case UserManager::USER_FIELD_TYPE_DIVIDER:
@@ -4873,7 +4872,7 @@ 
         $htmlChart = '';
         if (api_browser_support("svg")) {
             $htmlChart .= api_get_js("d3/d3.v3.5.4.min.js");
-            $htmlChart .= api_get_js("dimple.v2.1.2.min.js") . '
+            $htmlChart .= api_get_js("dimple.v2.1.2.min.js").'
             <script type="text/javascript">
             var svg = dimple.newSvg("#'.$chartContainerId.'", "100%", 400);
             var data = [';
@@ -4882,40 +4881,40 @@ 
             foreach ($chartData as $chartDataElement) {
                 $htmlChart .= '{"';
                 if (!$hasSerie) {
-                    $htmlChart .= get_lang("Option") . '":"' . $chartDataElement['option'] . '", "';
+                    $htmlChart .= get_lang("Option").'":"'.$chartDataElement['option'].'", "';
                     array_push($order, $chartDataElement['option']);
                 } else {
                     if (!is_array($chartDataElement['serie'])) {
-                        $htmlChart .= get_lang("Option") . '":"' . $chartDataElement['serie'] . '", "' .
-                            get_lang("Score") . '":"' . $chartDataElement['option'] . '", "';
+                        $htmlChart .= get_lang("Option").'":"'.$chartDataElement['serie'].'", "'.
+                            get_lang("Score").'":"'.$chartDataElement['option'].'", "';
                         array_push($serie, $chartDataElement['serie']);
                     } else {
-                        $htmlChart .= get_lang("Serie") . '":"' . $chartDataElement['serie'][0] . '", "' .
-                            get_lang("Option") . '":"' . $chartDataElement['serie'][1] . '", "' .
-                            get_lang("Score") . '":"' . $chartDataElement['option'] . '", "';
+                        $htmlChart .= get_lang("Serie").'":"'.$chartDataElement['serie'][0].'", "'.
+                            get_lang("Option").'":"'.$chartDataElement['serie'][1].'", "'.
+                            get_lang("Score").'":"'.$chartDataElement['option'].'", "';
                     }
                 }
-                $htmlChart .= get_lang("Votes") . '":"' . $chartDataElement['votes'] .
+                $htmlChart .= get_lang("Votes").'":"'.$chartDataElement['votes'].
                     '"},';
             }
             rtrim($htmlChart, ",");
             $htmlChart .= '];
                 var myChart = new dimple.chart(svg, data);
-                myChart.addMeasureAxis("y", "' . get_lang("Votes") . '");';
+                myChart.addMeasureAxis("y", "' . get_lang("Votes").'");';
             if (!$hasSerie) {
-                $htmlChart .= 'var xAxisCategory = myChart.addCategoryAxis("x", "' . get_lang("Option") . '");
-                    xAxisCategory.addOrderRule(' . json_encode($order) . ');
-                    myChart.addSeries("' . get_lang("Option") . '", dimple.plot.bar);';
+                $htmlChart .= 'var xAxisCategory = myChart.addCategoryAxis("x", "'.get_lang("Option").'");
+                    xAxisCategory.addOrderRule(' . json_encode($order).');
+                    myChart.addSeries("' . get_lang("Option").'", dimple.plot.bar);';
             } else {
                 if (!is_array($chartDataElement['serie'])) {
                     $serie = array_values(array_unique($serie));
-                    $htmlChart .= 'var xAxisCategory = myChart.addCategoryAxis("x", ["' . get_lang("Option") . '","' . get_lang("Score") . '"]);
-                        xAxisCategory.addOrderRule(' . json_encode($serie) . ');
-                        xAxisCategory.addGroupOrderRule("' . get_lang("Score") . '");
-                        myChart.addSeries("' . get_lang("Option") . '", dimple.plot.bar);';
+                    $htmlChart .= 'var xAxisCategory = myChart.addCategoryAxis("x", ["'.get_lang("Option").'","'.get_lang("Score").'"]);
+                        xAxisCategory.addOrderRule(' . json_encode($serie).');
+                        xAxisCategory.addGroupOrderRule("' . get_lang("Score").'");
+                        myChart.addSeries("' . get_lang("Option").'", dimple.plot.bar);';
                 } else {
-                    $htmlChart .= 'myChart.addCategoryAxis("x", ["' . get_lang("Option") . '","' . get_lang("Score") . '"]);
-                        myChart.addSeries("' . get_lang("Serie") . '", dimple.plot.bar);';
+                    $htmlChart .= 'myChart.addCategoryAxis("x", ["'.get_lang("Option").'","'.get_lang("Score").'"]);
+                        myChart.addSeries("' . get_lang("Serie").'", dimple.plot.bar);';
                 }
             }
             $htmlChart .= 'myChart.draw();

main/survey/survey_invitation.php

Indentation +43 added lines, -43 removed lines

@@ -13,10 +13,10 @@ 
 
 /** @todo this has to be moved to a more appropriate place (after the display_header of the code)*/
 if (!api_is_allowed_to_edit(false, true)) {
-	Display :: display_header(get_lang('ToolSurvey'));
-	Display :: display_error_message(get_lang('NotAllowed'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header(get_lang('ToolSurvey'));
+    Display :: display_error_message(get_lang('NotAllowed'), false);
+    Display :: display_footer();
+    exit;
 }
 
 // Database table definitions
@@ -33,25 +33,25 @@ 
 // Getting the survey information
 // We exit here if ther is no valid $_GET parameter
 if (!isset($_GET['survey_id']) OR !is_numeric($_GET['survey_id'])) {
-	Display :: display_header($tool_name);
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header($tool_name);
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
+    Display :: display_footer();
+    exit;
 }
 
 $survey_id = Security::remove_XSS($_GET['survey_id']);
 $survey_data = SurveyManager::get_survey($survey_id);
 
 if (empty($survey_data)) {
-	Display :: display_header($tool_name);
-	Display :: display_error_message(get_lang('InvallidSurvey'), false);
-	Display :: display_footer();
-	exit;
+    Display :: display_header($tool_name);
+    Display :: display_error_message(get_lang('InvallidSurvey'), false);
+    Display :: display_footer();
+    exit;
 }
 
 $urlname = strip_tags(api_substr(api_html_entity_decode($survey_data['title'], ENT_QUOTES), 0, 40));
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-	$urlname .= '...';
+    $urlname .= '...';
 }
 
 // Breadcrumbs
@@ -64,32 +64,32 @@ 
 
 // Checking the parameters
 if (!is_numeric($survey_id)) {
-	Display::display_error_message(get_lang('Error'), false);
-	Display::display_footer();
-	exit;
+    Display::display_error_message(get_lang('Error'), false);
+    Display::display_footer();
+    exit;
 }
 
 // Getting all the people who have filled this survey
 $answered_data = SurveyManager::get_people_who_filled_survey($survey_id);
 if ($survey_data['anonymous'] == 1) {
-	Display::display_normal_message(get_lang('AnonymousSurveyCannotKnowWhoAnswered').' '.count($answered_data).' '.get_lang('PeopleAnswered'));
-	$answered_data = array();
+    Display::display_normal_message(get_lang('AnonymousSurveyCannotKnowWhoAnswered').' '.count($answered_data).' '.get_lang('PeopleAnswered'));
+    $answered_data = array();
 }
 
 if (!isset($_GET['view']) OR $_GET['view'] == 'invited') {
-	echo get_lang('ViewInvited'). ' | ';
+    echo get_lang('ViewInvited'). ' | ';
 } else {
-	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=invited">'.get_lang('ViewInvited').'</a> |';
+    echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=invited">'.get_lang('ViewInvited').'</a> |';
 }
 if ($_GET['view'] == 'answered') {
-	echo get_lang('ViewAnswered').' | ';
+    echo get_lang('ViewAnswered').' | ';
 } else {
-	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=answered">'.get_lang('ViewAnswered').'</a> |';
+    echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=answered">'.get_lang('ViewAnswered').'</a> |';
 }
 if ($_GET['view'] == 'unanswered') {
-	echo get_lang('ViewUnanswered');
+    echo get_lang('ViewUnanswered');
 } else {
-	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=unanswered">'.get_lang('ViewUnanswered').'</a>';
+    echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=unanswered">'.get_lang('ViewUnanswered').'</a>';
 }
 
 // Table header
@@ -111,32 +111,32 @@ 
 
 $res = Database::query($sql);
 while ($row = Database::fetch_assoc($res)) {
-	if (!$_GET['view'] ||
-		$_GET['view'] == 'invited' ||
+    if (!$_GET['view'] ||
+        $_GET['view'] == 'invited' ||
         ($_GET['view'] == 'answered' && in_array($row['user'], $answered_data)) ||
         ($_GET['view'] == 'unanswered' && !in_array($row['user'], $answered_data))
     ) {
-		echo '<tr>';
-		if (is_numeric($row['user'])) {
+        echo '<tr>';
+        if (is_numeric($row['user'])) {
             $userInfo = api_get_user_info($row['user']);
-			echo '<td>';
+            echo '<td>';
             echo UserManager::getUserProfileLink($userInfo);
             echo '</td>';
-		} else {
+        } else {
             echo '<td>'.$row['user'].'</td>';
-		}
-		echo '	<td>'.$row['invitation_date'].'</td>';
-		echo '	<td>';
-
-		if (in_array($row['user'], $answered_data)) {
-			echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&amp;survey_id='.$survey_id.'&amp;user='.$row['user'].'">'.get_lang('ViewAnswers').'</a>';
-		} else {
-			echo '-';
-		}
-
-		echo '	</td>';
-		echo '</tr>';
-	}
+        }
+        echo '	<td>'.$row['invitation_date'].'</td>';
+        echo '	<td>';
+
+        if (in_array($row['user'], $answered_data)) {
+            echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?action=userreport&amp;survey_id='.$survey_id.'&amp;user='.$row['user'].'">'.get_lang('ViewAnswers').'</a>';
+        } else {
+            echo '-';
+        }
+
+        echo '	</td>';
+        echo '</tr>';
+    }
 }
 
 // Closing the table

Spacing +5 added lines, -5 removed lines

@@ -21,11 +21,11 @@ 
 
 // Database table definitions
 $table_survey 					= Database :: get_course_table(TABLE_SURVEY);
-$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
-$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+$table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 $table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
-$table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
-$table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATION);
+$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+$table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
 
 $tool_name = get_lang('SurveyInvitations');
 
@@ -77,7 +77,7 @@ 
 }
 
 if (!isset($_GET['view']) OR $_GET['view'] == 'invited') {
-	echo get_lang('ViewInvited'). ' | ';
+	echo get_lang('ViewInvited').' | ';
 } else {
 	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=invited">'.get_lang('ViewInvited').'</a> |';
 }

main/survey/survey.php

Spacing +23 added lines, -23 removed lines

@@ -12,7 +12,7 @@ 
 require_once '../inc/global.inc.php';
 
 $this_section = SECTION_COURSES;
-$current_course_tool  = TOOL_SURVEY;
+$current_course_tool = TOOL_SURVEY;
 
 api_protect_course_script(true);
 
@@ -58,7 +58,7 @@ 
 // Getting the survey information
 if (!empty($_GET['survey_id'])) {
 	$course_code = api_get_course_id();
-	if ($course_code!=-1) {
+	if ($course_code != -1) {
 		$survey_data = SurveyManager::get_survey($survey_id);
 	} else {
 		Display :: display_header(get_lang('ToolSurvey'));
@@ -88,7 +88,7 @@ 
 			Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\'
 			                 WHERE c_id = '.$course_id.' AND id = \''.Database::escape_string($_POST['group_id']).'\'');
 			$sendmsg = 'GroupUpdatedSuccessfully';
-		} elseif(!empty($_POST['name'])) {
+		} elseif (!empty($_POST['name'])) {
 			Database::query('INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) values ('.$course_id.', \''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
 			$sendmsg = 'GroupCreatedSuccessfully';
 		} else {
@@ -116,7 +116,7 @@ 
 
 if (isset($action)) {
 	if (($action == 'moveup' || $action == 'movedown') && isset($_GET['question_id'])) {
-		SurveyManager::move_survey_question($my_action_survey,$my_question_id_survey,$my_survey_id_survey);
+		SurveyManager::move_survey_question($my_action_survey, $my_question_id_survey, $my_survey_id_survey);
 		Display::display_confirmation_message(get_lang('SurveyQuestionMoved'));
 	}
 	if ($action == 'delete' AND is_numeric($_GET['question_id'])) {
@@ -130,12 +130,12 @@ 
 SurveyUtil::check_first_last_question($_GET['survey_id']);
 
 // Action links
-$survey_actions = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('EditSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
-$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('DeleteSurvey').'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('DeleteSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
+$survey_actions = '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('EditSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('DeleteSurvey').'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('DeleteSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
 //$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_survey_in_another_language.php?id_survey='.$survey_id.'">'.Display::return_icon('copy.gif', get_lang('Copy')).'</a>';
-$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'),'',ICON_SIZE_MEDIUM).'</a>';
-$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'),'',ICON_SIZE_MEDIUM).'</a>';
-$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('stats.png', get_lang('Reporting'),'',ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'), '', ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'), '', ICON_SIZE_MEDIUM).'</a>';
+$survey_actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('stats.png', get_lang('Reporting'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '<div class="actions">'.$survey_actions.'</div>';
 
 if ($survey_data['survey_type'] == 0) {
@@ -217,24 +217,24 @@ 
 	echo '	<td>'.$tool_name.'</td>';
 	echo '	<td>'.$row['number_of_options'].'</td>';
 	echo '	<td>';
-	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?', ENT_QUOTES, $charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
 	if ($question_counter > 1) {
-		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'),'',ICON_SIZE_SMALL).'</a>';
+		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'), '', ICON_SIZE_SMALL).'</a>';
 	} else {
-		Display::display_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+		Display::display_icon('up_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
 	}
 	if ($question_counter < $question_counter_max) {
-		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'),'',ICON_SIZE_SMALL).'</a>';
+		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'), '', ICON_SIZE_SMALL).'</a>';
 	} else {
-		Display::display_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+		Display::display_icon('down_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
 	}
 	echo '	</td>';
 	$question_counter++;
 
 	if ($is_survey_type_1) {
-    	echo '<td>'.(($row['survey_group_pri']==0)?get_lang('Secondary'):get_lang('Primary')).'</td>';
-        echo '<td>'.(($row['survey_group_pri']==0)?$groups[$row['survey_group_sec1']].'-'.$groups[$row['survey_group_sec2']]:$groups[$row['survey_group_pri']]).'</td>';
+    	echo '<td>'.(($row['survey_group_pri'] == 0) ? get_lang('Secondary') : get_lang('Primary')).'</td>';
+        echo '<td>'.(($row['survey_group_pri'] == 0) ? $groups[$row['survey_group_sec1']].'-'.$groups[$row['survey_group_sec2']] : $groups[$row['survey_group_pri']]).'</td>';
     }
 	echo '</tr>';
 }
@@ -248,7 +248,7 @@ 
 		echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
 	}
 
-	if (in_array($_GET['sendmsg'], array('GroupNeedName'))){
+	if (in_array($_GET['sendmsg'], array('GroupNeedName'))) {
 		echo Display::display_warning_message(get_lang($_GET['sendmsg']), false);
 	}
 	echo '<table border="0"><tr><td width="100">'.get_lang('Name').'</td><td>'.get_lang('Description').'</td></tr></table>';
@@ -256,7 +256,7 @@ 
 	if ($_GET['action'] == 'editgroup') {
 		$sql = 'SELECT name,description FROM '.$table_survey_question_group.' WHERE id = '.intval($_GET['gid']).' AND survey_id = '.intval($survey_id).' limit 1';
 		$rs = Database::query($sql);
-		$editedrow = Database::fetch_array($rs,'ASSOC');
+		$editedrow = Database::fetch_array($rs, 'ASSOC');
 		echo	'<input type="text" maxlength="20" name="name" value="'.$editedrow['name'].'" size="10" disabled>';
 		echo	'<input type="text" maxlength="150" name="description" value="'.$editedrow['description'].'" size="40">';
 		echo	'<input type="hidden" name="group_id" value="'.Security::remove_XSS($_GET['gid']).'">';
@@ -278,12 +278,12 @@ 
 	$sql = 'SELECT id,name,description FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND survey_id = '.intval($survey_id).' ORDER BY name';
 
 	$rs = Database::query($sql);
-	while($row = Database::fetch_array($rs,ASSOC)){
+	while ($row = Database::fetch_array($rs, ASSOC)) {
 		$grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
 		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
-		Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a> '.
-		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'),$row['name']).'?',ENT_QUOTES)).'\')) return false;">'.
-		Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+		Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a> '.
+		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'), $row['name']).'?', ENT_QUOTES)).'\')) return false;">'.
+		Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'.
 		'</td></tr>';
 	}
 	echo $grouplist.'</table>';

Braces +3 added lines, -1 removed lines

@@ -124,7 +124,9 @@
 	}
 }
 
-if (!empty($survey_data['survey_version'])) echo '<b>'.get_lang('Version').': '.$survey_data['survey_version'].'</b>';
+if (!empty($survey_data['survey_version'])) {
+    echo '<b>'.get_lang('Version').': '.$survey_data['survey_version'].'</b>';
+}
 
 // We exit here is the first or last question is a pagebreak (which causes errors)
 SurveyUtil::check_first_last_question($_GET['survey_id']);

Indentation +142 added lines, -142 removed lines

@@ -20,8 +20,8 @@ 
 // Coach can't view this page
 $extend_rights_for_coachs = api_get_setting('extend_rights_for_coach_on_survey');
 $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
-	api_get_user_id(),
-	api_get_course_info()
+    api_get_user_id(),
+    api_get_course_info()
 );
 
 if ($isDrhOfCourse) {
@@ -32,7 +32,7 @@ 
     (api_is_course_coach() && $extend_rights_for_coachs == 'false')
 ) {    
     api_not_allowed(true);
-	exit;
+    exit;
 }
 
 // Database table definitions
@@ -49,21 +49,21 @@ 
 
 // Breadcrumbs
 $interbreadcrumb[] = array(
-		'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php',
-		'name' => get_lang('SurveyList'),
+        'url' => api_get_path(WEB_CODE_PATH).'survey/survey_list.php',
+        'name' => get_lang('SurveyList'),
 );
 
 // Getting the survey information
 if (!empty($_GET['survey_id'])) {
-	$course_code = api_get_course_id();
-	if ($course_code!=-1) {
-		$survey_data = SurveyManager::get_survey($survey_id);
-	} else {
-		Display :: display_header(get_lang('ToolSurvey'));
-		Display :: display_error_message(get_lang('NotAllowed'), false);
-		Display :: display_footer();
-		exit;
-	}
+    $course_code = api_get_course_id();
+    if ($course_code!=-1) {
+        $survey_data = SurveyManager::get_survey($survey_id);
+    } else {
+        Display :: display_header(get_lang('ToolSurvey'));
+        Display :: display_error_message(get_lang('NotAllowed'), false);
+        Display :: display_footer();
+        exit;
+    }
 } else {
     Display :: display_header(get_lang('ToolSurvey'));
     Display :: display_error_message(get_lang('NotAllowed'), false);
@@ -76,30 +76,30 @@ 
 $is_survey_type_1 = $survey_data['survey_type'] == 1;
 
 if (api_strlen(strip_tags($survey_data['title'])) > 40) {
-	$tool_name .= '...';
+    $tool_name .= '...';
 }
 
 if ($is_survey_type_1 && ($action == 'addgroup' || $action == 'deletegroup')) {
-	$_POST['name'] = trim($_POST['name']);
-	if ($action == 'addgroup') {
-		if (!empty($_POST['group_id'])) {
-			Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\'
+    $_POST['name'] = trim($_POST['name']);
+    if ($action == 'addgroup') {
+        if (!empty($_POST['group_id'])) {
+            Database::query('UPDATE '.$table_survey_question_group.' SET description = \''.Database::escape_string($_POST['description']).'\'
 			                 WHERE c_id = '.$course_id.' AND id = \''.Database::escape_string($_POST['group_id']).'\'');
-			$sendmsg = 'GroupUpdatedSuccessfully';
-		} elseif(!empty($_POST['name'])) {
-			Database::query('INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) values ('.$course_id.', \''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
-			$sendmsg = 'GroupCreatedSuccessfully';
-		} else {
-			$sendmsg = 'GroupNeedName';
-		}
-	}
-
-	if ($action == 'deletegroup') {
-		Database::query('DELETE FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND id = '.intval($_GET['gid']).' and survey_id = '.intval($survey_id));
-		$sendmsg = 'GroupDeletedSuccessfully';
-	}
-	header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&sendmsg='.$sendmsg);
-	exit;
+            $sendmsg = 'GroupUpdatedSuccessfully';
+        } elseif(!empty($_POST['name'])) {
+            Database::query('INSERT INTO '.$table_survey_question_group.' (c_id, name,description,survey_id) values ('.$course_id.', \''.Database::escape_string($_POST['name']).'\',\''.Database::escape_string($_POST['description']).'\',\''.Database::escape_string($survey_id).'\') ');
+            $sendmsg = 'GroupCreatedSuccessfully';
+        } else {
+            $sendmsg = 'GroupNeedName';
+        }
+    }
+
+    if ($action == 'deletegroup') {
+        Database::query('DELETE FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND id = '.intval($_GET['gid']).' and survey_id = '.intval($survey_id));
+        $sendmsg = 'GroupDeletedSuccessfully';
+    }
+    header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&sendmsg='.$sendmsg);
+    exit;
 }
 
 // Displaying the header
@@ -113,13 +113,13 @@ 
 $message_information    = isset($_GET['message']) ? Security::remove_XSS($_GET['message']) : null;
 
 if (isset($action)) {
-	if (($action == 'moveup' || $action == 'movedown') && isset($_GET['question_id'])) {
-		SurveyManager::move_survey_question($my_action_survey,$my_question_id_survey,$my_survey_id_survey);
-		Display::display_confirmation_message(get_lang('SurveyQuestionMoved'));
-	}
-	if ($action == 'delete' AND is_numeric($_GET['question_id'])) {
-		SurveyManager::delete_survey_question($my_survey_id_survey, $my_question_id_survey, $survey_data['is_shared']);
-	}
+    if (($action == 'moveup' || $action == 'movedown') && isset($_GET['question_id'])) {
+        SurveyManager::move_survey_question($my_action_survey,$my_question_id_survey,$my_survey_id_survey);
+        Display::display_confirmation_message(get_lang('SurveyQuestionMoved'));
+    }
+    if ($action == 'delete' AND is_numeric($_GET['question_id'])) {
+        SurveyManager::delete_survey_question($my_survey_id_survey, $my_question_id_survey, $survey_data['is_shared']);
+    }
 }
 
 if (!empty($survey_data['survey_version'])) echo '<b>'.get_lang('Version').': '.$survey_data['survey_version'].'</b>';
@@ -137,26 +137,26 @@ 
 echo '<div class="actions">'.$survey_actions.'</div>';
 
 if ($survey_data['survey_type'] == 0) {
-	echo '<div class="panel panel-default">';
+    echo '<div class="panel panel-default">';
         echo '<div class="panel-body">';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.png', get_lang('YesNo'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.png', get_lang('UniqueSelect'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcma.png', get_lang('MultipleResponse'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.png', get_lang('Open'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.png', get_lang('Dropdown'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.png', get_lang('Percentage'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$survey_id.'">'.Display::return_icon('scorequestion.png', get_lang('Score'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$survey_id.'">'.Display::return_icon('commentquestion.png', get_lang('Comment'), null, ICON_SIZE_BIG).'</a>';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$survey_id.'">'.Display::return_icon('page_end.png', get_lang('Pagebreak'), null, ICON_SIZE_BIG).'</a>';
-	echo '</div>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=yesno&amp;survey_id='.$survey_id.'">'.Display::return_icon('yesno.png', get_lang('YesNo'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multiplechoice&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcua.png', get_lang('UniqueSelect'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=multipleresponse&amp;survey_id='.$survey_id.'">'.Display::return_icon('mcma.png', get_lang('MultipleResponse'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=open&amp;survey_id='.$survey_id.'">'.Display::return_icon('open_answer.png', get_lang('Open'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=dropdown&amp;survey_id='.$survey_id.'">'.Display::return_icon('dropdown.png', get_lang('Dropdown'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=percentage&amp;survey_id='.$survey_id.'">'.Display::return_icon('percentagequestion.png', get_lang('Percentage'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=score&amp;survey_id='.$survey_id.'">'.Display::return_icon('scorequestion.png', get_lang('Score'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=comment&amp;survey_id='.$survey_id.'">'.Display::return_icon('commentquestion.png', get_lang('Comment'), null, ICON_SIZE_BIG).'</a>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=pagebreak&amp;survey_id='.$survey_id.'">'.Display::return_icon('page_end.png', get_lang('Pagebreak'), null, ICON_SIZE_BIG).'</a>';
+    echo '</div>';
         echo '</div>';
 } else {
-	echo '<div class="panel panel-default">';
+    echo '<div class="panel panel-default">';
         echo '<div class="panel-body">';
-	echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'">';
-	echo Display::return_icon("yesno.png");
-	echo '</a></div>';
-	echo '</div>';
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=add&type=personality&amp;survey_id='.$survey_id.'">';
+    echo Display::return_icon("yesno.png");
+    echo '</a></div>';
+    echo '</div>';
         echo '</div>';
 }
 
@@ -169,7 +169,7 @@ 
 echo '		<th width="50" >'.get_lang('NumberOfOptions').'</th>';
 echo '		<th width="100">'.get_lang('Modify').'</th>';
 if ($is_survey_type_1) {
-	echo '<th width="100">'.get_lang('Condition').'</th>';
+    echo '<th width="100">'.get_lang('Condition').'</th>';
     echo '<th width="40">'.get_lang('Group').'</th>';
 }
 echo '	</tr>';
@@ -196,97 +196,97 @@ 
 $result = Database::query($sql);
 $question_counter_max = Database::num_rows($result);
 while ($row = Database::fetch_array($result, 'ASSOC')) {
-	echo '<tr>';
-	echo '	<td>'.$question_counter.'</td>';
-	echo '	<td>';
-	if (api_strlen($row['survey_question']) > 100) {
-		echo api_substr(strip_tags($row['survey_question']), 0, 100).' ... ';
-	} else {
-		echo $row['survey_question'];
-	}
-
-	if ($row['type'] == 'yesno') {
-		$tool_name = get_lang('YesNo');
-	} else if ($row['type'] == 'multiplechoice') {
-		$tool_name = get_lang('UniqueSelect');
-	} else {
-		$tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
-	}
-
-	echo '</td>';
-	echo '	<td>'.$tool_name.'</td>';
-	echo '	<td>'.$row['number_of_options'].'</td>';
-	echo '	<td>';
-	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-	echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-	if ($question_counter > 1) {
-		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'),'',ICON_SIZE_SMALL).'</a>';
-	} else {
-		Display::display_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
-	}
-	if ($question_counter < $question_counter_max) {
-		echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'),'',ICON_SIZE_SMALL).'</a>';
-	} else {
-		Display::display_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
-	}
-	echo '	</td>';
-	$question_counter++;
-
-	if ($is_survey_type_1) {
-    	echo '<td>'.(($row['survey_group_pri']==0)?get_lang('Secondary'):get_lang('Primary')).'</td>';
+    echo '<tr>';
+    echo '	<td>'.$question_counter.'</td>';
+    echo '	<td>';
+    if (api_strlen($row['survey_question']) > 100) {
+        echo api_substr(strip_tags($row['survey_question']), 0, 100).' ... ';
+    } else {
+        echo $row['survey_question'];
+    }
+
+    if ($row['type'] == 'yesno') {
+        $tool_name = get_lang('YesNo');
+    } else if ($row['type'] == 'multiplechoice') {
+        $tool_name = get_lang('UniqueSelect');
+    } else {
+        $tool_name = get_lang(api_ucfirst(Security::remove_XSS($row['type'])));
+    }
+
+    echo '</td>';
+    echo '	<td>'.$tool_name.'</td>';
+    echo '	<td>'.$row['number_of_options'].'</td>';
+    echo '	<td>';
+    echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
+    echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+    if ($question_counter > 1) {
+        echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'),'',ICON_SIZE_SMALL).'</a>';
+    } else {
+        Display::display_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+    }
+    if ($question_counter < $question_counter_max) {
+        echo '		<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'),'',ICON_SIZE_SMALL).'</a>';
+    } else {
+        Display::display_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+    }
+    echo '	</td>';
+    $question_counter++;
+
+    if ($is_survey_type_1) {
+        echo '<td>'.(($row['survey_group_pri']==0)?get_lang('Secondary'):get_lang('Primary')).'</td>';
         echo '<td>'.(($row['survey_group_pri']==0)?$groups[$row['survey_group_sec1']].'-'.$groups[$row['survey_group_sec2']]:$groups[$row['survey_group_pri']]).'</td>';
     }
-	echo '</tr>';
+    echo '</tr>';
 }
 
 echo '</table>';
 
 if ($is_survey_type_1) {
-	echo '<br /><br /><b>'.get_lang('ManageGroups').'</b><br /><br />';
-
-	if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully', 'GroupDeletedSuccessfully', 'GroupCreatedSuccessfully'))) {
-		echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
-	}
-
-	if (in_array($_GET['sendmsg'], array('GroupNeedName'))){
-		echo Display::display_warning_message(get_lang($_GET['sendmsg']), false);
-	}
-	echo '<table border="0"><tr><td width="100">'.get_lang('Name').'</td><td>'.get_lang('Description').'</td></tr></table>';
-	echo '<form action="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?action=addgroup&survey_id='.$survey_id.'" method="post">';
-	if ($_GET['action'] == 'editgroup') {
-		$sql = 'SELECT name,description FROM '.$table_survey_question_group.' WHERE id = '.intval($_GET['gid']).' AND survey_id = '.intval($survey_id).' limit 1';
-		$rs = Database::query($sql);
-		$editedrow = Database::fetch_array($rs,'ASSOC');
-		echo	'<input type="text" maxlength="20" name="name" value="'.$editedrow['name'].'" size="10" disabled>';
-		echo	'<input type="text" maxlength="150" name="description" value="'.$editedrow['description'].'" size="40">';
-		echo	'<input type="hidden" name="group_id" value="'.Security::remove_XSS($_GET['gid']).'">';
-		echo	'<input type="submit" value="'.get_lang('Save').'"'.'<input type="button" value="'.get_lang('Cancel').'" onclick="window.location.href = \'survey.php?survey_id='.Security::remove_XSS($survey_id).'\';" />';
-	} else {
-		echo	'<input type="text" maxlength="20" name="name" value="" size="10">';
-		echo	'<input type="text" maxlength="250" name="description" value="" size="80">';
-		echo	'<input type="submit" value="'.get_lang('Create').'"';
-	}
-	echo	'</form><br />';
-
-	echo '<table class="data_table">';
-	echo '	<tr class="row_odd">';
-	echo '		<th width="200">'.get_lang('Name').'</th>';
-	echo '		<th>'.get_lang('Description').'</th>';
-	echo '		<th width="100">'.get_lang('Modify').'</th>';
-	echo '	</tr>';
-
-	$sql = 'SELECT id,name,description FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND survey_id = '.intval($survey_id).' ORDER BY name';
-
-	$rs = Database::query($sql);
-	while($row = Database::fetch_array($rs,ASSOC)){
-		$grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
-		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
-		Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a> '.
-		'<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'),$row['name']).'?',ENT_QUOTES)).'\')) return false;">'.
-		Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
-		'</td></tr>';
-	}
-	echo $grouplist.'</table>';
+    echo '<br /><br /><b>'.get_lang('ManageGroups').'</b><br /><br />';
+
+    if (in_array($_GET['sendmsg'], array('GroupUpdatedSuccessfully', 'GroupDeletedSuccessfully', 'GroupCreatedSuccessfully'))) {
+        echo Display::display_confirmation_message(get_lang($_GET['sendmsg']), false);
+    }
+
+    if (in_array($_GET['sendmsg'], array('GroupNeedName'))){
+        echo Display::display_warning_message(get_lang($_GET['sendmsg']), false);
+    }
+    echo '<table border="0"><tr><td width="100">'.get_lang('Name').'</td><td>'.get_lang('Description').'</td></tr></table>';
+    echo '<form action="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?action=addgroup&survey_id='.$survey_id.'" method="post">';
+    if ($_GET['action'] == 'editgroup') {
+        $sql = 'SELECT name,description FROM '.$table_survey_question_group.' WHERE id = '.intval($_GET['gid']).' AND survey_id = '.intval($survey_id).' limit 1';
+        $rs = Database::query($sql);
+        $editedrow = Database::fetch_array($rs,'ASSOC');
+        echo	'<input type="text" maxlength="20" name="name" value="'.$editedrow['name'].'" size="10" disabled>';
+        echo	'<input type="text" maxlength="150" name="description" value="'.$editedrow['description'].'" size="40">';
+        echo	'<input type="hidden" name="group_id" value="'.Security::remove_XSS($_GET['gid']).'">';
+        echo	'<input type="submit" value="'.get_lang('Save').'"'.'<input type="button" value="'.get_lang('Cancel').'" onclick="window.location.href = \'survey.php?survey_id='.Security::remove_XSS($survey_id).'\';" />';
+    } else {
+        echo	'<input type="text" maxlength="20" name="name" value="" size="10">';
+        echo	'<input type="text" maxlength="250" name="description" value="" size="80">';
+        echo	'<input type="submit" value="'.get_lang('Create').'"';
+    }
+    echo	'</form><br />';
+
+    echo '<table class="data_table">';
+    echo '	<tr class="row_odd">';
+    echo '		<th width="200">'.get_lang('Name').'</th>';
+    echo '		<th>'.get_lang('Description').'</th>';
+    echo '		<th width="100">'.get_lang('Modify').'</th>';
+    echo '	</tr>';
+
+    $sql = 'SELECT id,name,description FROM '.$table_survey_question_group.' WHERE c_id = '.$course_id.' AND survey_id = '.intval($survey_id).' ORDER BY name';
+
+    $rs = Database::query($sql);
+    while($row = Database::fetch_array($rs,ASSOC)){
+        $grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
+        '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
+        Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a> '.
+        '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'),$row['name']).'?',ENT_QUOTES)).'\')) return false;">'.
+        Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+        '</td></tr>';
+    }
+    echo $grouplist.'</table>';
 }
 
 Session::erase('answer_count');

main/survey/link.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 if (!SurveyManager::survey_generation_hash_available()) {
     api_not_allowed(true);
 }
-$course_info  = api_get_course_info_by_id($_REQUEST['c']);
+$course_info = api_get_course_info_by_id($_REQUEST['c']);
 
 $hash_is_valid = SurveyManager::validate_survey_hash(
     $survey_id,