Completed
Push — 1.10.x ( 48dd82...5e3ab9 )
by Yannick
48:23
created
main/admin/user_information.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     api_not_allowed();
22 22
 }
23 23
 $user = api_get_user_info($_GET['user_id'], true);
24
-$tool_name = $user['complete_name'].(empty($user['official_code'])?'':' ('.$user['official_code'].')');
24
+$tool_name = $user['complete_name'].(empty($user['official_code']) ? '' : ' ('.$user['official_code'].')');
25 25
 $table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
26 26
 $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
27 27
 
@@ -47,13 +47,13 @@  discard block
 block discarded – undo
47 47
 
48 48
     $exportLink = Display::url(
49 49
         Display::return_icon(
50
-            'export_csv.png', get_lang('ExportAsCSV'),'', ICON_SIZE_MEDIUM
50
+            'export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM
51 51
         ),
52 52
         api_get_self().'?user_id='.$user['user_id'].'&action=export'
53 53
     );
54 54
     $vCardExportLink = Display::url(
55 55
         Display::return_icon(
56
-            'vcard.png', get_lang('UserInfo'),'', ICON_SIZE_MEDIUM
56
+            'vcard.png', get_lang('UserInfo'), '', ICON_SIZE_MEDIUM
57 57
         ),
58 58
         api_get_path(WEB_PATH).'main/social/vcard_export.php?userId='.$user['user_id']
59 59
     );
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
         $tools = '<a href="course_information.php?code='.$courseCode.'">'.
294 294
             Display::return_icon('synthese_view.gif', get_lang('Overview')).'</a>'.
295 295
             '<a href="'.$courseInfo['course_public_url'].'">'.
296
-            Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'</a>' .
296
+            Display::return_icon('course_home.gif', get_lang('CourseHomepage')).'</a>'.
297 297
             '<a href="course_edit.php?id='.$course->c_id.'">'.
298 298
             Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
299 299
         if ($course->status == STUDENT) {
Please login to merge, or discard this patch.
main/admin/course_export.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 api_protect_admin_script();
15 15
 
16 16
 $tool_name = get_lang('ExportCourses');
17
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
17
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
18 18
 
19 19
 set_time_limit(0);
20 20
 
@@ -62,11 +62,11 @@  discard block
 block discarded – undo
62 62
 
63 63
         $dataToExport = [];
64 64
         foreach ($courses as $course) {
65
-            $dataToExport['code'] = str_replace(';',',',$course['code']);
66
-            $dataToExport['title'] = str_replace(';',',',$course['title']);
67
-            $dataToExport['category_code'] = str_replace(';',',',$course['category_code']);
68
-            $dataToExport['tutor_name'] = str_replace(';',',',$course['tutor_name']);
69
-            $dataToExport['course_language'] = str_replace(';',',',$course['course_language']);
65
+            $dataToExport['code'] = str_replace(';', ',', $course['code']);
66
+            $dataToExport['title'] = str_replace(';', ',', $course['title']);
67
+            $dataToExport['category_code'] = str_replace(';', ',', $course['category_code']);
68
+            $dataToExport['tutor_name'] = str_replace(';', ',', $course['tutor_name']);
69
+            $dataToExport['course_language'] = str_replace(';', ',', $course['course_language']);
70 70
 
71 71
             $dataToExport['students'] = '';
72 72
             $dataToExport['teachers'] = '';
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
 	$form->addHtml('</div>');
149 149
 }
150 150
 
151
-$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null);
152
-$form->addElement('radio', 'file_type', '' , 'XLS' , 'xls', null);
151
+$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV', 'csv', null);
152
+$form->addElement('radio', 'file_type', '', 'XLS', 'xls', null);
153 153
 $form->addElement('radio', 'file_type', null, 'XML', 'xml', null, array('id' => 'file_type_xml'));
154 154
 
155 155
 $form->setDefaults(['select_type' => '1', 'file_type' => 'csv']);
Please login to merge, or discard this patch.
main/admin/ldap_form_add_users_group.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 /**
10 10
  * This form is included by ldap_import_students.php and ldap_import_students_to_session.php
11 11
  */
12
-$nbre=0;
12
+$nbre = 0;
13 13
 echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">';
14
-	if($statut==1)
14
+	if ($statut == 1)
15 15
 	{
16 16
 		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
17 17
 	}
@@ -19,30 +19,30 @@  discard block
 block discarded – undo
19 19
 	{
20 20
 		echo '<input type="hidden" name="mailling" value="1">';
21 21
 	}
22
-if(!empty($course))
22
+if (!empty($course))
23 23
 {
24 24
 	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
25 25
 }
26
-elseif(!empty($id_session))
26
+elseif (!empty($id_session))
27 27
 {
28 28
 	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
29 29
 }
30 30
 $is_western_name_order = api_is_western_name_order();
31 31
 echo '<input type="hidden" name="confirmed" value="yes">';
32 32
 echo '<table border="0" cellspacing="0" width="100%">';
33
-echo '<tr align="center" id="header3">' .
34
-		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
35
-		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
33
+echo '<tr align="center" id="header3">'.
34
+		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>'.
35
+		'<td width="40%"><b>'.get_lang('Email').'</b></td>'.
36 36
 		($is_western_name_order
37
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
37
+			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>'.
38 38
 			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
39
-			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
40
-			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
41
-		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
39
+			: '<td width="15%"><b>'.get_lang('Name').'</b></td>'.
40
+			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>').
41
+		'<td width="15%"><b>'.get_lang('Login').'</b></td>'.
42 42
 	  '</tr>'."\n";
43 43
 while (list ($key, $val) = each($nom_form)) {
44
-	$nbre=$nbre+1;
45
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
44
+	$nbre = $nbre + 1;
45
+	if ($nbre & 1) $ndiv = 2; else $ndiv = 3;
46 46
 	echo '<tr align="center" id="header'.$ndiv.'">';
47 47
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
48 48
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
Please login to merge, or discard this patch.
main/admin/skill_list.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 }
21 21
 
22 22
 $action = isset($_GET['action']) ? $_GET['action'] : 'list';
23
-$skillId = isset($_GET['id']) ? intval($_GET['id']): 0;
23
+$skillId = isset($_GET['id']) ? intval($_GET['id']) : 0;
24 24
 
25 25
 $entityManager = Database::getManager();
26 26
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
             );
56 56
         }
57 57
 
58
-        header('Location: ' . api_get_self());
58
+        header('Location: '.api_get_self());
59 59
         exit;
60 60
         break;
61 61
     case 'disable':
@@ -108,33 +108,33 @@  discard block
 block discarded – undo
108 108
             );
109 109
         }
110 110
 
111
-        header('Location: ' . api_get_self());
111
+        header('Location: '.api_get_self());
112 112
         exit;
113 113
         break;
114 114
     case 'list':
115 115
         //no break
116 116
     default:
117
-        $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
117
+        $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
118 118
 
119 119
         $message = Session::has('message') ? Session::read('message') : null;
120 120
 
121 121
         $toolbar = Display::toolbarButton(
122 122
             get_lang('CreateSkill'),
123
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_create.php',
123
+            api_get_path(WEB_CODE_PATH).'admin/skill_create.php',
124 124
             'plus',
125 125
             'success',
126 126
             ['title' => get_lang('CreateSkill')]
127 127
         );
128 128
         $toolbar .= Display::toolbarButton(
129 129
             get_lang('SkillsWheel'),
130
-            api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php',
130
+            api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php',
131 131
             'bullseye',
132 132
             'primary',
133 133
             ['title' => get_lang('CreateSkill')]
134 134
         );
135 135
         $toolbar .= Display::toolbarButton(
136 136
             get_lang('BadgesManagement'),
137
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php',
137
+            api_get_path(WEB_CODE_PATH).'admin/skill_badge_list.php',
138 138
             'shield',
139 139
             'warning',
140 140
             ['title' => get_lang('BadgesManagement')]
Please login to merge, or discard this patch.
main/admin/inactive_user_list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@
 block discarded – undo
24 24
 Display :: display_header($tool_name, "");
25 25
 
26 26
 //On sélectionne les user élèves
27
-$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname " ;
27
+$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname ";
28 28
 $result = Database::query($sql);
29 29
 
30
-while($row = Database::fetch_array($result)) {
30
+while ($row = Database::fetch_array($result)) {
31 31
     $user_id = $row['user_id'];
32 32
     //  pour chaque élève, on trouve la dernière connexion
33 33
     //$last_connection_date = UserManager:: delete_inactive_student($user_id, 2, true);
Please login to merge, or discard this patch.
main/admin/usergroup_user_import.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
         foreach ($mandatory_fields as $field) {
27 27
             if (!isset($user_class[$field]) || strlen($user_class[$field]) == 0) {
28
-                $user_class['error'] = get_lang($field . 'Mandatory');
28
+                $user_class['error'] = get_lang($field.'Mandatory');
29 29
                 $errors[] = $user_class;
30 30
             }
31 31
         }
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
                 // 2.1.1 Check whether code exists in DB
38 38
                 $exists = $usergroup->usergroup_exists($user_class['ClassName']);
39 39
                 if (!$exists) {
40
-                    $user_class['error'] = get_lang('CodeDoesNotExists') . ': ' . $user_class['ClassName'];
40
+                    $user_class['error'] = get_lang('CodeDoesNotExists').': '.$user_class['ClassName'];
41 41
                     $errors[] = $user_class;
42 42
                 } else {
43 43
                     $classcodes[$user_class['CourseCode']] = 1;
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
49 49
         if (!UserManager::is_username_empty($user_class['UserName'])) {
50 50
             // 3.1. Check whether username is too long.
51 51
             if (UserManager::is_username_too_long($user_class['UserName'])) {
52
-                $user_class['error'] = get_lang('UserNameTooLong') . ': ' . $user_class['UserName'];
52
+                $user_class['error'] = get_lang('UserNameTooLong').': '.$user_class['UserName'];
53 53
                 $errors[] = $user_class;
54 54
             }
55 55
 
56 56
             $username = UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames);
57 57
             // 3.2. Check whether username exists.
58 58
             if (UserManager::is_username_available($username)) {
59
-                $user_class['error'] = get_lang('UnknownUser') . ': ' . $username;
59
+                $user_class['error'] = get_lang('UnknownUser').': '.$username;
60 60
                 $errors[] = $user_class;
61 61
             }
62 62
         }
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
             $class_name = $user_data['class_name'];
106 106
             $user_list_name = $user_data['user_list_name'];
107 107
             $usergroup->subscribe_users_to_usergroup($class_id, $user_list, $deleteUsersNotInList);
108
-            $message .= Display::return_message(get_lang('Class') . ': ' . $class_name . '<br />', 'normal', false);
109
-            $message .= Display::return_message(get_lang('Users') . ': ' . implode(', ', $user_list_name));
108
+            $message .= Display::return_message(get_lang('Class').': '.$class_name.'<br />', 'normal', false);
109
+            $message .= Display::return_message(get_lang('Users').': '.implode(', ', $user_list_name));
110 110
         }
111 111
     }
112 112
     return $message;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 $this_section = SECTION_PLATFORM_ADMIN;
129 129
 api_protect_admin_script(true);
130 130
 
131
-$tool_name = get_lang('AddUsersToAClass') . ' CSV';
131
+$tool_name = get_lang('AddUsersToAClass').' CSV';
132 132
 
133 133
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
134 134
 $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 if (count($errors) != 0) {
165 165
     $error_message = "\n";
166 166
     foreach ($errors as $index => $error_class_user) {
167
-        $error_message .= get_lang('Line') . ' ' . $error_class_user['line'] . ': ' . $error_class_user['error'] . '</b>';
167
+        $error_message .= get_lang('Line').' '.$error_class_user['line'].': '.$error_class_user['error'].'</b>';
168 168
         $error_message .= "<br />";
169 169
     }
170 170
     $error_message .= "\n";
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 }
173 173
 $form->display();
174 174
 ?>
175
-<p><?php echo get_lang('CSVMustLookLike') . ' (' . get_lang('MandatoryFields') . ')'; ?> :</p>
175
+<p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
176 176
 <pre>
177 177
 <b>UserName</b>;<b>ClassName</b>
178 178
 jdoe;class01
Please login to merge, or discard this patch.
main/admin/index.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 $nameTools = get_lang('PlatformAdmin');
20 20
 
21 21
 $accessUrlId = 0;
22
-$adminExtraContentDir = api_get_path(SYS_APP_PATH) . "home/admin/";
22
+$adminExtraContentDir = api_get_path(SYS_APP_PATH)."home/admin/";
23 23
 
24 24
 if (api_is_multiple_url_enabled()) {
25 25
     $accessUrlId = api_get_current_access_url_id();
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $urlInfo = api_get_access_url($accessUrlId);
29 29
         $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $urlInfo['url']));
30 30
         $cleanUrl = str_replace('/', '-', $url);
31
-        $adminExtraContentDir = api_get_path(SYS_APP_PATH) . "home/$cleanUrl/admin/";
31
+        $adminExtraContentDir = api_get_path(SYS_APP_PATH)."home/$cleanUrl/admin/";
32 32
     }
33 33
 }
34 34
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             <div class="form-group">
97 97
                 <input class="form-control" type="text" name="keyword" value="">
98 98
                 <button class="btn btn-default" type="submit">
99
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
99
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
100 100
                 </button>
101 101
             </div>
102 102
         </form>';
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
             <div class="form-group">
150 150
                 <input class="form-control" type="text" name="keyword" value="">
151 151
                 <button class="btn btn-default" type="submit">
152
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
152
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
153 153
                 </button>
154 154
             </div>
155 155
         </form>';
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
                 <input class="form-control" type="text" name="search_field" value="" >
210 210
                 <input type="hidden" value="search_setting" name="category">
211 211
                 <button class="btn btn-default" type="submit">
212
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
212
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
213 213
                 </button>
214 214
             </div>
215 215
         </form>';
@@ -222,18 +222,18 @@  discard block
 block discarded – undo
222 222
     $items[] = array('url' => 'settings.php?category=Regions', 'label' => get_lang('Regions'));
223 223
     $items[] = array('url' => 'system_announcements.php', 'label' => get_lang('SystemAnnouncements'));
224 224
     $items[] = array(
225
-        'url' => api_get_path(WEB_CODE_PATH) . 'calendar/agenda_js.php?type=admin',
225
+        'url' => api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=admin',
226 226
         'label' => get_lang('GlobalAgenda')
227 227
     );
228 228
     $items[] = array('url' => 'configure_homepage.php', 'label' => get_lang('ConfigureHomePage'));
229 229
     $items[] = array('url' => 'configure_inscription.php', 'label' => get_lang('ConfigureInscription'));
230 230
     $items[] = array('url' => 'statistics/index.php', 'label' => get_lang('Statistics'));
231 231
     $items[] = array(
232
-        'url' => api_get_path(WEB_CODE_PATH) . 'mySpace/company_reports.php',
232
+        'url' => api_get_path(WEB_CODE_PATH).'mySpace/company_reports.php',
233 233
         'label' => get_lang('Reports')
234 234
     );
235 235
     $items[] = array(
236
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/teacher_time_report.php',
236
+        'url' => api_get_path(WEB_CODE_PATH).'admin/teacher_time_report.php',
237 237
         'label' => get_lang('TeacherTimeReport')
238 238
     );
239 239
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
                     <div class="form-group">
283 283
                         <input class="form-control" type="text" name="keyword" value="">
284 284
                         <button class="btn btn-default" type="submit">
285
-                            <em class="fa fa-search"></em> ' . get_lang('Search') . '
285
+                            <em class="fa fa-search"></em> ' . get_lang('Search').'
286 286
                         </button>
287 287
                     </div>
288 288
                 </form>';
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 
311 311
 if (api_is_platform_admin()) {
312 312
     // option only visible in development mode. Enable through code if required
313
-    if (is_dir(api_get_path(SYS_TEST_PATH) . 'datafiller/')) {
313
+    if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
314 314
         $items[] = array('url' => 'user_move_stats.php', 'label' => get_lang('MoveUserStats'));
315 315
     }
316 316
     $items[] = array('url' => 'career_dashboard.php', 'label' => get_lang('CareersAndPromotions'));
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
     $items = array();
338 338
     $items[] = array('url' => 'special_exports.php', 'label' => get_lang('SpecialExports'));
339 339
     $items[] = array('url' => 'system_status.php', 'label' => get_lang('SystemStatus'));
340
-    if (is_dir(api_get_path(SYS_TEST_PATH) . 'datafiller/')) {
340
+    if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
341 341
         $items[] = array('url' => 'filler.php', 'label' => get_lang('DataFiller'));
342 342
     }
343 343
 
@@ -381,12 +381,12 @@  discard block
 block discarded – undo
381 381
         $items[] = array('url' => 'skill_list.php', 'label' => get_lang('ManageSkills'));
382 382
         //$items[] = array('url'=>'skills_profile.php',   'label' => get_lang('SkillsProfile'));
383 383
         $items[] = array(
384
-            'url' => api_get_path(WEB_CODE_PATH) . 'social/skills_ranking.php',
384
+            'url' => api_get_path(WEB_CODE_PATH).'social/skills_ranking.php',
385 385
             'label' => get_lang('SkillsRanking')
386 386
         );
387 387
         $items[] = array('url' => 'skills_gradebook.php', 'label' => get_lang('SkillsAndGradebooks'));
388 388
         $items[] = array(
389
-            'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php',
389
+            'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php',
390 390
             'label' => get_lang('Badges')
391 391
         );
392 392
         $blocks['skills']['items'] = $items;
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
         }
440 440
     }
441 441
 }
442
-$admin_ajax_url = api_get_path(WEB_AJAX_PATH) . 'admin.ajax.php';
442
+$admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
443 443
 
444 444
 $tpl = new Template();
445 445
 
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
                 die;
493 493
             }
494 494
 
495
-            $fullFilePath = $adminExtraContentDir . $extraData['block'];
495
+            $fullFilePath = $adminExtraContentDir.$extraData['block'];
496 496
             $fullFilePath .= "_extra.html";
497 497
 
498 498
             file_put_contents($fullFilePath, $extraData['extra_content']);
Please login to merge, or discard this patch.
main/admin/event_type.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 
46 46
 $languages = api_get_languages();
47 47
 
48
-$ajaxPath = api_get_path(WEB_CODE_PATH) . 'inc/ajax/events.ajax.php';
48
+$ajaxPath = api_get_path(WEB_CODE_PATH).'inc/ajax/events.ajax.php';
49 49
 
50
-$action_array = array(array('url' =>'event_controller.php?action=listing' , 'content' => Display::return_icon('view_text.png', get_lang('ListView'), array(), ICON_SIZE_MEDIUM)));
50
+$action_array = array(array('url' =>'event_controller.php?action=listing', 'content' => Display::return_icon('view_text.png', get_lang('ListView'), array(), ICON_SIZE_MEDIUM)));
51 51
 
52 52
 $key_lang = get_lang('YouHaveSomeUnsavedChanges');
53 53
 $users = UserManager::get_user_list(array(), array('firstname'));
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
         <select class="col-md-6" multiple="1" id="eventList" onchange="confirmMessage(this.name); return false;" name="eventList">
312 312
         <?php
313 313
         foreach ($event_config as $key => $config) {
314
-            echo '<option value="' . $key . '">' . $config['name_lang_var'] . '</option>';
314
+            echo '<option value="'.$key.'">'.$config['name_lang_var'].'</option>';
315 315
         }
316 316
         ?>
317 317
         </select>
Please login to merge, or discard this patch.
main/admin/dashboard_add_users_to_user.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 
24 24
 // setting breadcrumbs
25 25
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
26
-$interbreadcrumb[] = array('url' => 'user_list.php','name' => get_lang('UserList'));
26
+$interbreadcrumb[] = array('url' => 'user_list.php', 'name' => get_lang('UserList'));
27 27
 
28 28
 // Database Table Definitions
29 29
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -43,17 +43,17 @@  discard block
 block discarded – undo
43 43
 $isAdmin = UserManager::is_admin($user_id);
44 44
 if ($isAdmin) {
45 45
     $userStatus = PLATFORM_ADMIN;
46
-    $tool_name= get_lang('AssignUsersToPlatformAdministrator');
46
+    $tool_name = get_lang('AssignUsersToPlatformAdministrator');
47 47
 } else if ($user_info['status'] == SESSIONADMIN) {
48
-    $tool_name= get_lang('AssignUsersToSessionsAdministrator');
49
-} else if  ($user_info['status'] == STUDENT_BOSS) {
50
-    $tool_name= get_lang('AssignUsersToBoss');
48
+    $tool_name = get_lang('AssignUsersToSessionsAdministrator');
49
+} else if ($user_info['status'] == STUDENT_BOSS) {
50
+    $tool_name = get_lang('AssignUsersToBoss');
51 51
 } else {
52
-    $tool_name= get_lang('AssignUsersToHumanResourcesManager');
52
+    $tool_name = get_lang('AssignUsersToHumanResourcesManager');
53 53
 }
54 54
 
55 55
 $add_type = 'multiple';
56
-if (isset($_GET['add_type']) && $_GET['add_type']!='') {
56
+if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
57 57
 	$add_type = Security::remove_XSS($_REQUEST['add_type']);
58 58
 }
59 59
 
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 
64 64
 function search_users($needle, $type)
65 65
 {
66
-    global $tbl_access_url_rel_user,  $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
66
+    global $tbl_access_url_rel_user, $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
67 67
 
68 68
     $xajax_response = new xajaxResponse();
69 69
     $return = '';
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                     LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
102 102
                     WHERE
103 103
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
104
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
104
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
105 105
                         user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
106 106
                         $without_assigned_users AND
107 107
                         access_url_id = ".api_get_current_access_url_id()."
@@ -113,15 +113,15 @@  discard block
 block discarded – undo
113 113
                     FROM $tbl_user user
114 114
                     WHERE
115 115
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
116
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
116
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
117 117
                         user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
118 118
                     $without_assigned_users
119 119
                     $order_clause
120 120
             ";
121 121
         }
122 122
 
123
-		$rs	= Database::query($sql);
124
-		$xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
123
+		$rs = Database::query($sql);
124
+		$xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
125 125
 
126 126
         if ($type == 'single') {
127 127
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -140,10 +140,10 @@  discard block
 block discarded – undo
140 140
 
141 141
             switch ($userStatus) {
142 142
                 case DRH:
143
-                    $sql .= " user.status <> 6 AND user.status <> " . DRH;
143
+                    $sql .= " user.status <> 6 AND user.status <> ".DRH;
144 144
                     break;
145 145
                 case STUDENT_BOSS:
146
-                    $sql .= " user.status <> 6 AND user.status <> " . STUDENT_BOSS;
146
+                    $sql .= " user.status <> 6 AND user.status <> ".STUDENT_BOSS;
147 147
                     break;
148 148
             }
149 149
 
@@ -160,12 +160,12 @@  discard block
 block discarded – undo
160 160
                     $return .= '...<br />';
161 161
                 }
162 162
             }
163
-           $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
163
+           $xajax_response->addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
164 164
         } else {
165 165
             $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
166
-            while($user = Database :: fetch_array($rs)) {
166
+            while ($user = Database :: fetch_array($rs)) {
167 167
                 $person_name = api_get_person_name($user['firstname'], $user['lastname']);
168
-                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name,ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
168
+                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name, ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
169 169
             }
170 170
             $return .= '</select>';
171 171
             $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 }
243 243
 </script>';
244 244
 
245
-$formSent=0;
245
+$formSent = 0;
246 246
 $errorMsg = '';
247 247
 $UserList = array();
248 248
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 
258 258
 $searchForm = new FormValidator('search', 'get', api_get_self().'?user='.$user_id);
259 259
 $searchForm->addHeader(get_lang('AdvancedSearch'));
260
-$renderer =& $searchForm->defaultRenderer();
260
+$renderer = & $searchForm->defaultRenderer();
261 261
 
262 262
 $searchForm->addElement('hidden', 'user', $user_id);
263 263
 foreach ($filters as $param) {
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
             $affected_rows = 0;
300 300
     }
301 301
 
302
-    if ($affected_rows)	{
302
+    if ($affected_rows) {
303 303
         $msg = get_lang('AssignedUsersHaveBeenUpdatedSuccessfully');
304 304
     }
305 305
 }
@@ -311,17 +311,17 @@  discard block
 block discarded – undo
311 311
 
312 312
 if ($userStatus != STUDENT_BOSS) {
313 313
     $actionsLeft = Display::url(
314
-        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM ), "dashboard_add_courses_to_user.php?user=$user_id"
314
+        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM), "dashboard_add_courses_to_user.php?user=$user_id"
315 315
     );
316 316
 
317 317
     $actionsLeft .= Display::url(
318
-        Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM ) , "dashboard_add_sessions_to_user.php?user=$user_id"
318
+        Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM), "dashboard_add_sessions_to_user.php?user=$user_id"
319 319
     );
320 320
 }
321 321
 
322
-$actionsRight = Display::url('<em class="fa fa-search"></em> ' . get_lang('AdvancedSearch'), '#', array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search'));
322
+$actionsRight = Display::url('<em class="fa fa-search"></em> '.get_lang('AdvancedSearch'), '#', array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search'));
323 323
 
324
-$toolbar = Display::toolbarAction('toolbar-dashboard', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
324
+$toolbar = Display::toolbarAction('toolbar-dashboard', $content = array(0 => $actionsLeft, 1 => $actionsRight));
325 325
 echo $toolbar;
326 326
 
327 327
 echo '<div id="advanced_search_options" style="display:none">';
@@ -349,13 +349,13 @@  discard block
 block discarded – undo
349 349
 $assigned_users_id = array_keys($assigned_users_to_hrm);
350 350
 $without_assigned_users = '';
351 351
 if (count($assigned_users_id) > 0) {
352
-	$without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
352
+	$without_assigned_users = " user.user_id NOT IN(".implode(',', $assigned_users_id).") AND ";
353 353
 }
354 354
 
355 355
 $search_user = '';
356 356
 if (!empty($firstLetterUser)) {
357 357
 	$needle = Database::escape_string($firstLetterUser);
358
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
358
+	$search_user = "AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
359 359
 }
360 360
 
361 361
 $sqlConditions = null;
@@ -395,12 +395,12 @@  discard block
 block discarded – undo
395 395
 			    $sqlConditions
396 396
             ORDER BY firstname ";
397 397
 }
398
-$result	= Database::query($sql);
398
+$result = Database::query($sql);
399 399
 ?>
400
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
400
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
401 401
 <input type="hidden" name="formSent" value="1" />
402 402
 <?php
403
-if(!empty($msg)) {
403
+if (!empty($msg)) {
404 404
 	Display::display_normal_message($msg); //main API
405 405
 }
406 406
 ?>
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
                     <select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15">
416 416
                         <?php   while ($enreg = Database::fetch_array($result)) {
417 417
                                 $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']); ?>
418
-                                  <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"';?>>
418
+                                  <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
419 419
                             <?php echo $person_name.' ('.$enreg['username'].')'; ?>
420 420
                         </option>
421 421
                         <?php } ?>
@@ -428,8 +428,8 @@  discard block
 block discarded – undo
428 428
     </div>
429 429
     <div class="col-md-4">
430 430
         <div class="code-course">
431
-            <?php if($add_type == 'multiple') { ?>
432
-                <p><?php echo get_lang('FirstLetterUser');?></p>
431
+            <?php if ($add_type == 'multiple') { ?>
432
+                <p><?php echo get_lang('FirstLetterUser'); ?></p>
433 433
                 <select class="selectpicker show-tick form-control" name="firstLetterUser" onchange = "xajax_search_users(this.value,'multiple')">
434 434
                     <option value="%">--</option>
435 435
                     <?php echo Display::get_alphabet_options($firstLetterUser); ?>
@@ -481,10 +481,10 @@  discard block
 block discarded – undo
481 481
                 <select id='destination' class="form-control" name="UsersList[]" multiple="multiple" size="15" >
482 482
                     <?php
483 483
                     if (is_array($assigned_users_to_hrm)) {
484
-                            foreach($assigned_users_to_hrm as $enreg) {
484
+                            foreach ($assigned_users_to_hrm as $enreg) {
485 485
                                     $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']);
486 486
                     ?>
487
-                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"'; ?>>
487
+                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
488 488
                         <?php echo $person_name.' ('.$enreg['username'].')'; ?>
489 489
                     </option>
490 490
                     <?php }
Please login to merge, or discard this patch.