Completed
Push — 1.11.x ( 253320...1d91e0 )
by José
124:55 queued 86:48
created
main/admin/dashboard_add_users_to_user.php 2 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 $add_type = 'multiple';
56 56
 if (isset($_GET['add_type']) && $_GET['add_type']!='') {
57
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
57
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
58 58
 }
59 59
 
60 60
 if (!api_is_platform_admin()) {
@@ -120,8 +120,8 @@  discard block
 block discarded – undo
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);
@@ -160,7 +160,7 @@  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 166
             while($user = Database :: fetch_array($rs)) {
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
             $return .= '</select>';
171 171
             $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
172 172
         }
173
-	}
174
-	return $xajax_response;
173
+    }
174
+    return $xajax_response;
175 175
 }
176 176
 
177 177
 $xajax->processRequests();
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
 
285 285
 $msg = '';
286 286
 if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
287
-	$user_list = $_POST['UsersList'];
287
+    $user_list = $_POST['UsersList'];
288 288
 
289 289
     switch ($userStatus) {
290 290
         case DRH:
@@ -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
-	$needle = Database::escape_string($firstLetterUser);
358
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
357
+    $needle = Database::escape_string($firstLetterUser);
358
+    $search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
359 359
 }
360 360
 
361 361
 $sqlConditions = null;
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 }
376 376
 
377 377
 if (api_is_multiple_url_enabled()) {
378
-	$sql = "SELECT user.user_id, username, lastname, firstname
378
+    $sql = "SELECT user.user_id, username, lastname, firstname
379 379
 	        FROM $tbl_user user  LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
380 380
 			WHERE
381 381
                 $without_assigned_users
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
                 $sqlConditions
386 386
             ORDER BY firstname";
387 387
 } else {
388
-	$sql = "SELECT user_id, username, lastname, firstname
388
+    $sql = "SELECT user_id, username, lastname, firstname
389 389
 	        FROM $tbl_user user
390 390
 			WHERE
391 391
 			    $without_assigned_users
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 <input type="hidden" name="formSent" value="1" />
402 402
 <?php
403 403
 if(!empty($msg)) {
404
-	Display::display_normal_message($msg); //main API
404
+    Display::display_normal_message($msg); //main API
405 405
 }
406 406
 ?>
407 407
 
@@ -454,26 +454,26 @@  discard block
 block discarded – undo
454 454
             </div>
455 455
             
456 456
           <?php
457
-          }
458
-          ?>
457
+            }
458
+            ?>
459 459
             <div class="separate-action">
460 460
                 <?php
461
-		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
461
+        echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
462 462
             ?>
463 463
             </div>
464 464
         </div>
465 465
     </div>
466 466
     <div class="col-md-4">
467 467
         <?php
468
-	if (UserManager::is_admin($user_id)) {
469
-		echo get_lang('AssignedUsersListToPlatformAdministrator');
468
+    if (UserManager::is_admin($user_id)) {
469
+        echo get_lang('AssignedUsersListToPlatformAdministrator');
470 470
             } else if ($user_info['status'] == SESSIONADMIN) {
471 471
                     echo get_lang('AssignedUsersListToSessionsAdministrator');
472 472
             } else if ($user_info['status'] == STUDENT_BOSS) {
473 473
                     echo get_lang('AssignedUsersListToStudentBoss');
474 474
             } else {
475 475
                     echo get_lang('AssignedUsersListToHumanResourcesManager');
476
-	}
476
+    }
477 477
         ?>
478 478
         <div class="form-group">
479 479
             <div class="col-sm-12">
Please login to merge, or discard this patch.
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 // setting breadcrumbs
26 26
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
27
-$interbreadcrumb[] = array('url' => 'user_list.php','name' => get_lang('UserList'));
27
+$interbreadcrumb[] = array('url' => 'user_list.php', 'name' => get_lang('UserList'));
28 28
 
29 29
 // Database Table Definitions
30 30
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -44,17 +44,17 @@  discard block
 block discarded – undo
44 44
 $isAdmin = UserManager::is_admin($user_id);
45 45
 if ($isAdmin) {
46 46
     $userStatus = PLATFORM_ADMIN;
47
-    $tool_name= get_lang('AssignUsersToPlatformAdministrator');
47
+    $tool_name = get_lang('AssignUsersToPlatformAdministrator');
48 48
 } else if ($user_info['status'] == SESSIONADMIN) {
49
-    $tool_name= get_lang('AssignUsersToSessionsAdministrator');
50
-} else if  ($user_info['status'] == STUDENT_BOSS) {
51
-    $tool_name= get_lang('AssignUsersToBoss');
49
+    $tool_name = get_lang('AssignUsersToSessionsAdministrator');
50
+} else if ($user_info['status'] == STUDENT_BOSS) {
51
+    $tool_name = get_lang('AssignUsersToBoss');
52 52
 } else {
53
-    $tool_name= get_lang('AssignUsersToHumanResourcesManager');
53
+    $tool_name = get_lang('AssignUsersToHumanResourcesManager');
54 54
 }
55 55
 
56 56
 $add_type = 'multiple';
57
-if (isset($_GET['add_type']) && $_GET['add_type']!='') {
57
+if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
58 58
 	$add_type = Security::remove_XSS($_REQUEST['add_type']);
59 59
 }
60 60
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 function search_users($needle, $type)
66 66
 {
67
-    global $tbl_access_url_rel_user,  $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
67
+    global $tbl_access_url_rel_user, $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
68 68
 
69 69
     $xajax_response = new xajaxResponse();
70 70
     $return = '';
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
                     LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
103 103
                     WHERE
104 104
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
105
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
105
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
106 106
                         user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
107 107
                         $without_assigned_users AND
108 108
                         access_url_id = ".api_get_current_access_url_id()."
@@ -114,15 +114,15 @@  discard block
 block discarded – undo
114 114
                     FROM $tbl_user user
115 115
                     WHERE
116 116
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
117
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
117
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
118 118
                         user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
119 119
                     $without_assigned_users
120 120
                     $order_clause
121 121
             ";
122 122
         }
123 123
 
124
-		$rs	= Database::query($sql);
125
-		$xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
124
+		$rs = Database::query($sql);
125
+		$xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
126 126
 
127 127
         if ($type == 'single') {
128 128
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -141,10 +141,10 @@  discard block
 block discarded – undo
141 141
 
142 142
             switch ($userStatus) {
143 143
                 case DRH:
144
-                    $sql .= " user.status <> 6 AND user.status <> " . DRH;
144
+                    $sql .= " user.status <> 6 AND user.status <> ".DRH;
145 145
                     break;
146 146
                 case STUDENT_BOSS:
147
-                    $sql .= " user.status <> 6 AND user.status <> " . STUDENT_BOSS;
147
+                    $sql .= " user.status <> 6 AND user.status <> ".STUDENT_BOSS;
148 148
                     break;
149 149
             }
150 150
 
@@ -161,12 +161,12 @@  discard block
 block discarded – undo
161 161
                     $return .= '...<br />';
162 162
                 }
163 163
             }
164
-           $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
164
+           $xajax_response->addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
165 165
         } else {
166 166
             $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
167
-            while($user = Database :: fetch_array($rs)) {
167
+            while ($user = Database :: fetch_array($rs)) {
168 168
                 $person_name = api_get_person_name($user['firstname'], $user['lastname']);
169
-                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name,ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
169
+                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name, ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
170 170
             }
171 171
             $return .= '</select>';
172 172
             $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 }
244 244
 </script>';
245 245
 
246
-$formSent=0;
246
+$formSent = 0;
247 247
 $errorMsg = '';
248 248
 $UserList = array();
249 249
 
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 
259 259
 $searchForm = new FormValidator('search', 'get', api_get_self().'?user='.$user_id);
260 260
 $searchForm->addHeader(get_lang('AdvancedSearch'));
261
-$renderer =& $searchForm->defaultRenderer();
261
+$renderer = & $searchForm->defaultRenderer();
262 262
 
263 263
 $searchForm->addElement('hidden', 'user', $user_id);
264 264
 foreach ($filters as $param) {
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
             $affected_rows = 0;
301 301
     }
302 302
 
303
-    if ($affected_rows)	{
303
+    if ($affected_rows) {
304 304
         $msg = get_lang('AssignedUsersHaveBeenUpdatedSuccessfully');
305 305
     }
306 306
 }
@@ -312,18 +312,18 @@  discard block
 block discarded – undo
312 312
 $actionsLeft = '';
313 313
 if ($userStatus != STUDENT_BOSS) {
314 314
     $actionsLeft = Display::url(
315
-        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM ),
315
+        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM),
316 316
         "dashboard_add_courses_to_user.php?user=$user_id"
317 317
     );
318 318
 
319 319
     $actionsLeft .= Display::url(
320
-        Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM ) ,
320
+        Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM),
321 321
         "dashboard_add_sessions_to_user.php?user=$user_id"
322 322
     );
323 323
 }
324 324
 
325 325
 $actionsRight = Display::url(
326
-    '<em class="fa fa-search"></em> ' . get_lang('AdvancedSearch'),
326
+    '<em class="fa fa-search"></em> '.get_lang('AdvancedSearch'),
327 327
     '#',
328 328
     array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search')
329 329
 );
@@ -360,13 +360,13 @@  discard block
 block discarded – undo
360 360
 $assigned_users_id = array_keys($assigned_users_to_hrm);
361 361
 $without_assigned_users = '';
362 362
 if (count($assigned_users_id) > 0) {
363
-	$without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
363
+	$without_assigned_users = " user.user_id NOT IN(".implode(',', $assigned_users_id).") AND ";
364 364
 }
365 365
 
366 366
 $search_user = '';
367 367
 if (!empty($firstLetterUser)) {
368 368
 	$needle = Database::escape_string($firstLetterUser);
369
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
369
+	$search_user = "AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
370 370
 }
371 371
 
372 372
 $sqlConditions = null;
@@ -406,12 +406,12 @@  discard block
 block discarded – undo
406 406
 			    $sqlConditions
407 407
             ORDER BY firstname ";
408 408
 }
409
-$result	= Database::query($sql);
409
+$result = Database::query($sql);
410 410
 ?>
411
-<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();"';}?>>
411
+<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();"'; }?>>
412 412
 <input type="hidden" name="formSent" value="1" />
413 413
 <?php
414
-if(!empty($msg)) {
414
+if (!empty($msg)) {
415 415
 	Display::display_normal_message($msg); //main API
416 416
 }
417 417
 ?>
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
                     <select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15">
427 427
                         <?php   while ($enreg = Database::fetch_array($result)) {
428 428
                                 $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']); ?>
429
-                                  <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"';?>>
429
+                                  <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
430 430
                             <?php echo $person_name.' ('.$enreg['username'].')'; ?>
431 431
                         </option>
432 432
                         <?php } ?>
@@ -439,8 +439,8 @@  discard block
 block discarded – undo
439 439
     </div>
440 440
     <div class="col-md-4">
441 441
         <div class="code-course">
442
-            <?php if($add_type == 'multiple') { ?>
443
-                <p><?php echo get_lang('FirstLetterUser');?></p>
442
+            <?php if ($add_type == 'multiple') { ?>
443
+                <p><?php echo get_lang('FirstLetterUser'); ?></p>
444 444
                 <select class="selectpicker show-tick form-control" name="firstLetterUser" onchange = "xajax_search_users(this.value,'multiple')">
445 445
                     <option value="%">--</option>
446 446
                     <?php echo Display::get_alphabet_options($firstLetterUser); ?>
@@ -492,10 +492,10 @@  discard block
 block discarded – undo
492 492
                 <select id='destination' class="form-control" name="UsersList[]" multiple="multiple" size="15" >
493 493
                     <?php
494 494
                     if (is_array($assigned_users_to_hrm)) {
495
-                            foreach($assigned_users_to_hrm as $enreg) {
495
+                            foreach ($assigned_users_to_hrm as $enreg) {
496 496
                                     $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']);
497 497
                     ?>
498
-                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"'; ?>>
498
+                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
499 499
                         <?php echo $person_name.' ('.$enreg['username'].')'; ?>
500 500
                     </option>
501 501
                     <?php }
Please login to merge, or discard this patch.
main/admin/class_list.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,10 +35,10 @@  discard block
 block discarded – undo
35 35
 function get_class_data($from, $number_of_items, $column, $direction = 'ASC') {
36 36
     $tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
37 37
     $tbl_class = Database :: get_main_table(TABLE_MAIN_CLASS);
38
-    $from 				= intval($from);
39
-    $number_of_items 	= intval($number_of_items);
38
+    $from = intval($from);
39
+    $number_of_items = intval($number_of_items);
40 40
     $column 			= intval($column);
41
-    $direction 			= ($direction == 'ASC'?'ASC':'DESC');
41
+    $direction = ($direction == 'ASC' ? 'ASC' : 'DESC');
42 42
 
43 43
     $sql = "SELECT 	id AS col0, name AS col1, COUNT(user_id) AS col2, id AS col3
44 44
         FROM $tbl_class
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     }
49 49
     $sql .= " GROUP BY id,name ORDER BY col$column $direction LIMIT $from,$number_of_items";
50 50
     $res = Database::query($sql);
51
-    $classes = array ();
51
+    $classes = array();
52 52
     while ($class = Database::fetch_row($res)) {
53 53
         $classes[] = $class;
54 54
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 }
69 69
 
70 70
 $tool_name = get_lang('ClassList');
71
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
71
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
72 72
 
73 73
 if (isset($_POST['action'])) {
74 74
     switch ($_POST['action']) {
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
 // Create a search-box
101 101
 $form = new FormValidator('search_simple', 'get', '', '', null, false);
102
-$renderer =& $form->defaultRenderer();
102
+$renderer = & $form->defaultRenderer();
103 103
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
104 104
 $form->addElement('text', 'keyword', get_lang('Keyword'));
105 105
 $form->addElement('button', 'submit', get_lang('Search'));
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 $table->set_header(2, get_lang('NumberOfUsers'));
114 114
 $table->set_header(3, '', false);
115 115
 $table->set_column_filter(3, 'modify_filter');
116
-$table->set_form_actions(array ('delete_classes' => get_lang('DeleteSelectedClasses')), 'class');
116
+$table->set_form_actions(array('delete_classes' => get_lang('DeleteSelectedClasses')), 'class');
117 117
 
118 118
 $content .= $table->return_table();
119 119
 
Please login to merge, or discard this patch.
main/admin/class_information.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
     api_not_allowed();
19 19
 }
20 20
 
21
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
22
-$interbreadcrumb[] = array ('url' => 'class_list.php', 'name' => get_lang('AdminClasses'));
21
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
22
+$interbreadcrumb[] = array('url' => 'class_list.php', 'name' => get_lang('AdminClasses'));
23 23
 
24 24
 $class_id = $_GET['id'];
25 25
 $class = ClassManager::get_class_info($class_id);
@@ -35,21 +35,21 @@  discard block
 block discarded – undo
35 35
 $users = ClassManager::get_users($class_id);
36 36
 if (count($users) > 0) {
37 37
     $is_western_name_order = api_is_western_name_order();
38
-    $table_header[] = array (get_lang('OfficialCode'), true);
38
+    $table_header[] = array(get_lang('OfficialCode'), true);
39 39
     if ($is_western_name_order) {
40
-        $table_header[] = array (get_lang('FirstName'), true);
41
-        $table_header[] = array (get_lang('LastName'), true);
40
+        $table_header[] = array(get_lang('FirstName'), true);
41
+        $table_header[] = array(get_lang('LastName'), true);
42 42
     } else {
43
-        $table_header[] = array (get_lang('LastName'), true);
44
-        $table_header[] = array (get_lang('FirstName'), true);
43
+        $table_header[] = array(get_lang('LastName'), true);
44
+        $table_header[] = array(get_lang('FirstName'), true);
45 45
     }
46
-    $table_header[] = array (get_lang('Email'), true);
47
-    $table_header[] = array (get_lang('Status'), true);
48
-    $table_header[] = array ('', false);
46
+    $table_header[] = array(get_lang('Email'), true);
47
+    $table_header[] = array(get_lang('Status'), true);
48
+    $table_header[] = array('', false);
49 49
     $data = array();
50
-    foreach($users as $index => $user) {
50
+    foreach ($users as $index => $user) {
51 51
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $user['username']), ENT_QUOTES);
52
-        $row = array ();
52
+        $row = array();
53 53
         $row[] = $user['official_code'];
54 54
         if ($is_western_name_order) {
55 55
             $row[] = $user['firstname'];
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
         $row[] = '<a href="user_information.php?user_id='.$user['user_id'].'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>';
64 64
         $data[] = $row;
65 65
     }
66
-    Display::display_sortable_table($table_header,$data,array(),array(),array('id'=>$_GET['id']));
66
+    Display::display_sortable_table($table_header, $data, array(), array(), array('id'=>$_GET['id']));
67 67
 } else {
68 68
     echo get_lang('NoUsersInClass');
69 69
 }
@@ -73,22 +73,22 @@  discard block
 block discarded – undo
73 73
  */
74 74
 $courses = ClassManager::get_courses($class_id);
75 75
 if (count($courses) > 0) {
76
-    $header[] = array (get_lang('Code'), true);
77
-    $header[] = array (get_lang('Title'), true);
78
-    $header[] = array ('', false);
79
-    $data = array ();
80
-    foreach( $courses as $index => $course) {
81
-        $row = array ();
76
+    $header[] = array(get_lang('Code'), true);
77
+    $header[] = array(get_lang('Title'), true);
78
+    $header[] = array('', false);
79
+    $data = array();
80
+    foreach ($courses as $index => $course) {
81
+        $row = array();
82 82
         $row[] = $course['visual_code'];
83 83
         $row[] = $course['title'];
84 84
         $row[] = '<a href="course_information.php?code='.$course['code'].'">'.Display::return_icon('info_small.gif', get_lang('Delete')).'</a>'.
85
-                    '<a href="'.api_get_path(WEB_COURSE_PATH).$course['directory'].'">'.Display::return_icon('course_home.gif', get_lang('CourseHome')).'</a>' .
85
+                    '<a href="'.api_get_path(WEB_COURSE_PATH).$course['directory'].'">'.Display::return_icon('course_home.gif', get_lang('CourseHome')).'</a>'.
86 86
                     '<a href="course_edit.php?course_code='.$course['code'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
87 87
         $data[] = $row;
88 88
     }
89 89
     echo '<p><b>'.get_lang('Courses').'</b></p>';
90 90
     echo '<blockquote>';
91
-    Display :: display_sortable_table($header, $data, array (), array (), array('id'=>$_GET['id']));
91
+    Display :: display_sortable_table($header, $data, array(), array(), array('id'=>$_GET['id']));
92 92
     echo '</blockquote>';
93 93
 } else {
94 94
     echo '<p>'.get_lang('NoCoursesForThisClass').'</p>';
Please login to merge, or discard this patch.
main/admin/sub_language.php 3 patches
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -200,8 +200,9 @@
 block discarded – undo
200 200
 					continue;
201 201
 				}
202 202
 
203
-				if (is_array($variable_value))
204
-					echo $lang_file;
203
+				if (is_array($variable_value)) {
204
+									echo $lang_file;
205
+				}
205 206
 				$founded = false;
206 207
 				if ($search_in_english && $search_in_variable) {
207 208
 					// searching the item in the parent tool
Please login to merge, or discard this patch.
Indentation   +167 added lines, -167 removed lines patch added patch discarded remove patch
@@ -66,30 +66,30 @@  discard block
 block discarded – undo
66 66
 $sublanguage_folder_error = false;
67 67
 
68 68
 if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
69
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
70
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
71
-	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
72
-	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
73
-	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
69
+    $language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
70
+    $sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
71
+    $all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
72
+    $all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
73
+    $sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
74 74
 
75
-	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
76
-		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
77
-	}
78
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
79
-		$language_id_exist = true;
80
-	} else {
81
-		$language_id_exist = false;
82
-	}
75
+    if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
76
+        $sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
77
+    }
78
+    if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
79
+        $language_id_exist = true;
80
+    } else {
81
+        $language_id_exist = false;
82
+    }
83 83
 } else {
84
-	$language_name='';
85
-	$language_id_exist=false;
84
+    $language_name='';
85
+    $language_id_exist=false;
86 86
 }
87 87
 
88 88
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
89 89
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
90 90
 
91 91
 if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
92
-	api_not_allowed(true);
92
+    api_not_allowed(true);
93 93
 }
94 94
 
95 95
 Display :: display_header($language_name);
@@ -101,10 +101,10 @@  discard block
 block discarded – undo
101 101
 echo '</div>';
102 102
 
103 103
 if (!empty($_SESSION['msg'])) {
104
-	echo $_SESSION['msg'];
105
-	unset($_SESSION['msg']);
104
+    echo $_SESSION['msg'];
105
+    unset($_SESSION['msg']);
106 106
 } else {
107
-	echo '<br />';
107
+    echo '<br />';
108 108
 }
109 109
 
110 110
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 echo $html;
123 123
 echo '<br /><br /><br />';
124 124
 if (!empty($sublanguage_folder_error)) {
125
-	Display::display_warning_message($sublanguage_folder_error);
125
+    Display::display_warning_message($sublanguage_folder_error);
126 126
 }
127 127
 echo '<div id="div_message_information_id">&nbsp;</div>';
128 128
 
@@ -136,186 +136,186 @@  discard block
 block discarded – undo
136 136
  * @return array
137 137
  */
138 138
 function search_language_term(
139
-	$term,
140
-	$search_in_variable = true,
141
-	$search_in_english = true,
142
-	$search_in_parent = true,
143
-	$search_in_sub_language = true
139
+    $term,
140
+    $search_in_variable = true,
141
+    $search_in_english = true,
142
+    $search_in_parent = true,
143
+    $search_in_sub_language = true
144 144
 ) {
145
-	//These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
146
-	/*
145
+    //These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
146
+    /*
147 147
 		These 4 arrays are set in global.inc.php with the condition that will be load from sub_language.php or sub_language_ajax.inc.php
148 148
 		$english_language_array
149 149
 		$parent_language_array
150 150
 		$sub_language_array
151 151
 		$language_files_to_load
152 152
 	*/
153
-	global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
154
-	$language_files_to_load_keys = array_flip($language_files_to_load);
155
-	$array_to_search = $parent_language_array;
156
-	$list_info = array();
157
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
158
-	//@todo optimize this foreach
159
-	foreach ($language_files_to_load as $lang_file) {
160
-		//searching in parent language of the sub language
161
-		if ($search_in_parent) {
162
-			$variables = $parent_language_array[$lang_file];
163
-			foreach ($variables as $parent_name_variable =>$parent_variable_value) {
164
-				//arrays are avoided
165
-				if (is_array($parent_variable_value)) {
166
-					continue;
167
-				}
168
-				$founded = false;
169
-				// searching the item in the parent tool
170
-				if (preg_match($term,$parent_variable_value)!==0) {
171
-					$founded = true;
172
-				}
173
-				if ($founded) {
174
-					//loading variable from the english array
175
-					$sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
176
-					//loading variable from the english array
177
-					$english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
153
+    global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
154
+    $language_files_to_load_keys = array_flip($language_files_to_load);
155
+    $array_to_search = $parent_language_array;
156
+    $list_info = array();
157
+    $term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
158
+    //@todo optimize this foreach
159
+    foreach ($language_files_to_load as $lang_file) {
160
+        //searching in parent language of the sub language
161
+        if ($search_in_parent) {
162
+            $variables = $parent_language_array[$lang_file];
163
+            foreach ($variables as $parent_name_variable =>$parent_variable_value) {
164
+                //arrays are avoided
165
+                if (is_array($parent_variable_value)) {
166
+                    continue;
167
+                }
168
+                $founded = false;
169
+                // searching the item in the parent tool
170
+                if (preg_match($term,$parent_variable_value)!==0) {
171
+                    $founded = true;
172
+                }
173
+                if ($founded) {
174
+                    //loading variable from the english array
175
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
176
+                    //loading variable from the english array
177
+                    $english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
178 178
 
179
-					//config buttons
180
-					/*if (strlen($english_name_variable)>1500) {
179
+                    //config buttons
180
+                    /*if (strlen($english_name_variable)>1500) {
181 181
 						$size =20;
182 182
 					} else {
183 183
 						$size =4;
184 184
 					}*/
185 185
 
186
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
187
-					$obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
186
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
187
+                    $obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
188 188
 
189
-					$list_info[] = array(
190
-						$lang_file . '.inc.php',
191
-						$parent_name_variable,
192
-						$english_name_variable,
193
-						$parent_variable_value,
194
-						$obj_text,
195
-						$obj_button
196
-					);
197
-				}
198
-			}
199
-		}
189
+                    $list_info[] = array(
190
+                        $lang_file . '.inc.php',
191
+                        $parent_name_variable,
192
+                        $english_name_variable,
193
+                        $parent_variable_value,
194
+                        $obj_text,
195
+                        $obj_button
196
+                    );
197
+                }
198
+            }
199
+        }
200 200
 
201
-		//search in english
202
-		if ($search_in_english || $search_in_variable) {
203
-			$variables = $english_language_array[$lang_file];
204
-			foreach ($variables as $name_variable =>$variable_value) {
205
-				if (is_array($variable_value)) {
206
-					continue;
207
-				}
201
+        //search in english
202
+        if ($search_in_english || $search_in_variable) {
203
+            $variables = $english_language_array[$lang_file];
204
+            foreach ($variables as $name_variable =>$variable_value) {
205
+                if (is_array($variable_value)) {
206
+                    continue;
207
+                }
208 208
 
209
-				if (is_array($variable_value))
210
-					echo $lang_file;
211
-				$founded = false;
212
-				if ($search_in_english && $search_in_variable) {
213
-					// searching the item in the parent tool
214
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
215
-						$founded = true;
216
-					}
217
-				} else {
218
-					if ($search_in_english) {
219
-						if (preg_match($term,$variable_value)!==0) {
220
-							$founded = true;
221
-						}
222
-					} else {
223
-						if (preg_match($term,$name_variable)!==0) {
224
-							$founded = true;
225
-						}
226
-					}
227
-				}
209
+                if (is_array($variable_value))
210
+                    echo $lang_file;
211
+                $founded = false;
212
+                if ($search_in_english && $search_in_variable) {
213
+                    // searching the item in the parent tool
214
+                    if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
215
+                        $founded = true;
216
+                    }
217
+                } else {
218
+                    if ($search_in_english) {
219
+                        if (preg_match($term,$variable_value)!==0) {
220
+                            $founded = true;
221
+                        }
222
+                    } else {
223
+                        if (preg_match($term,$name_variable)!==0) {
224
+                            $founded = true;
225
+                        }
226
+                    }
227
+                }
228 228
 
229
-				if ($founded) {
230
-					//loading variable from the english array
231
-					$sub_language_name_variable = null;
232
-					if (isset($sub_language_array[$lang_file][$name_variable])) {
233
-						$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
234
-					}
235
-					$parent_variable_value = null;
236
-					if (isset($parent_language_array[$lang_file][$name_variable])) {
237
-						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
238
-					}
239
-					//config buttons
240
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
241
-						$sub_language_name_variable.'
229
+                if ($founded) {
230
+                    //loading variable from the english array
231
+                    $sub_language_name_variable = null;
232
+                    if (isset($sub_language_array[$lang_file][$name_variable])) {
233
+                        $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
234
+                    }
235
+                    $parent_variable_value = null;
236
+                    if (isset($parent_language_array[$lang_file][$name_variable])) {
237
+                        $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
238
+                    }
239
+                    //config buttons
240
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
241
+                        $sub_language_name_variable.'
242 242
 						</textarea>';
243
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
243
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
244 244
 
245
-					//loading variable from the english array
246
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
245
+                    //loading variable from the english array
246
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
247 247
 
248
-					$list_info[] = array(
249
-						$lang_file . '.inc.php',
250
-						$name_variable,
251
-						$english_name_variable,
252
-						$parent_variable_value,
253
-						$obj_text,
254
-						$obj_button
255
-					);
256
-				}
257
-			}
258
-		}
248
+                    $list_info[] = array(
249
+                        $lang_file . '.inc.php',
250
+                        $name_variable,
251
+                        $english_name_variable,
252
+                        $parent_variable_value,
253
+                        $obj_text,
254
+                        $obj_button
255
+                    );
256
+                }
257
+            }
258
+        }
259 259
 
260
-		// Search in sub language
261
-		if ($search_in_sub_language) {
262
-			$variables = $sub_language_array[$lang_file];
263
-			foreach ($variables as $name_variable =>$variable_value) {
264
-				if (is_array($parent_variable_value)) {
265
-					continue;
266
-				}
260
+        // Search in sub language
261
+        if ($search_in_sub_language) {
262
+            $variables = $sub_language_array[$lang_file];
263
+            foreach ($variables as $name_variable =>$variable_value) {
264
+                if (is_array($parent_variable_value)) {
265
+                    continue;
266
+                }
267 267
 
268
-				if (is_array($variable_value)) {
269
-					continue;
270
-				}
268
+                if (is_array($variable_value)) {
269
+                    continue;
270
+                }
271 271
 
272
-				$founded = false;
273
-				// searching the item in the parent tool
274
-				if (preg_match($term,$variable_value)!==0) {
275
-					$founded = true;
276
-				}
277
-				if ($founded) {
278
-					//loading variable from the english array
279
-					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
280
-					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
281
-					//config buttons
282
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
283
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
272
+                $founded = false;
273
+                // searching the item in the parent tool
274
+                if (preg_match($term,$variable_value)!==0) {
275
+                    $founded = true;
276
+                }
277
+                if ($founded) {
278
+                    //loading variable from the english array
279
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
280
+                    $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
281
+                    //config buttons
282
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
283
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
284 284
 
285
-					//loading variable from the english array
286
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
287
-					$list_info[]=array($lang_file.'.inc.php',
288
-						$name_variable,
289
-						$english_name_variable,
290
-						$parent_variable_value,$obj_text,$obj_button);
291
-				}
292
-			}
293
-		}
294
-	}
285
+                    //loading variable from the english array
286
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
287
+                    $list_info[]=array($lang_file.'.inc.php',
288
+                        $name_variable,
289
+                        $english_name_variable,
290
+                        $parent_variable_value,$obj_text,$obj_button);
291
+                }
292
+            }
293
+        }
294
+    }
295 295
 
296
-	$list_info = array_unique_dimensional($list_info);
297
-	return $list_info;
296
+    $list_info = array_unique_dimensional($list_info);
297
+    return $list_info;
298 298
 }
299 299
 
300 300
 // Allow see data in sort table
301 301
 $list_info = array();
302 302
 if (isset($_REQUEST['txt_search_word'])) {
303
-	//@todo fix to accept a char with 1 char
304
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
305
-		$list_info = search_language_term(
306
-			$_REQUEST['txt_search_word'],
307
-			true,
308
-			true,
309
-			true,
310
-			true
311
-		);
312
-	}
303
+    //@todo fix to accept a char with 1 char
304
+    if (strlen(trim($_REQUEST['txt_search_word']))>2) {
305
+        $list_info = search_language_term(
306
+            $_REQUEST['txt_search_word'],
307
+            true,
308
+            true,
309
+            true,
310
+            true
311
+        );
312
+    }
313 313
 }
314 314
 
315 315
 $parameters = array(
316
-	'id' => intval($_GET['id']),
317
-	'sub_language_id' => intval($_GET['sub_language_id']),
318
-	'txt_search_word' => $txt_search_word
316
+    'id' => intval($_GET['id']),
317
+    'sub_language_id' => intval($_GET['sub_language_id']),
318
+    'txt_search_word' => $txt_search_word
319 319
 );
320 320
 $table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
321 321
 $table->set_additional_parameters($parameters);
Please login to merge, or discard this patch.
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 $this_section = SECTION_PLATFORM_ADMIN;
12 12
 
13 13
 api_protect_admin_script();
14
-$htmlHeadXtra[] ='<script type="text/javascript">
14
+$htmlHeadXtra[] = '<script type="text/javascript">
15 15
  $(document).ready(function() {
16 16
 	$(".save").click(function() {
17 17
 		var button_name=$(this).attr("name");
@@ -36,20 +36,20 @@  discard block
 block discarded – undo
36 36
 				    \'new_language\': is_new_language,
37 37
 				    \'variable_language\': is_variable_language,
38 38
 				    \'file_id\': file_id,
39
-				    \'id\': ' . intval($_REQUEST['id']) . ',
40
-                    \'sub\': ' . intval($_REQUEST['sub_language_id']) . ',
41
-                    \'sub_language_id\': ' . intval($_REQUEST['sub_language_id']) . '
39
+				    \'id\': ' . intval($_REQUEST['id']).',
40
+                    \'sub\': ' . intval($_REQUEST['sub_language_id']).',
41
+                    \'sub_language_id\': ' . intval($_REQUEST['sub_language_id']).'
42 42
 				},
43 43
 				success: function(datos) {
44 44
 					if (datos == "1") {
45
-						$("#div_message_information_id").html(\'' . Display::return_message(get_lang('TheNewWordHasBeenAdded'), 'success') . '\');
45
+						$("#div_message_information_id").html(\'' . Display::return_message(get_lang('TheNewWordHasBeenAdded'), 'success').'\');
46 46
 					} else {
47 47
 						$("#div_message_information_id").html("<div class=\"alert alert-warning\">" + datos +"</div>");
48 48
 					}
49 49
 				}
50 50
 			});
51 51
 		} else {
52
-			$("#div_message_information_id").html(\'' . Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error') . '\');
52
+			$("#div_message_information_id").html(\'' . Display::return_message(get_lang('FormHasErrorsPleaseComplete'), 'error').'\');
53 53
 		}
54 54
 	});
55 55
 });
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
60 60
 // setting the name of the tool
61 61
 $tool_name = get_lang('CreateSubLanguage');
62 62
 // setting breadcrumbs
63
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
64
-$interbreadcrumb[] = array ('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
63
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
64
+$interbreadcrumb[] = array('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
65 65
 
66 66
 $sublanguage_folder_error = false;
67 67
 
68
-if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
69
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
70
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
68
+if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) {
69
+	$language_name              = SubLanguageManager::get_name_of_language_by_id($_GET['id']);
70
+	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id($_GET['sub_language_id']);
71 71
 	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
72 72
 	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
73 73
 	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
@@ -75,20 +75,20 @@  discard block
 block discarded – undo
75 75
 	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
76 76
 		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
77 77
 	}
78
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
78
+	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id']) === true) {
79 79
 		$language_id_exist = true;
80 80
 	} else {
81 81
 		$language_id_exist = false;
82 82
 	}
83 83
 } else {
84
-	$language_name='';
85
-	$language_id_exist=false;
84
+	$language_name = '';
85
+	$language_id_exist = false;
86 86
 }
87 87
 
88 88
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
89 89
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
90 90
 
91
-if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
91
+if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder']) == 0) {
92 92
 	api_not_allowed(true);
93 93
 }
94 94
 
@@ -109,16 +109,16 @@  discard block
 block discarded – undo
109 109
 
110 110
 
111 111
 $txt_search_word = (!empty($_REQUEST['txt_search_word']) ? Security::remove_XSS($_REQUEST['txt_search_word']) : '');
112
-$html ='<div style="float:left" class="actions">';
113
-$html.='<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
114
-$html.='&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
112
+$html = '<div style="float:left" class="actions">';
113
+$html .= '<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
114
+$html .= '&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
115 115
 
116
-$html.='<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
117
-$html.='<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
118
-$html.='<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
119
-$html.="&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
120
-$html.='</form>';
121
-$html.='</div>';
116
+$html .= '<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
117
+$html .= '<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
118
+$html .= '<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
119
+$html .= "&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
120
+$html .= '</form>';
121
+$html .= '</div>';
122 122
 echo $html;
123 123
 echo '<br /><br /><br />';
124 124
 if (!empty($sublanguage_folder_error)) {
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	$language_files_to_load_keys = array_flip($language_files_to_load);
155 155
 	$array_to_search = $parent_language_array;
156 156
 	$list_info = array();
157
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
157
+	$term = '/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
158 158
 	//@todo optimize this foreach
159 159
 	foreach ($language_files_to_load as $lang_file) {
160 160
 		//searching in parent language of the sub language
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 				}
168 168
 				$founded = false;
169 169
 				// searching the item in the parent tool
170
-				if (preg_match($term,$parent_variable_value)!==0) {
170
+				if (preg_match($term, $parent_variable_value) !== 0) {
171 171
 					$founded = true;
172 172
 				}
173 173
 				if ($founded) {
@@ -183,11 +183,11 @@  discard block
 block discarded – undo
183 183
 						$size =4;
184 184
 					}*/
185 185
 
186
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
187
-					$obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
186
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
187
+					$obj_button = '<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
188 188
 
189 189
 					$list_info[] = array(
190
-						$lang_file . '.inc.php',
190
+						$lang_file.'.inc.php',
191 191
 						$parent_name_variable,
192 192
 						$english_name_variable,
193 193
 						$parent_variable_value,
@@ -211,16 +211,16 @@  discard block
 block discarded – undo
211 211
 				$founded = false;
212 212
 				if ($search_in_english && $search_in_variable) {
213 213
 					// searching the item in the parent tool
214
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
214
+					if (preg_match($term, $variable_value) !== 0 || preg_match($term, $name_variable) !== 0) {
215 215
 						$founded = true;
216 216
 					}
217 217
 				} else {
218 218
 					if ($search_in_english) {
219
-						if (preg_match($term,$variable_value)!==0) {
219
+						if (preg_match($term, $variable_value) !== 0) {
220 220
 							$founded = true;
221 221
 						}
222 222
 					} else {
223
-						if (preg_match($term,$name_variable)!==0) {
223
+						if (preg_match($term, $name_variable) !== 0) {
224 224
 							$founded = true;
225 225
 						}
226 226
 					}
@@ -237,16 +237,16 @@  discard block
 block discarded – undo
237 237
 						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
238 238
 					}
239 239
 					//config buttons
240
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
240
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
241 241
 						$sub_language_name_variable.'
242 242
 						</textarea>';
243
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
243
+					$obj_button = '<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
244 244
 
245 245
 					//loading variable from the english array
246 246
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
247 247
 
248 248
 					$list_info[] = array(
249
-						$lang_file . '.inc.php',
249
+						$lang_file.'.inc.php',
250 250
 						$name_variable,
251 251
 						$english_name_variable,
252 252
 						$parent_variable_value,
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 
272 272
 				$founded = false;
273 273
 				// searching the item in the parent tool
274
-				if (preg_match($term,$variable_value)!==0) {
274
+				if (preg_match($term, $variable_value) !== 0) {
275 275
 					$founded = true;
276 276
 				}
277 277
 				if ($founded) {
@@ -279,15 +279,15 @@  discard block
 block discarded – undo
279 279
 					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
280 280
 					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
281 281
 					//config buttons
282
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
283
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
282
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
283
+					$obj_button = '<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
284 284
 
285 285
 					//loading variable from the english array
286 286
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
287
-					$list_info[]=array($lang_file.'.inc.php',
287
+					$list_info[] = array($lang_file.'.inc.php',
288 288
 						$name_variable,
289 289
 						$english_name_variable,
290
-						$parent_variable_value,$obj_text,$obj_button);
290
+						$parent_variable_value, $obj_text, $obj_button);
291 291
 				}
292 292
 			}
293 293
 		}
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 $list_info = array();
302 302
 if (isset($_REQUEST['txt_search_word'])) {
303 303
 	//@todo fix to accept a char with 1 char
304
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
304
+	if (strlen(trim($_REQUEST['txt_search_word'])) > 2) {
305 305
 		$list_info = search_language_term(
306 306
 			$_REQUEST['txt_search_word'],
307 307
 			true,
@@ -317,14 +317,14 @@  discard block
 block discarded – undo
317 317
 	'sub_language_id' => intval($_GET['sub_language_id']),
318 318
 	'txt_search_word' => $txt_search_word
319 319
 );
320
-$table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
320
+$table = new SortableTableFromArrayConfig($list_info, 1, 20, 'data_info');
321 321
 $table->set_additional_parameters($parameters);
322 322
 $table->set_header(0, get_lang('LanguageFile'));
323 323
 $table->set_header(1, get_lang('LanguageVariable'));
324 324
 $table->set_header(2, get_lang('EnglishName'));
325 325
 $table->set_header(3, get_lang('OriginalName'));
326
-$table->set_header(4, get_lang('Translation'),false);
327
-$table->set_header(5, get_lang('Action'),false);
326
+$table->set_header(4, get_lang('Translation'), false);
327
+$table->set_header(5, get_lang('Action'), false);
328 328
 $table->display();
329 329
 
330 330
 Display :: display_footer();
Please login to merge, or discard this patch.
main/admin/extra_fields.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 $obj->setupBreadcrumb($interbreadcrumb, $action);
37 37
 
38 38
 //jqgrid will use this URL to do the selects
39
-$url = api_get_path(WEB_AJAX_PATH) . 'model.ajax.php?a=get_extra_fields&type=' . $extraFieldType;
39
+$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_extra_fields&type='.$extraFieldType;
40 40
 
41 41
 //The order is important you need to check the the $column variable in the model.ajax.php file
42 42
 $columns = $obj->getJqgridColumnNames();
@@ -64,43 +64,43 @@  discard block
 block discarded – undo
64 64
         array(),
65 65
         $action_links,
66 66
         true
67
-    ). '
67
+    ).'
68 68
 
69 69
     $("#field_type").on("change", function() {
70 70
         id = $(this).val();
71 71
         switch(id) {
72 72
             case "1":
73
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')) . '");
73
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')).'");
74 74
                 break;
75 75
             case "2":
76
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')) . '");
76
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')).'");
77 77
                 break;
78 78
             case "3":
79
-                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')) . '");
79
+                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')).'");
80 80
                 break;
81 81
             case "4":
82
-                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')) . '");
82
+                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')).'");
83 83
                 break;
84 84
             case "5":
85
-                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')) . '");
85
+                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')).'");
86 86
                 break;
87 87
             case "6":
88
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
88
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
89 89
                 break;
90 90
             case "7":
91
-                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')) . '");
91
+                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')).'");
92 92
                 break;
93 93
             case "8":
94
-                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')) . '");
94
+                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')).'");
95 95
                 break;
96 96
             case "9":
97
-                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')) . '");
97
+                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')).'");
98 98
                 break;
99 99
             case "10":
100
-                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')) . '");
100
+                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')).'");
101 101
                 break;
102 102
             case "11":
103
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
103
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
104 104
                 break;
105 105
         }
106 106
     });
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
         ) {
120 120
             api_not_allowed();
121 121
         }
122
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']);
122
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']);
123 123
         $form = $obj->return_form($url, 'add');
124 124
 
125 125
         // The validation or display
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
             $obj->display();
136 136
         } else {
137 137
             echo '<div class="actions">';
138
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
139
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
138
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
139
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
140 140
             echo '</div>';
141 141
             $form->addElement('hidden', 'sec_token');
142 142
             $form->setConstants(array('sec_token' => $token));
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         break;
146 146
     case 'edit':
147 147
         // Action handling: Editing
148
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']) . '&id=' . intval($_GET['id']);
148
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']).'&id='.intval($_GET['id']);
149 149
         $form = $obj->return_form($url, 'edit');
150 150
 
151 151
         // The validation or display
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
159 159
             $obj->display();
160 160
         } else {
161 161
             echo '<div class="actions">';
162
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
163
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
162
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
163
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
164 164
             echo '</div>';
165 165
             $form->addElement('hidden', 'sec_token');
166 166
             $form->setConstants(array('sec_token' => $token));
Please login to merge, or discard this patch.
main/admin/user_add.php 2 patches
Indentation   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -149,27 +149,27 @@  discard block
 block discarded – undo
149 149
 $form = new FormValidator('user_add');
150 150
 $form->addElement('header', '', $tool_name);
151 151
 if (api_is_western_name_order()) {
152
-	// Firstname
153
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
154
-	$form->applyFilter('firstname', 'html_filter');
155
-	$form->applyFilter('firstname', 'trim');
156
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
157
-	// Lastname
158
-	$form->addElement('text', 'lastname', get_lang('LastName'));
159
-	$form->applyFilter('lastname', 'html_filter');
160
-	$form->applyFilter('lastname', 'trim');
161
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
152
+    // Firstname
153
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
154
+    $form->applyFilter('firstname', 'html_filter');
155
+    $form->applyFilter('firstname', 'trim');
156
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
157
+    // Lastname
158
+    $form->addElement('text', 'lastname', get_lang('LastName'));
159
+    $form->applyFilter('lastname', 'html_filter');
160
+    $form->applyFilter('lastname', 'trim');
161
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
162 162
 } else {
163
-	// Lastname
164
-	$form->addElement('text', 'lastname', get_lang('LastName'));
165
-	$form->applyFilter('lastname', 'html_filter');
166
-	$form->applyFilter('lastname', 'trim');
167
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
168
-	// Firstname
169
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
170
-	$form->applyFilter('firstname', 'html_filter');
171
-	$form->applyFilter('firstname', 'trim');
172
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
163
+    // Lastname
164
+    $form->addElement('text', 'lastname', get_lang('LastName'));
165
+    $form->applyFilter('lastname', 'html_filter');
166
+    $form->applyFilter('lastname', 'trim');
167
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
168
+    // Firstname
169
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
170
+    $form->applyFilter('firstname', 'html_filter');
171
+    $form->applyFilter('firstname', 'trim');
172
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
173 173
 }
174 174
 // Official code
175 175
 $form->addElement('text', 'official_code', get_lang('OfficialCode'), array('size' => '40'));
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 $auth_sources = 0; //make available wider as we need it in case of form reset (see below)
225 225
 $nb_ext_auth_source_added = 0;
226 226
 if (isset($extAuthSource) && count($extAuthSource) > 0) {
227
-	$auth_sources = array();
227
+    $auth_sources = array();
228 228
     foreach ($extAuthSource as $key => $info) {
229 229
         // @todo : make uniform external authentification configuration (ex : cas and external_login ldap)
230 230
         // Special case for CAS. CAS is activated from Chamilo > Administration > Configuration > CAS
@@ -235,10 +235,10 @@  discard block
 block discarded – undo
235 235
             $nb_ext_auth_source_added++;
236 236
         }
237 237
     }
238
-	if ($nb_ext_auth_source_added > 0) {
239
-    	$group[] = $form->createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
240
-    	$group[] = $form->createElement('select', 'auth_source', null, $auth_sources);
241
-    	$group[] = $form->createElement('static', '', '', '<br />');
238
+    if ($nb_ext_auth_source_added > 0) {
239
+        $group[] = $form->createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
240
+        $group[] = $form->createElement('select', 'auth_source', null, $auth_sources);
241
+        $group[] = $form->createElement('static', '', '', '<br />');
242 242
     }
243 243
 }
244 244
 
@@ -307,12 +307,12 @@  discard block
 block discarded – undo
307 307
 $form->addElement('html', '<div id="drh_list" style="display:'.$display.';">');
308 308
 
309 309
 if (isset($drh_list) && is_array($drh_list)) {
310
-	foreach ($drh_list as $drh) {
310
+    foreach ($drh_list as $drh) {
311 311
         $drh_select->addOption(
312 312
             api_get_person_name($drh['firstname'], $drh['lastname']),
313 313
             $drh['user_id']
314 314
         );
315
-	}
315
+    }
316 316
 }
317 317
 $form->addElement('html', '</div>');
318 318
 
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 
387 387
 // Validate form
388 388
 if ($form->validate()) {
389
-	$check = Security::check_token('post');
389
+    $check = Security::check_token('post');
390 390
     if ($check) {
391 391
         $user = $form->exportValues();
392 392
         $lastname = $user['lastname'];
@@ -402,15 +402,15 @@  discard block
 block discarded – undo
402 402
         $send_mail = intval($user['mail']['send_mail']);
403 403
         $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : 0;
404 404
 
405
-		if (isset($extAuthSource) && count($extAuthSource) > 0 &&
405
+        if (isset($extAuthSource) && count($extAuthSource) > 0 &&
406 406
             $user['password']['password_auto'] == '2'
407 407
         ) {
408
-			$auth_source = $user['password']['auth_source'];
409
-			$password = 'PLACEHOLDER';
410
-		} else {
411
-			$auth_source = PLATFORM_AUTH_SOURCE;
412
-			$password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
413
-		}
408
+            $auth_source = $user['password']['auth_source'];
409
+            $password = 'PLACEHOLDER';
410
+        } else {
411
+            $auth_source = PLATFORM_AUTH_SOURCE;
412
+            $password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
413
+        }
414 414
 
415 415
         if ($user['radio_expiration_date'] == '1') {
416 416
             $expiration_date = $user['expiration_date'];
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
             $expiration_date = null;
419 419
         }
420 420
 
421
-		$active = intval($user['active']);
421
+        $active = intval($user['active']);
422 422
 
423 423
         if (api_get_setting('login_is_email') == 'true') {
424 424
             $username = $email;
@@ -449,21 +449,21 @@  discard block
 block discarded – undo
449 449
             $extra,
450 450
             null,
451 451
             $send_mail,
452
-			$platform_admin
452
+            $platform_admin
453 453
         );
454 454
 
455
-		Security::clear_token();
456
-		$tok = Security::get_token();
457
-		if ($user_id === false) {
458
-			//If any error ocurred during user creation, print it (api_failureList
459
-			// stores values as separate words, so rework it
460
-			$message = '';
461
-			$message_bits = explode(' ',api_get_last_failure());
462
-			foreach ($message_bits as $bit) {
463
-				$message .= ucfirst($bit);
464
-			}
465
-		} else {
466
- 			if (!empty($picture['name'])) {
455
+        Security::clear_token();
456
+        $tok = Security::get_token();
457
+        if ($user_id === false) {
458
+            //If any error ocurred during user creation, print it (api_failureList
459
+            // stores values as separate words, so rework it
460
+            $message = '';
461
+            $message_bits = explode(' ',api_get_last_failure());
462
+            foreach ($message_bits as $bit) {
463
+                $message .= ucfirst($bit);
464
+            }
465
+        } else {
466
+                if (!empty($picture['name'])) {
467 467
                 $picture_uri = UserManager::update_user_picture(
468 468
                     $user_id,
469 469
                     $_FILES['picture']['name'],
@@ -489,35 +489,35 @@  discard block
 block discarded – undo
489 489
                     null,
490 490
                     $language
491 491
                 );
492
-			}
492
+            }
493 493
 
494 494
             $extraFieldValues = new ExtraFieldValue('user');
495 495
             $user['item_id'] = $user_id;
496 496
             $extraFieldValues->saveFieldValues($user);
497 497
 
498
-			$message = get_lang('UserAdded');
499
-		}
500
-		if (isset($user['submit_plus'])) {
501
-			//we want to add more. Prepare report message and redirect to the same page (to clean the form)
502
-			header('Location: user_add.php?message='.urlencode($message).'&sec_token='.$tok);
503
-			exit ();
504
-		} else {
505
-			$tok = Security::get_token();
506
-			header('Location: user_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
507
-			exit ();
508
-		}
509
-	}
498
+            $message = get_lang('UserAdded');
499
+        }
500
+        if (isset($user['submit_plus'])) {
501
+            //we want to add more. Prepare report message and redirect to the same page (to clean the form)
502
+            header('Location: user_add.php?message='.urlencode($message).'&sec_token='.$tok);
503
+            exit ();
504
+        } else {
505
+            $tok = Security::get_token();
506
+            header('Location: user_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
507
+            exit ();
508
+        }
509
+    }
510 510
 } else {
511
-	if (isset($_POST['submit'])) {
512
-		Security::clear_token();
513
-	}
514
-	$token = Security::get_token();
515
-	$form->addElement('hidden', 'sec_token');
516
-	$form->setConstants(array('sec_token' => $token));
511
+    if (isset($_POST['submit'])) {
512
+        Security::clear_token();
513
+    }
514
+    $token = Security::get_token();
515
+    $form->addElement('hidden', 'sec_token');
516
+    $form->setConstants(array('sec_token' => $token));
517 517
 }
518 518
 
519 519
 if (!empty($message)){
520
-	$message = Display::return_message(stripslashes($message));
520
+    $message = Display::return_message(stripslashes($message));
521 521
 }
522 522
 $content = $form->returnForm();
523 523
 
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
     });
43 43
     </script>';
44 44
 }
45
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
46
-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
45
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
46
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
47 47
 $htmlHeadXtra[] = '<script>
48 48
 $(document).ready(function() {
49 49
     var $image = $("#previewImage");
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 }
184 184
 
185 185
 if (api_get_setting('login_is_email') == 'true') {
186
-    $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
186
+    $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
187 187
     $form->addRule('email', get_lang('UserTaken'), 'username_available');
188 188
 }
189 189
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 $form->addElement('text', 'phone', get_lang('PhoneNumber'));
192 192
 // Picture
193 193
 $form->addElement('file', 'picture', get_lang('AddImage'), array('id' => 'picture', 'class' => 'picture-form'));
194
-$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
194
+$allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
195 195
 
196 196
 $form->addHtml(''
197 197
             . '<div class="form-group">'
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 if (api_get_setting('login_is_email') != 'true') {
215 215
     $form->addElement('text', 'username', get_lang('LoginName'), array('id'=> 'username', 'maxlength' => USERNAME_MAX_LENGTH, 'autocomplete' => 'off'));
216 216
     $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
217
-    $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
217
+    $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
218 218
     $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
219 219
     $form->addRule('username', get_lang('UserTaken'), 'username_available');
220 220
 }
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 );
302 302
 
303 303
 //drh list (display only if student)
304
-$display = isset($_POST['status']) && $_POST['status'] == STUDENT  || !isset($_POST['status']) ? 'block' : 'none';
304
+$display = isset($_POST['status']) && $_POST['status'] == STUDENT || !isset($_POST['status']) ? 'block' : 'none';
305 305
 
306 306
 //@todo remove the drh list here. This code is unused
307 307
 $form->addElement('html', '<div id="drh_list" style="display:'.$display.';">');
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 $form->addGroup($group, 'mail', get_lang('SendMailToNewUser'), '&nbsp;');
336 336
 // Expiration Date
337 337
 $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
338
-$group = array ();
338
+$group = array();
339 339
 $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
340 340
 $group[] = $form->createElement(
341 341
     'DateTimePicker',
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 $jquery_ready_content = $returnParams['jquery_ready_content'];
357 357
 
358 358
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
359
-$htmlHeadXtra[] ='<script>
359
+$htmlHeadXtra[] = '<script>
360 360
 $(document).ready(function(){
361 361
 	'.$jquery_ready_content.'
362 362
 });
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
 			//If any error ocurred during user creation, print it (api_failureList
459 459
 			// stores values as separate words, so rework it
460 460
 			$message = '';
461
-			$message_bits = explode(' ',api_get_last_failure());
461
+			$message_bits = explode(' ', api_get_last_failure());
462 462
 			foreach ($message_bits as $bit) {
463 463
 				$message .= ucfirst($bit);
464 464
 			}
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 	$form->setConstants(array('sec_token' => $token));
517 517
 }
518 518
 
519
-if (!empty($message)){
519
+if (!empty($message)) {
520 520
 	$message = Display::return_message(stripslashes($message));
521 521
 }
522 522
 $content = $form->returnForm();
Please login to merge, or discard this patch.
main/admin/access_url_edit.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -36,21 +36,21 @@  discard block
 block discarded – undo
36 36
             if (substr($url, strlen($url) - 1, strlen($url)) == '/') {
37 37
                 UrlManager::update($url_id, $url, $description, $active);
38 38
             } else {
39
-                UrlManager::update($url_id, $url . '/', $description, $active);
39
+                UrlManager::update($url_id, $url.'/', $description, $active);
40 40
             }
41 41
             // URL Images
42
-            $url_images_dir = api_get_path(SYS_PATH) . 'custompages/url-images/';
42
+            $url_images_dir = api_get_path(SYS_PATH).'custompages/url-images/';
43 43
             $image_fields = array("url_image_1", "url_image_2", "url_image_3");
44 44
             foreach ($image_fields as $image_field) {
45 45
                 if ($_FILES[$image_field]['error'] == 0) {
46 46
                     // Hardcoded: only PNG files allowed
47 47
                     if (end(explode('.', $_FILES[$image_field]['name'])) == 'png') {
48
-                        if (file_exists($url_images_dir . $url_id . '_' . $image_field . '.png')) {
48
+                        if (file_exists($url_images_dir.$url_id.'_'.$image_field.'.png')) {
49 49
                             // if the file exists, we have to remove it before move_uploaded_file
50
-                            unlink($url_images_dir . $url_id . '_' . $image_field . '.png');
50
+                            unlink($url_images_dir.$url_id.'_'.$image_field.'.png');
51 51
                         }
52 52
                         move_uploaded_file(
53
-                            $_FILES[$image_field]['tmp_name'], $url_images_dir . $url_id . '_' . $image_field . '.png'
53
+                            $_FILES[$image_field]['tmp_name'], $url_images_dir.$url_id.'_'.$image_field.'.png'
54 54
                         );
55 55
                     }
56 56
                     // else fail silently
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
                     UrlManager::add($url, $description, $active);
68 68
                 } else {
69 69
                     //create
70
-                    UrlManager::add($url . '/', $description, $active);
70
+                    UrlManager::add($url.'/', $description, $active);
71 71
                 }
72 72
                 $message = get_lang('URLAdded');
73 73
                 $url_to_go = 'access_urls.php';
@@ -78,13 +78,13 @@  discard block
 block discarded – undo
78 78
             // URL Images
79 79
             $url .= (substr($url, strlen($url) - 1, strlen($url)) == '/') ? '' : '/';
80 80
             $url_id = UrlManager::get_url_id($url);
81
-            $url_images_dir = api_get_path(SYS_PATH) . 'custompages/url-images/';
81
+            $url_images_dir = api_get_path(SYS_PATH).'custompages/url-images/';
82 82
             $image_fields = array("url_image_1", "url_image_2", "url_image_3");
83 83
             foreach ($image_fields as $image_field) {
84 84
                 if ($_FILES[$image_field]['error'] == 0) {
85 85
                     // Hardcoded: only PNG files allowed
86 86
                     if (end(explode('.', $_FILES[$image_field]['name'])) == 'png') {
87
-                        move_uploaded_file($_FILES[$image_field]['tmp_name'], $url_images_dir . $url_id . '_' . $image_field . '.png');
87
+                        move_uploaded_file($_FILES[$image_field]['tmp_name'], $url_images_dir.$url_id.'_'.$image_field.'.png');
88 88
                     }
89 89
                     // else fail silently
90 90
                 }
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         }
94 94
         Security::clear_token();
95 95
         $tok = Security::get_token();
96
-        header('Location: ' . $url_to_go . '?action=show_message&message=' . urlencode($message) . '&sec_token=' . $tok);
96
+        header('Location: '.$url_to_go.'?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
97 97
         exit();
98 98
     }
99 99
 } else {
Please login to merge, or discard this patch.
main/admin/course_create_content.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,16 +7,16 @@
 block discarded – undo
7 7
  * @package chamilo.admin
8 8
  */
9 9
 include ('../inc/global.inc.php');
10
-$this_section=SECTION_PLATFORM_ADMIN;
10
+$this_section = SECTION_PLATFORM_ADMIN;
11 11
 
12 12
 api_protect_admin_script();
13 13
 $tool_name = get_lang('DummyCourseCreator');
14
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
14
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
15 15
 Display::display_header($tool_name);
16 16
 //api_display_tool_title($tool_name);
17 17
 if (api_get_setting('server_type') != 'test') {
18 18
 	echo get_lang('DummyCourseOnlyOnTestServer');
19
-} elseif( isset($_POST['action'])) {
19
+} elseif (isset($_POST['action'])) {
20 20
 	require_once('../coursecopy/classes/DummyCourseCreator.class.php');
21 21
 	$dcc = new DummyCourseCreator();
22 22
 	$dcc->create_dummy_course($_POST['course_code']);
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -15,15 +15,15 @@
 block discarded – undo
15 15
 Display::display_header($tool_name);
16 16
 //api_display_tool_title($tool_name);
17 17
 if (api_get_setting('server_type') != 'test') {
18
-	echo get_lang('DummyCourseOnlyOnTestServer');
18
+    echo get_lang('DummyCourseOnlyOnTestServer');
19 19
 } elseif( isset($_POST['action'])) {
20
-	require_once('../coursecopy/classes/DummyCourseCreator.class.php');
21
-	$dcc = new DummyCourseCreator();
22
-	$dcc->create_dummy_course($_POST['course_code']);
23
-	echo get_lang('Done');
20
+    require_once('../coursecopy/classes/DummyCourseCreator.class.php');
21
+    $dcc = new DummyCourseCreator();
22
+    $dcc->create_dummy_course($_POST['course_code']);
23
+    echo get_lang('Done');
24 24
 } else {
25
-	echo get_lang('DummyCourseDescription');
26
-	echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
25
+    echo get_lang('DummyCourseDescription');
26
+    echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
27 27
 }
28 28
 
29 29
 Display::display_footer();
Please login to merge, or discard this patch.
main/admin/statistics.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,13 +5,13 @@
 block discarded – undo
5 5
 *   @package chamilo.admin
6 6
 */
7 7
 
8
-$cidReset=true;
8
+$cidReset = true;
9 9
 require_once '../inc/global.inc.php';
10 10
 $this_section = SECTION_PLATFORM_ADMIN;
11 11
 
12 12
 api_protect_admin_script();
13 13
 
14
-$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
14
+$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
15 15
 $tool_name = get_lang('Statistics');
16 16
 Display::display_header($tool_name);
17 17
 Display::display_footer();
Please login to merge, or discard this patch.