Completed
Pull Request — 1.11.x (#1628)
by José
97:30 queued 69:06
created
main/survey/fillsurvey.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
         $now = api_get_utc_datetime();
113 113
         if (Database :: num_rows($result) == 0) {
114 114
             $params = [
115
-                'c_id' => $course_id ,
115
+                'c_id' => $course_id,
116 116
                 'survey_code' => $surveyCode,
117 117
                 'user' => $userid,
118 118
                 'invitation_code' => $autoInvitationcode,
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
     $jquery_ready_content = $returnParams['jquery_ready_content'];
472 472
 
473 473
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
474
-    $htmlHeadXtra[] ='<script>
474
+    $htmlHeadXtra[] = '<script>
475 475
     $(document).ready(function(){
476 476
         '.$jquery_ready_content.'
477 477
     });
@@ -904,16 +904,16 @@  discard block
 block discarded – undo
904 904
                             $group2 = $groups[0];
905 905
                             $secondary .= " OR ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
906 906
                             $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
907
-                            $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
907
+                            $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
908 908
                         } else {
909 909
                             if ($i != 0) {
910 910
                                 $secondary .= " OR ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
911 911
                                 $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
912
-                                $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
912
+                                $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
913 913
                             } else {
914 914
                                 $secondary .= " ( survey_group_sec1 = '$group1' AND  survey_group_sec2 = '$group2') ";
915 915
                                 $secondary .= " OR ( survey_group_sec1 = '$group2' AND survey_group_sec2 = '$group1' ) ";
916
-                                $combi.= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
916
+                                $combi .= $group1.' - '.$group2." or ".$group2.' - '.$group1.'<br />';
917 917
                             }
918 918
                         }
919 919
                     }
@@ -1132,7 +1132,7 @@  discard block
 block discarded – undo
1132 1132
                         $questions[$row['sort']]['survey_group_sec1'] = $row['survey_group_sec1'];
1133 1133
                         $questions[$row['sort']]['survey_group_sec2'] = $row['survey_group_sec2'];
1134 1134
                         $questions[$row['sort']]['survey_group_pri'] = $row['survey_group_pri'];
1135
-                    }  else {
1135
+                    } else {
1136 1136
                         // If the type is a page break we are finished loading the questions for this page
1137 1137
                         break;
1138 1138
                     }
Please login to merge, or discard this patch.
main/survey/ch_yesno.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
                 $class = 'radio-inline';
44 44
             }
45 45
 
46
-            $name = 'question' . $questionData['question_id'];
46
+            $name = 'question'.$questionData['question_id'];
47 47
 
48 48
             $form->addRadio(
49 49
                 $name,
Please login to merge, or discard this patch.
main/survey/ch_multiplechoice.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
             foreach ($formData['answers'] as $key => $value) {
32 32
                 $this->getForm()->addHtmlEditor('answers['.$key.']', null, false, false, $config);
33 33
 
34
-                if ($key < $total-1) {
34
+                if ($key < $total - 1) {
35 35
                     //$this->getForm()->addButton("move_down[$key]", get_lang('Down'));
36 36
                 }
37 37
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
                     //$this->getForm()->addButton("move_up[$key]", get_lang('Up'));
40 40
                 }
41 41
 
42
-                if ($total> 2) {
42
+                if ($total > 2) {
43 43
                     $this->getForm()->addButton("delete_answer[$key]", get_lang('Delete'), 'trash', 'danger');
44 44
                 }
45 45
             }
Please login to merge, or discard this patch.
main/survey/question.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 	$sql = 'SELECT id FROM '.Database :: get_course_table(TABLE_SURVEY_QUESTION_GROUP).'
58 58
 	        WHERE
59 59
                 c_id = '.$course_id.' AND
60
-                survey_id = '.(int)$_GET['survey_id'].' LIMIT 1';
60
+                survey_id = '.(int) $_GET['survey_id'].' LIMIT 1';
61 61
 	$rs = Database::query($sql);
62
-	if (Database::num_rows($rs)===0) {
62
+	if (Database::num_rows($rs) === 0) {
63 63
         Display::addFlash(
64 64
             Display::return_message(get_lang('YouNeedToCreateGroups'))
65 65
         );
66
-		header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.(int)$_GET['survey_id']);
66
+		header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.(int) $_GET['survey_id']);
67 67
 		exit;
68 68
 	}
69 69
 }
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 // Actions
104 104
 $actions = '<div class="actions">';
105 105
 $actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'survey/survey.php?survey_id='.intval($_GET['survey_id']).'">'.
106
-	Display::return_icon('back.png', get_lang('BackToSurvey'),'',ICON_SIZE_MEDIUM).'</a>';
106
+	Display::return_icon('back.png', get_lang('BackToSurvey'), '', ICON_SIZE_MEDIUM).'</a>';
107 107
 $actions .= '</div>';
108 108
 // Checking if it is a valid type
109 109
 if (!in_array($_GET['type'], $possible_types)) {
Please login to merge, or discard this patch.
main/survey/survey_invitation.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,11 +21,11 @@  discard block
 block discarded – undo
21 21
 
22 22
 // Database table definitions
23 23
 $table_survey 					= Database :: get_course_table(TABLE_SURVEY);
24
-$table_survey_question 			= Database :: get_course_table(TABLE_SURVEY_QUESTION);
25
-$table_survey_question_option 	= Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
24
+$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
25
+$table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
26 26
 $table_course 					= Database :: get_main_table(TABLE_MAIN_COURSE);
27
-$table_user 					= Database :: get_main_table(TABLE_MAIN_USER);
28
-$table_survey_invitation 		= Database :: get_course_table(TABLE_SURVEY_INVITATION);
27
+$table_user = Database :: get_main_table(TABLE_MAIN_USER);
28
+$table_survey_invitation = Database :: get_course_table(TABLE_SURVEY_INVITATION);
29 29
 
30 30
 $tool_name = get_lang('SurveyInvitations');
31 31
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 }
78 78
 
79 79
 if (!isset($_GET['view']) OR $_GET['view'] == 'invited') {
80
-	echo get_lang('ViewInvited'). ' | ';
80
+	echo get_lang('ViewInvited').' | ';
81 81
 } else {
82 82
 	echo '	<a href="'.api_get_self().'?survey_id='.$survey_id.'&amp;view=invited">'.get_lang('ViewInvited').'</a> |';
83 83
 }
Please login to merge, or discard this patch.
main/survey/link.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 if (!SurveyManager::survey_generation_hash_available()) {
12 12
     api_not_allowed(true);
13 13
 }
14
-$course_info  = api_get_course_info_by_id($_REQUEST['c']);
14
+$course_info = api_get_course_info_by_id($_REQUEST['c']);
15 15
 
16 16
 $hash_is_valid = SurveyManager::validate_survey_hash(
17 17
     $survey_id,
Please login to merge, or discard this patch.
main/survey/ch_percentage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
             $options[$key] = $value;
22 22
         }
23 23
 
24
-        $name = 'question' . $questionData['question_id'];
24
+        $name = 'question'.$questionData['question_id'];
25 25
 
26 26
         $form->addSelect(
27 27
             $name, null, $options
Please login to merge, or discard this patch.
main/survey/ch_score.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
             $options = array(
39 39
                 '--' => '--'
40 40
             );
41
-            for ($i=1; $i <= $questionData['maximum_score']; $i++) {
41
+            for ($i = 1; $i <= $questionData['maximum_score']; $i++) {
42 42
                 $options[$i] = $i;
43 43
             }
44 44
 
Please login to merge, or discard this patch.
main/survey/survey_list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
     if (api_is_allowed_to_edit()) {
76 76
         SurveyManager::copy_survey($_GET['survey_id']);
77 77
         $message = get_lang('SurveyCopied');
78
-        header('Location: ' . api_get_path(WEB_CODE_PATH) . 'survey/survey_list.php?' . api_get_cidreq());
78
+        header('Location: '.api_get_path(WEB_CODE_PATH).'survey/survey_list.php?'.api_get_cidreq());
79 79
         exit;
80 80
     }
81 81
 }
@@ -162,10 +162,10 @@  discard block
 block discarded – undo
162 162
 if (!api_is_course_coach() || $extend_rights_for_coachs == 'true') {
163 163
     // Action links
164 164
     echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'.
165
-        Display::return_icon('new_survey.png', get_lang('CreateNewSurvey'),'',ICON_SIZE_MEDIUM).'</a> ';
165
+        Display::return_icon('new_survey.png', get_lang('CreateNewSurvey'), '', ICON_SIZE_MEDIUM).'</a> ';
166 166
 }
167 167
 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;search=advanced">'.
168
-    Display::return_icon('search.png', get_lang('Search'),'',ICON_SIZE_MEDIUM).'</a>';
168
+    Display::return_icon('search.png', get_lang('Search'), '', ICON_SIZE_MEDIUM).'</a>';
169 169
 echo '</div>';
170 170
 
171 171
 // Load main content
Please login to merge, or discard this patch.