Completed
Push — 1.10.x ( c82817...6a93c3 )
by Yannick
202:42 queued 149:59
created
main/admin/skill_badge_create.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,10 +46,10 @@  discard block
 block discarded – undo
46 46
         if ($existsBadgesDirectory) {
47 47
 
48 48
             if (!empty($skill['icon'])) {
49
-                $iconFileAbsolutePath = $badgePath . $skill['icon'];
49
+                $iconFileAbsolutePath = $badgePath.$skill['icon'];
50 50
 
51 51
                 if (Security::check_abs_path($iconFileAbsolutePath, $badgePath)) {
52
-                    unlink($badgePath . $skill['icon']);
52
+                    unlink($badgePath.$skill['icon']);
53 53
                 }
54 54
             }
55 55
 
@@ -72,24 +72,24 @@  discard block
 block discarded – undo
72 72
 
73 73
     $objSkill->update($params);
74 74
 
75
-    header('Location: ' . api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php');
75
+    header('Location: '.api_get_path(WEB_CODE_PATH).'admin/skill_badge_list.php');
76 76
     exit;
77 77
 }
78 78
 
79 79
 $interbreadcrumb = array(
80 80
     array(
81
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
81
+        'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
82 82
         'name' => get_lang('Administration')
83 83
     ),
84 84
     array(
85
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php',
85
+        'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php',
86 86
         'name' => get_lang('Badges')
87 87
     )
88 88
 );
89 89
 
90 90
 $toolbar = Display::toolbarButton(
91 91
     get_lang('ManageSkills'),
92
-    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
92
+    api_get_path(WEB_CODE_PATH).'admin/skill_list.php',
93 93
     'list',
94 94
     'primary',
95 95
     ['title' => get_lang('ManageSkills')]
Please login to merge, or discard this patch.
main/admin/class_user_import.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -14,10 +14,10 @@  discard block
 block discarded – undo
14 14
  */
15 15
 function validate_data($user_classes) {
16 16
     global $purification_option_for_usernames;
17
-    $errors = array ();
18
-    $classcodes = array ();
17
+    $errors = array();
18
+    $classcodes = array();
19 19
 
20
-    if (!isset($_POST['subscribe']) && !isset($_POST['subscribe']))  {
20
+    if (!isset($_POST['subscribe']) && !isset($_POST['subscribe'])) {
21 21
           $user_class['error'] = get_lang('SelectAnAction');
22 22
           $errors[] = $user_class;
23 23
           return $errors;
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     foreach ($user_classes as $index => $user_class) {
26 26
         $user_class['line'] = $index + 1;
27 27
         // 1. Check whether mandatory fields are set.
28
-        $mandatory_fields = array ('UserName', 'ClassName');
28
+        $mandatory_fields = array('UserName', 'ClassName');
29 29
 
30 30
         foreach ($mandatory_fields as $key => $field) {
31 31
             if (!isset ($user_class[$field]) || strlen($user_class[$field]) == 0) {
@@ -76,12 +76,12 @@  discard block
 block discarded – undo
76 76
     global $purification_option_for_usernames;
77 77
 
78 78
     // Table definitions.
79
-    $user_table 		= Database :: get_main_table(TABLE_MAIN_USER);
80
-    $class_user_table 	= Database :: get_main_table(TABLE_MAIN_CLASS_USER);
81
-    $class_table 		= Database :: get_main_table(TABLE_MAIN_CLASS);
79
+    $user_table = Database :: get_main_table(TABLE_MAIN_USER);
80
+    $class_user_table = Database :: get_main_table(TABLE_MAIN_CLASS_USER);
81
+    $class_table = Database :: get_main_table(TABLE_MAIN_CLASS);
82 82
 
83 83
     // Data parsing: purification + conversion (UserName, ClassName) --> (user_is, class_id)
84
-    $csv_data = array ();
84
+    $csv_data = array();
85 85
     foreach ($users_classes as $index => $user_class) {
86 86
 
87 87
         $sql1 = "SELECT user_id FROM $user_table WHERE username = '".Database::escape_string(UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames))."'";
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
140 140
 
141 141
 $tool_name = get_lang('AddUsersToAClass').' CSV';
142 142
 
143
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
144
-$interbreadcrumb[] = array ('url' => 'class_list.php', 'name' => get_lang('Classes'));
143
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
144
+$interbreadcrumb[] = array('url' => 'class_list.php', 'name' => get_lang('Classes'));
145 145
 
146 146
 // Set this option to true to enforce strict purification for usenames.
147 147
 $purification_option_for_usernames = false;
Please login to merge, or discard this patch.
main/admin/special_exports.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 // setting the section (for the tabs)
16 16
 $this_section = SECTION_PLATFORM_ADMIN;
17 17
 // setting breadcrumbs
18
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
18
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
19 19
 // Access restrictions
20 20
 api_protect_admin_script(true);
21 21
 $nameTools = get_lang('SpecialExports');
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 if (function_exists('ini_set')) {
31 31
 	api_set_memory_limit('256M');
32
-	ini_set('max_execution_time',0);
32
+	ini_set('max_execution_time', 0);
33 33
 }
34 34
 
35 35
 // Displaying the header
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 if (count($_POST) == 0) {
42 42
     Display::display_normal_message(get_lang('SpecialExportsIntroduction'));
43 43
 }
44
-$error =0;
44
+$error = 0;
45 45
 /* MAIN CODE */
46 46
 
47 47
 $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
@@ -66,17 +66,17 @@  discard block
 block discarded – undo
66 66
             $groupCondition = " (props.to_group_id = 0 OR props.to_group_id IS NULL)";
67 67
         }
68 68
 
69
-		$zip_folder=new PclZip($FileZip['TEMP_FILE_ZIP']);
70
-		if(!isset($_POST['resource']) || count($_POST['resource']) == 0 ) {
69
+		$zip_folder = new PclZip($FileZip['TEMP_FILE_ZIP']);
70
+		if (!isset($_POST['resource']) || count($_POST['resource']) == 0) {
71 71
 			Display::display_error_message(get_lang('ErrorMsgSpecialExport'));
72 72
 		} else {
73 73
 			$Resource = $_POST['resource'];
74 74
 
75 75
 			foreach ($Resource as $Code_course => $Sessions) {
76
-				$_course 		= api_get_course_info($Code_course);
76
+				$_course = api_get_course_info($Code_course);
77 77
 				$tbl_document 	= Database::get_course_table(TABLE_DOCUMENT);
78 78
 				$tbl_property 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
79
-				$course_id 		= $_course['real_id'];
79
+				$course_id = $_course['real_id'];
80 80
 
81 81
 				//Add item to the zip file course
82 82
 				$sql = "SELECT path FROM $tbl_document AS docs, $tbl_property AS props
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 						AND $groupCondition
90 90
 						AND docs.c_id = $course_id
91 91
 						AND props.c_id = $course_id";
92
-				$query = Database::query($sql );
92
+				$query = Database::query($sql);
93 93
 				while ($rows_course_file = Database::fetch_assoc($query)) {
94 94
                     $zip_folder->add(
95 95
                         $FileZip['PATH_COURSE'].$_course['directory']."/document".$rows_course_file['path'],
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                     );
101 101
 				}
102 102
 
103
-				foreach ($Sessions as $IdSession => $value){
103
+				foreach ($Sessions as $IdSession => $value) {
104 104
 					$session_id = Security::remove_XSS($IdSession);
105 105
 					//Add tem to the zip file session course
106 106
 					$sql_session_doc = "SELECT path FROM $tbl_document AS docs, $tbl_property AS props
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	if (isset ($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') {
151 151
 		$cb = new CourseBuilder();
152 152
 		$course = $cb->build_session_course();
153
-		if($course === false){
153
+		if ($course === false) {
154 154
 			Display::display_error_message(get_lang('ErrorMsgSpecialExport'));
155 155
 			form_special_export();
156 156
 		} else {
@@ -166,12 +166,12 @@  discard block
 block discarded – undo
166 166
 Display::display_footer();
167 167
 
168 168
 function form_special_export() {
169
-    $form = new FormValidator('special_exports','post');
169
+    $form = new FormValidator('special_exports', 'post');
170 170
     $renderer = $form->defaultRenderer();
171 171
     $renderer->setCustomElementTemplate('<div>{element}</div> ');
172
-    $form->addElement('radio', 'backup_option', '',  get_lang('SpecialCreateFullBackup'), 'full_backup');
173
-    $form->addElement('radio', 'backup_option', '',  get_lang('SpecialLetMeSelectItems'), 'select_items');
174
-    $form->addElement('html','<br />');
172
+    $form->addElement('radio', 'backup_option', '', get_lang('SpecialCreateFullBackup'), 'full_backup');
173
+    $form->addElement('radio', 'backup_option', '', get_lang('SpecialLetMeSelectItems'), 'select_items');
174
+    $form->addElement('html', '<br />');
175 175
     $form->addButtonExport(get_lang('CreateBackup'));
176 176
     $form->add_progress_bar();
177 177
     $values['backup_option'] = 'full_backup';
@@ -179,26 +179,26 @@  discard block
 block discarded – undo
179 179
     $form->display();
180 180
 }
181 181
 
182
-function create_zip(){
182
+function create_zip() {
183 183
     $path = '';
184
-    if(empty($path)) { $path='/'; }
185
-    $remove_dir = ($path!='/') ? substr($path,0,strlen($path) - strlen(basename($path))) : '/';
184
+    if (empty($path)) { $path = '/'; }
185
+    $remove_dir = ($path != '/') ? substr($path, 0, strlen($path) - strlen(basename($path))) : '/';
186 186
     $sys_archive_path = api_get_path(SYS_ARCHIVE_PATH);
187 187
     $sys_course_path = api_get_path(SYS_COURSE_PATH);
188 188
     $temp_zip_dir = $sys_archive_path."temp";
189
-    if(!is_dir($temp_zip_dir)) {
189
+    if (!is_dir($temp_zip_dir)) {
190 190
         mkdir($temp_zip_dir, api_get_permissions_for_new_directories());
191 191
     } else {
192
-        $handle=opendir($temp_zip_dir);
193
-        while (false!==($file = readdir($handle))) {
192
+        $handle = opendir($temp_zip_dir);
193
+        while (false !== ($file = readdir($handle))) {
194 194
             if ($file != "." && $file != "..") {
195
-                $Diff = (time() - filemtime("$temp_zip_dir/$file"))/60/60;  //the "age" of the file in hours
196
-                if ($Diff > 4) unlink("$temp_zip_dir/$file");   //delete files older than 4 hours
195
+                $Diff = (time() - filemtime("$temp_zip_dir/$file")) / 60 / 60; //the "age" of the file in hours
196
+                if ($Diff > 4) unlink("$temp_zip_dir/$file"); //delete files older than 4 hours
197 197
             }
198 198
         }
199 199
         closedir($handle);
200 200
     }
201
-    $temp_zip_file = $temp_zip_dir."/".md5(time()).".zip";  //create zipfile of given directory
201
+    $temp_zip_file = $temp_zip_dir."/".md5(time()).".zip"; //create zipfile of given directory
202 202
     return array('PATH' => $path,
203 203
                  'PATH_TEMP_ARCHIVE' => $temp_zip_dir,
204 204
                  'PATH_COURSE' => $sys_course_path,
@@ -207,17 +207,17 @@  discard block
 block discarded – undo
207 207
 }
208 208
 
209 209
 function rename_zip($FileZip) {
210
-    Event::event_download(($FileZip['PATH'] == '/')?'full_export_'.date('Ymd').'.zip (folder)': basename($FileZip['PATH']).'.zip (folder)');
211
-    $name = ($FileZip['PATH']=='/')? 'full_export_'.date('Ymd').'.zip':basename($FileZip['PATH']).'.zip';
212
-    if(file_exists($FileZip['PATH_TEMP_ARCHIVE'].'/'.$name)){ unlink($FileZip['PATH_TEMP_ARCHIVE'].'/'.$name); }
213
-    if(file_exists($FileZip['TEMP_FILE_ZIP'])) {
210
+    Event::event_download(($FileZip['PATH'] == '/') ? 'full_export_'.date('Ymd').'.zip (folder)' : basename($FileZip['PATH']).'.zip (folder)');
211
+    $name = ($FileZip['PATH'] == '/') ? 'full_export_'.date('Ymd').'.zip' : basename($FileZip['PATH']).'.zip';
212
+    if (file_exists($FileZip['PATH_TEMP_ARCHIVE'].'/'.$name)) { unlink($FileZip['PATH_TEMP_ARCHIVE'].'/'.$name); }
213
+    if (file_exists($FileZip['TEMP_FILE_ZIP'])) {
214 214
         rename($FileZip['TEMP_FILE_ZIP'], $FileZip['PATH_TEMP_ARCHIVE'].'/'.$name);
215 215
         return $name;
216 216
     } else { return false; }
217 217
 
218 218
 }
219 219
 
220
-function fullexportspecial(){
220
+function fullexportspecial() {
221 221
     global $tbl_session, $tbl_session_course, $export;
222 222
     $FileZip = create_zip();
223 223
     $to_group_id = 0;
@@ -235,10 +235,10 @@  discard block
 block discarded – undo
235 235
     }
236 236
 
237 237
 
238
-    if (count($list_course) >0 ) {
239
-        foreach($list_course as $_course) {
240
-            if($FileZip['PATH'] == '/') {
241
-                $querypath=''; // to prevent ...path LIKE '//%'... in query
238
+    if (count($list_course) > 0) {
239
+        foreach ($list_course as $_course) {
240
+            if ($FileZip['PATH'] == '/') {
241
+                $querypath = ''; // to prevent ...path LIKE '//%'... in query
242 242
             } else {
243 243
                 $querypath = $FileZip['PATH'];
244 244
             }
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
                     AND $groupCondition
256 256
                     AND docs.c_id = $course_id
257 257
                     AND props.c_id = $course_id";
258
-            $query = Database::query($sql );
258
+            $query = Database::query($sql);
259 259
             while ($rows_course_file = Database::fetch_assoc($query)) {
260 260
                 $rows_course_file['path'];
261 261
                 $zip_folder->add($FileZip['PATH_COURSE'].$_course['directory']."/document".$rows_course_file['path'],
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
         }
296 296
 
297 297
         $name = rename_zip($FileZip);
298
-        if ($name === false){
298
+        if ($name === false) {
299 299
             $export = false;
300 300
             return false;
301 301
         } else {
Please login to merge, or discard this patch.
main/admin/skill_edit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
         );
95 95
     }
96 96
 
97
-    header('Location: '.api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php');
97
+    header('Location: '.api_get_path(WEB_CODE_PATH).'admin/skill_list.php');
98 98
     exit;
99 99
 }
100 100
 
Please login to merge, or discard this patch.
main/notebook/index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 // Including the global initialization file
11 11
 require_once '../inc/global.inc.php';
12 12
 
13
-$current_course_tool  = TOOL_NOTEBOOK;
13
+$current_course_tool = TOOL_NOTEBOOK;
14 14
 
15 15
 // The section (tabs)
16 16
 $this_section = SECTION_COURSES;
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
         NotebookManager::display_notes();
97 97
     } else {
98 98
         echo '<div class="actions">';
99
-        echo '<a href="index.php">'.Display::return_icon('back.png',get_lang('BackToNotesList'),'',ICON_SIZE_MEDIUM).'</a>';
99
+        echo '<a href="index.php">'.Display::return_icon('back.png', get_lang('BackToNotesList'), '', ICON_SIZE_MEDIUM).'</a>';
100 100
         echo '</div>';
101 101
         $token = Security::get_token();
102 102
         $form->addElement('hidden', 'sec_token');
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     } else {
148 148
         echo '<div class="actions">';
149 149
         echo '<a href="index.php">'.
150
-            Display::return_icon('back.png',get_lang('BackToNotesList'),'',ICON_SIZE_MEDIUM).'</a>';
150
+            Display::return_icon('back.png', get_lang('BackToNotesList'), '', ICON_SIZE_MEDIUM).'</a>';
151 151
         echo '</div>';
152 152
         $token = Security::get_token();
153 153
         $form->addElement('hidden', 'sec_token');
Please login to merge, or discard this patch.
main/announcements/download.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 $doc_url = str_replace(' ', '+', $doc_url);
29 29
 $doc_url = str_replace('/..', '', $doc_url); //echo $doc_url;
30 30
 
31
-if (strpos($doc_url,'../') OR strpos($doc_url,'/..')) {
31
+if (strpos($doc_url, '../') OR strpos($doc_url, '/..')) {
32 32
     $doc_url = '';
33 33
 }
34 34
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
     //remove last slash if present
44 44
     //$doc_url = ($doc_url{strlen($doc_url)-1}=='/')?substr($doc_url,0,strlen($doc_url)-1):$doc_url;
45 45
     //mod_rewrite can change /some/path/ to /some/path// in some cases, so clean them all off (René)
46
-    while ($doc_url{$dul = strlen($doc_url)-1}=='/') $doc_url = substr($doc_url,0,$dul);
46
+    while ($doc_url{$dul = strlen($doc_url) - 1} == '/') $doc_url = substr($doc_url, 0, $dul);
47 47
     //create the path
48 48
     $document_explorer = api_get_path(WEB_COURSE_PATH).api_get_course_path(); // home course path
49 49
     //redirect
@@ -62,12 +62,12 @@  discard block
 block discarded – undo
62 62
 $sql = "SELECT filename FROM $tbl_announcement_attachment
63 63
   	  	WHERE c_id = $course_id AND path LIKE BINARY '$doc_url'";
64 64
 
65
-$result= Database::query($sql);
65
+$result = Database::query($sql);
66 66
 if (Database::num_rows($result) > 0) {
67
-    $row= Database::fetch_array($result);
68
-    $title = str_replace(' ','_', $row['filename']);
67
+    $row = Database::fetch_array($result);
68
+    $title = str_replace(' ', '_', $row['filename']);
69 69
     if (Security::check_abs_path($full_file_name,
70
-        api_get_path(SYS_COURSE_PATH) . api_get_course_path() . '/upload/announcements/')
70
+        api_get_path(SYS_COURSE_PATH).api_get_course_path().'/upload/announcements/')
71 71
     ) {
72 72
         DocumentManager::file_send_for_download($full_file_name, true, $title);
73 73
     }
Please login to merge, or discard this patch.
main/survey/survey_invite.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 $tool_name = get_lang('SurveyPublication');
65 65
 
66 66
 // Displaying the header
67
-Display::display_header($tool_name,'Survey');
67
+Display::display_header($tool_name, 'Survey');
68 68
 
69 69
 echo '<script>
70 70
 $(function() {
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 );
133 133
 
134 134
 $form->addElement('html', '<div id="check_mail">');
135
-$form->addElement('checkbox', 'send_mail','', get_lang('SendMail'));
135
+$form->addElement('checkbox', 'send_mail', '', get_lang('SendMail'));
136 136
 $form->addElement('html', '</div>');
137 137
 
138 138
 $form->addElement('html', '<div id="mail_text_wrapper">');
@@ -219,8 +219,8 @@  discard block
 block discarded – undo
219 219
 	);
220 220
 
221 221
 	// Saving the invitations for the additional users
222
-	$values['additional_users'] = $values['additional_users'].';'; 	// This is for the case when you enter only one email
223
-	$temp = str_replace(',', ';', $values['additional_users']);		// This is to allow , and ; as email separators
222
+	$values['additional_users'] = $values['additional_users'].';'; // This is for the case when you enter only one email
223
+	$temp = str_replace(',', ';', $values['additional_users']); // This is to allow , and ; as email separators
224 224
 	$additional_users = explode(';', $temp);
225 225
 	for ($i = 0; $i < count($additional_users); $i++) {
226 226
 		$additional_users[$i] = trim($additional_users[$i]);
Please login to merge, or discard this patch.
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.