Completed
Push — 1.10.x ( 81fffe...f2089c )
by Angel Fernando Quiroz
44:59 queued 06:02
created
main/user/add_users_to_session.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 
23 23
 // setting breadcrumbs
24 24
 if (api_is_platform_admin()) {
25
-    $interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
26
-    $interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
27
-    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session,"name" => get_lang('SessionOverview'));
25
+    $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
26
+    $interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
27
+    $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id_session, "name" => get_lang('SessionOverview'));
28 28
 }
29 29
 $allowTutors = api_get_setting('allow_tutors_to_assign_students_to_session');
30
-if($allowTutors == 'true') {
30
+if ($allowTutors == 'true') {
31 31
     // Database Table Definitions
32 32
     $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
33 33
     $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
@@ -38,19 +38,19 @@  discard block
 block discarded – undo
38 38
     $tool_name = get_lang('SubscribeUsersToSession');
39 39
     $add_type = 'unique';
40 40
 
41
-    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!='') {
41
+    if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
42 42
         $add_type = Security::remove_XSS($_REQUEST['add_type']);
43 43
     }
44 44
 
45 45
     $page = isset($_GET['page']) ? Security::remove_XSS($_GET['page']) : null;
46 46
 
47 47
     // Checking for extra field with filter on
48
-    $extra_field_list= UserManager::get_extra_fields();
48
+    $extra_field_list = UserManager::get_extra_fields();
49 49
     $new_field_list = array();
50 50
     if (is_array($extra_field_list)) {
51 51
     	foreach ($extra_field_list as $extra_field) {
52 52
     		//if is enabled to filter and is a "<select>" field type
53
-    		if ($extra_field[8]==1 && $extra_field[2]==4 ) {
53
+    		if ($extra_field[8] == 1 && $extra_field[2] == 4) {
54 54
                 $new_field_list[] = array(
55 55
                     'name' => $extra_field[3],
56 56
                     'variable' => $extra_field[1],
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
     	if (!empty($needle) && !empty($type)) {
74 74
 
75 75
             //normal behaviour
76
-            if ($type == 'any_session' && $needle == 'false')  {
76
+            if ($type == 'any_session' && $needle == 'false') {
77 77
                 $type = 'multiple';
78 78
                 $needle = '';
79 79
             }
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     		$cond_user_id = '';
88 88
 
89 89
             //Only for single & multiple
90
-            if (in_array($type, array('single','multiple'))) {
90
+            if (in_array($type, array('single', 'multiple'))) {
91 91
         		if (!empty($id_session)) {
92 92
         		    $id_session = intval($id_session);
93 93
         			// check id_user from session_rel_user table
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
97 97
         			$user_ids = array();
98 98
         			if (Database::num_rows($res) > 0) {
99 99
         				while ($row = Database::fetch_row($res)) {
100
-        					$user_ids[] = (int)$row[0];
100
+        					$user_ids[] = (int) $row[0];
101 101
         				}
102 102
         			}
103 103
         			if (count($user_ids) > 0) {
104
-        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')';
104
+        				$cond_user_id = ' AND user.user_id NOT IN('.implode(",", $user_ids).')';
105 105
         			}
106 106
         		}
107 107
             }
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
                     break;
138 138
     		}
139 139
     		if (api_is_multiple_url_enabled()) {
140
-    			$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
140
+    			$tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
141 141
     			$access_url_id = api_get_current_access_url_id();
142 142
     			if ($access_url_id != -1) {
143 143
                     switch ($type) {
@@ -182,11 +182,11 @@  discard block
 block discarded – undo
182 182
     		}
183 183
 
184 184
     		$rs = Database::query($sql);
185
-            $i=0;
185
+            $i = 0;
186 186
     		if ($type == 'single') {
187 187
     			while ($user = Database :: fetch_array($rs)) {
188 188
     	            $i++;
189
-    	            if ($i<=10) {
189
+    	            if ($i <= 10) {
190 190
                 		$person_name = api_get_person_name($user['firstname'], $user['lastname']);
191 191
     					$return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />';
192 192
     	            } else {
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
     	            }
195 195
     			}
196 196
 
197
-    			$xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
197
+    			$xajax_response -> addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
198 198
     		} else {
199 199
     			global $nosessionUsersList;
200 200
     			$return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
     	            $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>';
204 204
     			}
205 205
     			$return .= '</select>';
206
-    			$xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
206
+    			$xajax_response -> addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
207 207
     		}
208 208
     	}
209 209
     	return $xajax_response;
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
     </script>';
261 261
 
262 262
     $form_sent = 0;
263
-    $errorMsg = $firstLetterUser = $firstLetterSession='';
263
+    $errorMsg = $firstLetterUser = $firstLetterSession = '';
264 264
     $UserList = $SessionList = array();
265 265
     $sessions = array();
266 266
     $noPHP_SELF = true;
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
         $UserList = $_POST['sessionUsersList'];
273 273
 
274 274
         if (!is_array($UserList)) {
275
-            $UserList=array();
275
+            $UserList = array();
276 276
         }
277 277
 
278 278
         if ($form_sent == 1) {
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
                 WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
301 301
 
302 302
         if (api_is_multiple_url_enabled()) {
303
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
303
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
304 304
             $access_url_id = api_get_current_access_url_id();
305 305
             if ($access_url_id != -1) {
306 306
                 $sql = "SELECT u.user_id, lastname, firstname, username, session_id
@@ -316,19 +316,19 @@  discard block
 block discarded – undo
316 316
         $result = Database::query($sql);
317 317
         $users = Database::store_result($result);
318 318
         foreach ($users as $user) {
319
-            $sessionUsersList[$user['user_id']] = $user ;
319
+            $sessionUsersList[$user['user_id']] = $user;
320 320
         }
321 321
         unset($users); //clean to free memory
322 322
     } else {
323 323
         //Filter by Extra Fields
324 324
         $use_extra_fields = false;
325 325
         if (is_array($extra_field_list)) {
326
-            if (is_array($new_field_list) && count($new_field_list)>0 ) {
327
-                $result_list=array();
326
+            if (is_array($new_field_list) && count($new_field_list) > 0) {
327
+                $result_list = array();
328 328
                 foreach ($new_field_list as $new_field) {
329 329
                     $varname = 'field_'.$new_field['variable'];
330 330
                     if (UserManager::is_extra_field_available($new_field['variable'])) {
331
-                        if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
331
+                        if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
332 332
                             $use_extra_fields = true;
333 333
                             $extra_field_result[] = UserManager::get_extra_user_data_by_value(
334 334
                                 $new_field['variable'],
@@ -342,9 +342,9 @@  discard block
 block discarded – undo
342 342
 
343 343
         if ($use_extra_fields) {
344 344
             $final_result = array();
345
-           	if (count($extra_field_result)>1) {
346
-    	    for($i=0;$i<count($extra_field_result)-1;$i++) {
347
-                    if (is_array($extra_field_result[$i+1])) {
345
+           	if (count($extra_field_result) > 1) {
346
+    	    for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
347
+                    if (is_array($extra_field_result[$i + 1])) {
348 348
                         $final_result = array_intersect(
349 349
                             $extra_field_result[$i],
350 350
                             $extra_field_result[$i + 1]
@@ -355,17 +355,17 @@  discard block
 block discarded – undo
355 355
                 $final_result = $extra_field_result[0];
356 356
             }
357 357
 
358
-            $where_filter ='';
358
+            $where_filter = '';
359 359
             if (api_is_multiple_url_enabled()) {
360
-                if (is_array($final_result) && count($final_result)>0) {
361
-                    $where_filter = " AND u.user_id IN  ('".implode("','",$final_result)."') ";
360
+                if (is_array($final_result) && count($final_result) > 0) {
361
+                    $where_filter = " AND u.user_id IN  ('".implode("','", $final_result)."') ";
362 362
                 } else {
363 363
                     //no results
364 364
                     $where_filter = " AND u.user_id  = -1";
365 365
                 }
366 366
             } else {
367
-                if (is_array($final_result) && count($final_result)>0) {
368
-                    $where_filter = " WHERE u.user_id IN  ('".implode("','",$final_result)."') ";
367
+                if (is_array($final_result) && count($final_result) > 0) {
368
+                    $where_filter = " WHERE u.user_id IN  ('".implode("','", $final_result)."') ";
369 369
                 } else {
370 370
                     //no results
371 371
                     $where_filter = " WHERE u.user_id  = -1";
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
                     $order_clause";
395 395
         }
396 396
         if (api_is_multiple_url_enabled()) {
397
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
397
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
398 398
             $access_url_id = api_get_current_access_url_id();
399 399
             if ($access_url_id != -1) {
400 400
                 $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
         }
412 412
 
413 413
         $result = Database::query($sql);
414
-        $users = Database::store_result($result,'ASSOC');
414
+        $users = Database::store_result($result, 'ASSOC');
415 415
 
416 416
         foreach ($users as $uid => $user) {
417 417
             if ($user['session_id'] != $id_session) {
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
         unset($users); //clean to free memory
427 427
 
428 428
         //filling the correct users in list
429
-        $sql="SELECT  user_id, lastname, firstname, username, session_id
429
+        $sql = "SELECT  user_id, lastname, firstname, username, session_id
430 430
               FROM $tbl_user u
431 431
               LEFT JOIN $tbl_session_rel_user
432 432
               ON
@@ -436,10 +436,10 @@  discard block
 block discarded – undo
436 436
               WHERE u.status<>".DRH." AND u.status<>6 $order_clause";
437 437
 
438 438
         if (api_is_multiple_url_enabled()) {
439
-            $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
439
+            $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
440 440
             $access_url_id = api_get_current_access_url_id();
441 441
             if ($access_url_id != -1) {
442
-                $sql="SELECT  u.user_id, lastname, firstname, username, session_id
442
+                $sql = "SELECT  u.user_id, lastname, firstname, username, session_id
443 443
                     FROM $tbl_user u
444 444
                     LEFT JOIN $tbl_session_rel_user
445 445
                     ON
@@ -452,11 +452,11 @@  discard block
 block discarded – undo
452 452
             }
453 453
         }
454 454
         $result = Database::query($sql);
455
-        $users = Database::store_result($result,'ASSOC');
455
+        $users = Database::store_result($result, 'ASSOC');
456 456
         foreach ($users as $uid => $user) {
457 457
             if ($user['session_id'] == $id_session) {
458 458
                 $sessionUsersList[$user['user_id']] = $user;
459
-                if (array_key_exists($user['user_id'],$nosessionUsersList)) {
459
+                if (array_key_exists($user['user_id'], $nosessionUsersList)) {
460 460
                     unset($nosessionUsersList[$user['user_id']]);
461 461
                 }
462 462
             }
@@ -472,25 +472,25 @@  discard block
 block discarded – undo
472 472
     	$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
473 473
     	$link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&amp;add='.Security::remove_XSS($_GET['add']).'&amp;add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
474 474
     }
475
-    	$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif',get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
475
+    	$link_add_group = '<a href="usergroups.php">'.Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>';
476 476
     ?>
477 477
     <div class="actions">
478 478
     	<?php echo $link_add_type_unique ?>&nbsp;|&nbsp;<?php echo $link_add_type_multiple ?>&nbsp;|&nbsp;<?php echo $link_add_group; ?>
479 479
     </div>
480
-    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
480
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
481 481
     <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
482 482
     <?php
483 483
     if ($add_type == 'multiple') {
484 484
     	if (is_array($extra_field_list)) {
485
-    		if (is_array($new_field_list) && count($new_field_list)>0 ) {
485
+    		if (is_array($new_field_list) && count($new_field_list) > 0) {
486 486
     			echo '<h3>'.get_lang('FilterUsers').'</h3>';
487 487
     			foreach ($new_field_list as $new_field) {
488 488
     				echo $new_field['name'];
489 489
     				$varname = 'field_'.$new_field['variable'];
490 490
     				echo '&nbsp;<select name="'.$varname.'">';
491 491
     				echo '<option value="0">--'.get_lang('Select').'--</option>';
492
-    				foreach	($new_field['data'] as $option) {
493
-    					$checked='';
492
+    				foreach ($new_field['data'] as $option) {
493
+    					$checked = '';
494 494
     					if (isset($_POST[$varname])) {
495 495
     						if ($_POST[$varname] == $option[1]) {
496 496
     							$checked = 'selected="true"';
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
                   <?php
546 546
                   foreach ($nosessionUsersList as $uid => $enreg) {
547 547
                   ?>
548
-                      <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
548
+                      <option value="<?php echo $uid; ?>" <?php if (in_array($uid, $UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option>
549 549
                   <?php
550 550
                   }
551 551
                   ?>
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
             </div>
598 598
             <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" class="span5">
599 599
             <?php
600
-            foreach($sessionUsersList as $enreg) {
600
+            foreach ($sessionUsersList as $enreg) {
601 601
             ?>
602 602
                 <option value="<?php echo $enreg['user_id']; ?>"><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
603 603
             <?php
Please login to merge, or discard this patch.
main/user/user.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
  */
14 14
 $use_anonymous = true;
15 15
 require_once '../inc/global.inc.php';
16
-$current_course_tool  = TOOL_USER;
16
+$current_course_tool = TOOL_USER;
17 17
 $this_section = SECTION_COURSES;
18 18
 
19 19
 // notice for unauthorized people.
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
 //Can't auto unregister from a session
43 43
 if (!empty($sessionId)) {
44
-    $course_info['unsubscribe']  = 0;
44
+    $course_info['unsubscribe'] = 0;
45 45
 }
46 46
 
47 47
 /* Unregistering a user section	*/
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
                             '#',
185 185
                             get_lang('UserPicture'),
186 186
                             get_lang('OfficialCode'),
187
-                            get_lang('FirstName') . ', ' . get_lang('LastName'),
187
+                            get_lang('FirstName').', '.get_lang('LastName'),
188 188
                             get_lang('Email'),
189 189
                             get_lang('Phone')
190 190
                         );
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
                             '#',
194 194
                             get_lang('UserPicture'),
195 195
                             get_lang('OfficialCode'),
196
-                            get_lang('LastName') . ', ' . get_lang('FirstName'),
196
+                            get_lang('LastName').', '.get_lang('FirstName'),
197 197
                             get_lang('Email'),
198 198
                             get_lang('Phone')
199 199
                         );
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
                     if (api_is_multiple_url_enabled()) {
219 219
                         $sql .= ' , '.Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER).' au ';
220 220
                     }
221
-                    $sql .=" WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id ";
221
+                    $sql .= " WHERE c_id = '$courseId' AND session_course_user.user_id = user.user_id ";
222 222
                     $sql .= ' AND session_id = '.$sessionId;
223 223
 
224 224
                     if (api_is_multiple_url_enabled()) {
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
                             true
253 253
                         );
254 254
                         if (!empty($extra_fields)) {
255
-                            foreach($extra_fields as $key => $extra_value) {
255
+                            foreach ($extra_fields as $key => $extra_value) {
256 256
                                 $user[$key] = $extra_value;
257 257
                             }
258 258
                         }
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
                                     $counter,
267 267
                                     $user_image,
268 268
                                     $user['official_code'],
269
-                                    $user['firstname'] . ', ' . $user['lastname'],
269
+                                    $user['firstname'].', '.$user['lastname'],
270 270
                                     $user['email'],
271 271
                                     $user['phone']
272 272
                                 );
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
                                     $counter,
276 276
                                     $user_image,
277 277
                                     $user['official_code'],
278
-                                    $user['lastname'] . ', ' . $user['firstname'],
278
+                                    $user['lastname'].', '.$user['firstname'],
279 279
                                     $user['email'],
280 280
                                     $user['phone']
281 281
                                 );
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
                                     $counter,
355 355
                                     $user_image,
356 356
                                     $user['official_code'],
357
-                                    $user['firstname'] . ', ' . $user['lastname'],
357
+                                    $user['firstname'].', '.$user['lastname'],
358 358
                                     $user['email'],
359 359
                                     $user['phone']
360 360
                                 );
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
                                     $counter,
364 364
                                     $user_image,
365 365
                                     $user['official_code'],
366
-                                    $user['lastname'] . ', ' . $user['firstname'],
366
+                                    $user['lastname'].', '.$user['firstname'],
367 367
                                     $user['email'],
368 368
                                     $user['phone']
369 369
                                 );
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
                 $userInfo = api_get_user_info($user_id);
701 701
                 $userPicture = $userInfo['avatar'];
702 702
 
703
-                $photo= '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />';
703
+                $photo = '<img src="'.$userPicture.'" alt="'.$userInfo['complete_name'].'" width="22" height="22" title="'.$userInfo['complete_name'].'" />';
704 704
 
705 705
                 $temp[] = $user_id;
706 706
                 $temp[] = $photo;
@@ -821,7 +821,7 @@  discard block
 block discarded – undo
821 821
         if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' or api_is_platform_admin()) {
822 822
             // unregister
823 823
             if ($user_id != $current_user_id || api_is_platform_admin()) {
824
-                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'.
824
+                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'.
825 825
                     get_lang('Unreg').'</a>&nbsp;';
826 826
             } else {
827 827
                 //$result .= Display::return_icon('unsubscribe_course_na.png', get_lang('Unreg'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
@@ -831,7 +831,7 @@  discard block
 block discarded – undo
831 831
         // Show buttons for unsubscribe
832 832
         if ($course_info['unsubscribe'] == 1) {
833 833
             if ($user_id == $current_user_id) {
834
-                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,$charset)).'\')) return false;">'.
834
+                $result .= '<a class="btn btn-small btn-danger" href="'.api_get_self().'?'.api_get_cidreq().'&type='.$type.'&unregister=yes&user_id='.$user_id.'" title="'.get_lang('Unreg').' " onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).'\')) return false;">'.
835 835
                     get_lang('Unreg').'</a>&nbsp;';
836 836
             }
837 837
         }
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
 
908 908
     // Actions column
909 909
     $table->set_header($header_nr++, get_lang('Action'), false);
910
-    $table->set_column_filter($header_nr-1, 'modify_filter');
910
+    $table->set_column_filter($header_nr - 1, 'modify_filter');
911 911
 
912 912
     if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') {
913 913
         $table->set_form_actions(array('unsubscribe' => get_lang('Unreg')), 'user');
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
915 915
 } else {
916 916
     if ($course_info['unsubscribe'] == 1) {
917 917
         $table->set_header($header_nr++, get_lang('Action'), false);
918
-        $table->set_column_filter($header_nr-1, 'modify_filter');
918
+        $table->set_column_filter($header_nr - 1, 'modify_filter');
919 919
     }
920 920
 }
921 921
 
@@ -971,19 +971,19 @@  discard block
 block discarded – undo
971 971
     echo '<div class="col-md-6">';
972 972
     echo $icon;
973 973
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=csv&type='.$type.'">'.
974
-        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
974
+        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a> ';
975 975
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=xls&type='.$type.'">'.
976
-        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a> ';
976
+        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a> ';
977 977
 
978 978
     if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true' ||
979 979
         api_is_platform_admin()
980 980
     ) {
981 981
         $actions .= '<a href="user_import.php?'.api_get_cidreq().'&action=import">'.
982
-            Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'),'',ICON_SIZE_MEDIUM).'</a> ';
982
+            Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'), '', ICON_SIZE_MEDIUM).'</a> ';
983 983
     }
984 984
 
985 985
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=pdf&type='.$type.'">'.
986
-        Display::return_icon('pdf.png', get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a> ';
986
+        Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a> ';
987 987
     echo $actions;
988 988
 
989 989
     echo '</div>';
Please login to merge, or discard this patch.
main/user/session_list.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -56,15 +56,15 @@  discard block
 block discarded – undo
56 56
     );
57 57
 
58 58
     //Column config
59
-    $column_model   = array(
60
-        array('name'=>'name',           'index'=>'name',          'width'=>'160',  'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
61
-        array('name'=>'nbr_courses',    'index'=>'nbr_courses',   'width'=>'30',   'align'=>'left', 'search' => 'true'),
62
-        array('name'=>'nbr_users',      'index'=>'nbr_users',     'width'=>'30',   'align'=>'left', 'search' => 'true'),
63
-        array('name'=>'category_name',  'index'=>'category_name', 'width'=>'70',   'align'=>'left', 'search' => 'true'),
64
-        array('name'=>'access_start_date',     'index'=>'access_start_date',    'width'=>'40',   'align'=>'left', 'search' => 'true'),
65
-        array('name'=>'access_end_date',       'index'=>'access_end_date',      'width'=>'40',   'align'=>'left', 'search' => 'true'),
66
-        array('name'=>'coach_name',     'index'=>'coach_name',    'width'=>'80',   'align'=>'left', 'search' => 'false'),
67
-        array('name'=>'status',         'index'=>'session_active','width'=>'40',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
59
+    $column_model = array(
60
+        array('name'=>'name', 'index'=>'name', 'width'=>'160', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
61
+        array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
62
+        array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
63
+        array('name'=>'category_name', 'index'=>'category_name', 'width'=>'70', 'align'=>'left', 'search' => 'true'),
64
+        array('name'=>'access_start_date', 'index'=>'access_start_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
65
+        array('name'=>'access_end_date', 'index'=>'access_end_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
66
+        array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'),
67
+        array('name'=>'status', 'index'=>'session_active', 'width'=>'40', 'align'=>'left', 'search' => 'true', 'stype'=>'select',
68 68
           //for the bottom bar
69 69
             'searchoptions' => array(
70 70
                 'defaultValue' => '1',
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
             ),
73 73
           //for the top bar
74 74
           'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
75
-        array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
76
-        array('name'=>'actions',        'index'=>'actions',         'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false')
75
+        array('name'=>'visibility', 'index'=>'visibility', 'width'=>'40', 'align'=>'left', 'search' => 'false'),
76
+        array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false', 'search' => 'false')
77 77
     );
78 78
     //Autowidth
79 79
     $extra_params['autowidth'] = 'true';
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
     //With this function we can add actions to the jgrid (edit, delete, etc)
87 87
     $action_links = 'function action_formatter(cellvalue, options, rowObject) {
88
-         return \'&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',ICON_SIZE_SMALL).'</a>'.
88
+         return \'&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png', get_lang('SubscribeUsersToSession'), '', ICON_SIZE_SMALL).'</a>'.
89 89
          '\';
90 90
     }';
91 91
     ?>
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
     $(function() {
108 108
         <?php
109
-            echo Display::grid_js('sessions', $url,$columns,$column_model,$extra_params, array(), $action_links,true);
109
+            echo Display::grid_js('sessions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
110 110
         ?>
111 111
 
112 112
         setSearchSelect("status");
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
     <?php if (api_is_platform_admin()) {?>
149 149
         <div class="actions">
150 150
         <?php
151
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png',get_lang('AddSession'),'',ICON_SIZE_MEDIUM).'</a>';
152
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png',get_lang('AddSessionsInCategories'),'',ICON_SIZE_MEDIUM).'</a>';
153
-        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.Display::return_icon('folder.png',get_lang('ListSessionCategory'),'',ICON_SIZE_MEDIUM).'</a>';
151
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.Display::return_icon('new_session.png', get_lang('AddSession'), '', ICON_SIZE_MEDIUM).'</a>';
152
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.Display::return_icon('session_to_category.png', get_lang('AddSessionsInCategories'), '', ICON_SIZE_MEDIUM).'</a>';
153
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.Display::return_icon('folder.png', get_lang('ListSessionCategory'), '', ICON_SIZE_MEDIUM).'</a>';
154 154
         echo '</div>';
155 155
     }
156 156
 } else {
Please login to merge, or discard this patch.
main/user/class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 $(function() {
147 147
 <?php
148 148
     // grid definition see the $usergroup>display() function
149
-    echo Display::grid_js('usergroups',  $url, $columns, $columnModel, $extraParams, array(), '', true);
149
+    echo Display::grid_js('usergroups', $url, $columns, $columnModel, $extraParams, array(), '', true);
150 150
 ?>
151 151
 });
152 152
 </script>
Please login to merge, or discard this patch.
main/user/classes.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
 
13 13
 $this_section = SECTION_COURSES;
14 14
 
15
-$interbreadcrumb[]= array ('url' =>'classes.php','name' => get_lang('Classes'));
15
+$interbreadcrumb[] = array('url' =>'classes.php', 'name' => get_lang('Classes'));
16 16
 if (isset($_GET['id'])) {
17
-    $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Groups'));
17
+    $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('Groups'));
18 18
 }
19 19
 
20 20
 Display :: display_header($tool_name, 'Classes');
Please login to merge, or discard this patch.
main/user/user_import.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 
16 16
 $tool_name = get_lang('ImportUsersToACourse');
17 17
 
18
-$interbreadcrumb[] = array ("url" => "user.php", "name" => get_lang("Users"));
19
-$interbreadcrumb[] = array ("url" => "#", "name" => get_lang("ImportUsersToACourse"));
18
+$interbreadcrumb[] = array("url" => "user.php", "name" => get_lang("Users"));
19
+$interbreadcrumb[] = array("url" => "#", "name" => get_lang("ImportUsersToACourse"));
20 20
 
21 21
 $form = new FormValidator('user_import', 'post', 'user_import.php');
22 22
 $form->addElement('header', $tool_name);
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     if (isset($_FILES['import_file']['size']) && $_FILES['import_file']['size'] !== 0) {
43 43
         $unsubscribe_users = isset($_POST['unsubscribe_users']) ? true : false;
44 44
         //@todo : csvToArray deprecated
45
-        $users  = Import::csvToArray($_FILES['import_file']['tmp_name']);
45
+        $users = Import::csvToArray($_FILES['import_file']['tmp_name']);
46 46
         $invalid_users  = array();
47 47
         $clean_users    = array();
48 48
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
                         $user_ids = array();
80 80
                         foreach ($current_user_list as $user) {
81 81
                             if (!CourseManager::is_course_teacher($user['user_id'], $course_code)) {
82
-                                $user_ids[]= $user['user_id'];
82
+                                $user_ids[] = $user['user_id'];
83 83
                             }
84 84
                         }
85 85
                         CourseManager::unsubscribe_user($user_ids, $course_code, $session_id);
@@ -92,12 +92,12 @@  discard block
 block discarded – undo
92 92
                     if (empty($session_id)) {
93 93
                         //just to make sure
94 94
                         if (CourseManager :: is_user_subscribed_in_course($userId, $course_code)) {
95
-                            $user_to_show[]= $userInfo['complete_name'];
95
+                            $user_to_show[] = $userInfo['complete_name'];
96 96
                         }
97 97
                     } else {
98 98
                         //just to make sure
99 99
                         if (CourseManager::is_user_subscribed_in_course($userId, $course_code, true, $session_id)) {
100
-                            $user_to_show[]= $userInfo['complete_name'];
100
+                            $user_to_show[] = $userInfo['complete_name'];
101 101
                         }
102 102
                     }
103 103
                 }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
                 $message = get_lang('CheckUsersWithId');
106 106
                 $type = 'warning';
107 107
                 foreach ($invalid_users as $invalid_user) {
108
-                    $user_to_show[]= $invalid_user;
108
+                    $user_to_show[] = $invalid_user;
109 109
                 }
110 110
             }
111 111
         }
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
             Display::display_warning_message($message.':  <br />'.$userMessage, false);
131 131
         }
132 132
     } else {
133
-        $empty_line_msg = ($empty_line == 0) ? get_lang('ErrorsWhenImportingFile'): get_lang('ErrorsWhenImportingFile').': '.get_lang('EmptyHeaderLine');
133
+        $empty_line_msg = ($empty_line == 0) ? get_lang('ErrorsWhenImportingFile') : get_lang('ErrorsWhenImportingFile').': '.get_lang('EmptyHeaderLine');
134 134
         Display::display_error_message($empty_line_msg);
135 135
     }
136 136
 }
Please login to merge, or discard this patch.
main/user/subscribe_user.php 1 patch
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 */
9 9
 
10 10
 require_once '../inc/global.inc.php';
11
-$current_course_tool  = TOOL_USER;
11
+$current_course_tool = TOOL_USER;
12 12
 
13 13
 // the section (for the tabs)
14 14
 $this_section = SECTION_COURSES;
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 }
52 52
 
53 53
 $current_session_id = api_get_session_id();
54
-$list_register_user='';
55
-$list_not_register_user='';
54
+$list_register_user = '';
55
+$list_not_register_user = '';
56 56
 
57 57
 if (isset($_REQUEST['register'])) {
58 58
     if ($type == COURSEMANAGER) {
@@ -80,9 +80,9 @@  discard block
 block discarded – undo
80 80
 
81 81
     if (is_array($user_id_temp)) {
82 82
         $counter = count($user_id_temp);
83
-        for ($j=0; $j<$counter;$j++) {
84
-            if 	($user_id_temp[$j]==$_GET['user_id']) {
85
-                if ($result_simple_sub)	{
83
+        for ($j = 0; $j < $counter; $j++) {
84
+            if ($user_id_temp[$j] == $_GET['user_id']) {
85
+                if ($result_simple_sub) {
86 86
                     Display::addFlash(Display::return_message($_SESSION['session_user_name'][$j].' '.get_lang('AddedToCourse')));
87 87
                 } else {
88 88
                     Display::addFlash(Display::return_message($_SESSION['session_user_name'][$j].' '.get_lang('NotAddedToCourse'), 'error'));
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 }
100 100
 
101 101
 if (isset($_POST['action'])) {
102
-    switch($_POST['action']) {
102
+    switch ($_POST['action']) {
103 103
         case 'subscribe':
104 104
             if (is_array($_POST['user'])) {
105 105
                 foreach ($_POST['user'] as $index => $user_id) {
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
             $counter = 0;
137 137
             $is_suscribe_counter = count($is_suscribe_user_id);
138 138
 
139
-            $list_register_user='';
139
+            $list_register_user = '';
140 140
 
141 141
             for ($i = 0; $i < $is_suscribe_counter; $i++) {
142 142
                 for ($j = 0; $j < count($user_id_temp); $j++) {
@@ -195,25 +195,25 @@  discard block
 block discarded – undo
195 195
 $parameters['type'] = $type;
196 196
 $table->set_additional_parameters($parameters);
197 197
 $col = 0;
198
-$table->set_header($col ++, '', false);
199
-$table->set_header($col ++, get_lang('OfficialCode'));
198
+$table->set_header($col++, '', false);
199
+$table->set_header($col++, get_lang('OfficialCode'));
200 200
 if (api_is_western_name_order()) {
201
-    $table->set_header($col ++, get_lang('FirstName'));
202
-    $table->set_header($col ++, get_lang('LastName'));
201
+    $table->set_header($col++, get_lang('FirstName'));
202
+    $table->set_header($col++, get_lang('LastName'));
203 203
 } else {
204
-    $table->set_header($col ++, get_lang('LastName'));
205
-    $table->set_header($col ++, get_lang('FirstName'));
204
+    $table->set_header($col++, get_lang('LastName'));
205
+    $table->set_header($col++, get_lang('FirstName'));
206 206
 }
207 207
 
208 208
 if (api_get_setting('show_email_addresses') == 'true') {
209
-    $table->set_header($col ++, get_lang('Email'));
210
-    $table->set_column_filter($col -1, 'email_filter');
209
+    $table->set_header($col++, get_lang('Email'));
210
+    $table->set_column_filter($col - 1, 'email_filter');
211 211
 }
212 212
 $table->set_header($col++, get_lang('Active'), false);
213
-$table->set_column_filter($col -1, 'active_filter');
214
-$table->set_header($col ++, get_lang('Actions'), false);
215
-$table->set_column_filter($col -1, 'reg_filter');
216
-$table->set_form_actions(array ('subscribe' => get_lang('reg')), 'user');
213
+$table->set_column_filter($col - 1, 'active_filter');
214
+$table->set_header($col++, get_lang('Actions'), false);
215
+$table->set_column_filter($col - 1, 'reg_filter');
216
+$table->set_form_actions(array('subscribe' => get_lang('reg')), 'user');
217 217
 
218 218
 if (!empty($_POST['keyword'])) {
219 219
     $keyword_name = Security::remove_XSS($_POST['keyword']);
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
     $courseCode = api_get_course_id();
282 282
     $sessionId = api_get_session_id();
283 283
 
284
-	if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') {
284
+	if (isset($_REQUEST['type']) && $_REQUEST['type'] == 'teacher') {
285 285
 
286 286
 		if (api_get_session_id() != 0) {
287 287
 
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 
300 300
 			if (api_is_multiple_url_enabled()) {
301 301
 				$url_access_id = api_get_current_access_url_id();
302
-				if ($url_access_id !=-1) {
302
+				if ($url_access_id != -1) {
303 303
 					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
304 304
 					$sql = "SELECT COUNT(u.user_id)
305 305
 							FROM $user_table u
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 
327 327
 			if (api_is_multiple_url_enabled()) {
328 328
 				$url_access_id = api_get_current_access_url_id();
329
-				if ($url_access_id !=-1) {
329
+				if ($url_access_id != -1) {
330 330
 					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
331 331
 
332 332
 					$sql = "SELECT COUNT(u.user_id)
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 
357 357
 			if (api_is_multiple_url_enabled()) {
358 358
 				$url_access_id = api_get_current_access_url_id();
359
-				if ($url_access_id !=-1) {
359
+				if ($url_access_id != -1) {
360 360
 					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
361 361
 					$sql = "SELECT COUNT(u.user_id)
362 362
 							FROM $user_table u
@@ -384,9 +384,9 @@  discard block
 block discarded – undo
384 384
 			if (isset($_GET['subscribe_user_filter_value']) &&
385 385
                 !empty($_GET['subscribe_user_filter_value']) &&
386 386
                 api_get_setting('ProfilingFilterAddingUsers') == 'true'
387
-            ){
388
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
389
-				$sql .=	"
387
+            ) {
388
+				$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
389
+				$sql .= "
390 390
 					LEFT JOIN $table_user_field_values field_values
391 391
 					ON field_values.item_id = u.user_id
392 392
 					WHERE
@@ -395,14 +395,14 @@  discard block
 block discarded – undo
395 395
 						field_values.field_id = '".intval($field_identification[0])."' AND
396 396
 						field_values.value = '".Database::escape_string($field_identification[1])."'
397 397
 					";
398
-			} else	{
399
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
398
+			} else {
399
+				$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
400 400
 			}
401 401
 
402 402
 			if (api_is_multiple_url_enabled()) {
403 403
 				$url_access_id = api_get_current_access_url_id();
404 404
 
405
-				if ($url_access_id !=-1) {
405
+				if ($url_access_id != -1) {
406 406
 
407 407
 					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
408 408
 
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 			$users_of_course[] = $course_user['user_id'];
450 450
 	    }
451 451
 	}
452
-    $sql .=" AND u.status <> ".ANONYMOUS." ";
452
+    $sql .= " AND u.status <> ".ANONYMOUS." ";
453 453
 	$res = Database::query($sql);
454 454
     $count_user = 0;
455 455
 
@@ -521,8 +521,8 @@  discard block
 block discarded – undo
521 521
 				!empty($_GET['subscribe_user_filter_value']) &&
522 522
 				api_get_setting('ProfilingFilterAddingUsers') == 'true'
523 523
 			) {
524
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
525
-				$sql .=	"
524
+				$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
525
+				$sql .= "
526 526
 					LEFT JOIN $table_user_field_values field_values
527 527
 						ON field_values.item_id = u.user_id
528 528
 					WHERE
@@ -532,10 +532,10 @@  discard block
 block discarded – undo
532 532
 						field_values.field_id = '".intval($field_identification[0])."' AND
533 533
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
534 534
 			} else {
535
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
535
+				$sql .= "WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
536 536
 			}
537 537
 
538
-            $sql .=	" AND access_url_id= $url_access_id";
538
+            $sql .= " AND access_url_id= $url_access_id";
539 539
 
540 540
 		} else {
541 541
 		     // adding a teacher NOT through a session
@@ -549,21 +549,21 @@  discard block
 block discarded – undo
549 549
 					!empty($_GET['subscribe_user_filter_value']) &&
550 550
 					api_get_setting('ProfilingFilterAddingUsers') == 'true'
551 551
 				) {
552
-					$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
553
-					$sql .=	"
552
+					$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
553
+					$sql .= "
554 554
 						LEFT JOIN $table_user_field_values field_values
555 555
 							ON field_values.item_id = u.user_id
556 556
 						WHERE
557 557
 							cu.user_id IS NULL AND u.status<>".DRH." AND
558 558
 							field_values.field_id = '".intval($field_identification[0])."' AND
559 559
 							field_values.value = '".Database::escape_string($field_identification[1])."'";
560
-				} else	{
561
-					$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
560
+				} else {
561
+					$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
562 562
 				}
563 563
 
564 564
 				// adding a teacher NOT trough a session on a portal with multiple URLs
565 565
 				if (api_is_multiple_url_enabled()) {
566
-					if ($url_access_id !=-1) {
566
+					if ($url_access_id != -1) {
567 567
 						$sql = "SELECT $select_fields
568 568
 						FROM $user_table u
569 569
 						LEFT JOIN $course_user_table cu
@@ -575,9 +575,9 @@  discard block
 block discarded – undo
575 575
 					if (isset($_GET['subscribe_user_filter_value']) &&
576 576
 						!empty($_GET['subscribe_user_filter_value']) &&
577 577
 						api_get_setting('ProfilingFilterAddingUsers') == 'true'
578
-					){
578
+					) {
579 579
 						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
580
-						$sql .=	"
580
+						$sql .= "
581 581
 							LEFT JOIN $table_user_field_values field_values
582 582
 								ON field_values.item_id = u.user_id
583 583
 							WHERE
@@ -585,8 +585,8 @@  discard block
 block discarded – undo
585 585
 							 	u.status<>".DRH." AND
586 586
 							 	field_values.field_id = '".intval($field_identification[0])."' AND
587 587
 							 	field_values.value = '".Database::escape_string($field_identification[1])."'";
588
-					} else	{
589
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
588
+					} else {
589
+						$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
590 590
 					}
591 591
 				}
592 592
 			}
@@ -607,9 +607,9 @@  discard block
 block discarded – undo
607 607
             }
608 608
 
609 609
             // applying the filter of the additional user profile fields
610
-            if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])){
611
-                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
612
-                $sql .=	"
610
+            if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])) {
611
+                $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
612
+                $sql .= "
613 613
                     LEFT JOIN $table_user_field_values field_values
614 614
                         ON field_values.item_id = u.user_id
615 615
                     WHERE
@@ -618,15 +618,15 @@  discard block
 block discarded – undo
618 618
                     	(u.official_code <> 'ADMIN' OR u.official_code IS NULL) AND
619 619
                     	field_values.field_id = '".intval($field_identification[0])."' AND
620 620
                     	field_values.value = '".Database::escape_string($field_identification[1])."'";
621
-            } else	{
622
-                $sql .=	"WHERE
621
+            } else {
622
+                $sql .= "WHERE
623 623
                 			cu.user_id IS NULL AND
624 624
                 			u.status<>".DRH." AND
625 625
                 			(u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
626 626
             }
627 627
 
628 628
             if (api_is_multiple_url_enabled()) {
629
-                $sql .=  "AND access_url_id = $url_access_id";
629
+                $sql .= "AND access_url_id = $url_access_id";
630 630
             }
631 631
 
632 632
 		} else {
@@ -638,9 +638,9 @@  discard block
 block discarded – undo
638 638
                     	c_id ='".$courseId."'";
639 639
 
640 640
 			// applying the filter of the additional user profile fields
641
-			if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])){
642
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
643
-				$sql .=	"
641
+			if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) {
642
+				$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
643
+				$sql .= "
644 644
 					LEFT JOIN $table_user_field_values field_values
645 645
 						ON field_values.item_id = u.user_id
646 646
 					WHERE
@@ -648,14 +648,14 @@  discard block
 block discarded – undo
648 648
 						u.status<>".DRH." AND
649 649
 						field_values.field_id = '".intval($field_identification[0])."' AND
650 650
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
651
-			} else	{
652
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
651
+			} else {
652
+				$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
653 653
 			}
654 654
 
655 655
 			//showing only the courses of the current Chamilo access_url_id
656 656
 
657 657
 			if (api_is_multiple_url_enabled()) {
658
-				if ($url_access_id !=-1) {
658
+				if ($url_access_id != -1) {
659 659
 					$sql = "SELECT $select_fields
660 660
 						FROM $user_table u
661 661
 						LEFT JOIN $course_user_table cu
@@ -667,9 +667,9 @@  discard block
 block discarded – undo
667 667
 					if (isset($_GET['subscribe_user_filter_value']) &&
668 668
 						!empty($_GET['subscribe_user_filter_value']) &&
669 669
 						api_get_setting('ProfilingFilterAddingUsers') == 'true'
670
-					){
670
+					) {
671 671
 						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
672
-						$sql .=	"
672
+						$sql .= "
673 673
 							LEFT JOIN $table_user_field_values field_values
674 674
 								ON field_values.item_id = u.user_id
675 675
 							WHERE
@@ -679,8 +679,8 @@  discard block
 block discarded – undo
679 679
 								field_values.value = '".Database::escape_string($field_identification[1])."' AND
680 680
 								access_url_id = $url_access_id
681 681
                             ";
682
-					} else	{
683
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
682
+					} else {
683
+						$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
684 684
 					}
685 685
 				}
686 686
 			}
@@ -718,14 +718,14 @@  discard block
 block discarded – undo
718 718
 		}
719 719
 	}
720 720
 
721
-	$sql .=" AND u.status != ".ANONYMOUS." ";
721
+	$sql .= " AND u.status != ".ANONYMOUS." ";
722 722
 
723 723
 	// Sorting and pagination (used by the sortable table)
724 724
 	$sql .= " ORDER BY col$column $direction ";
725 725
 	$sql .= " LIMIT $from,$number_of_items";
726 726
 
727 727
 	$res = Database::query($sql);
728
-	$users = array ();
728
+	$users = array();
729 729
 	while ($user = Database::fetch_row($res)) {
730 730
 		$users[] = $user;
731 731
 		$_SESSION['session_user_id'][] = $user[0];
@@ -736,12 +736,12 @@  discard block
 block discarded – undo
736 736
 		}
737 737
 	}
738 738
 	// adding additional users based on the search on the additional profile fields
739
-	if (isset($_REQUEST['keyword'])){
739
+	if (isset($_REQUEST['keyword'])) {
740 740
 		if (is_array($additional_users)) {
741
-			foreach($additional_users as $additional_user_key=>$additional_user_value){
741
+			foreach ($additional_users as $additional_user_key=>$additional_user_value) {
742 742
 				if (!in_array($additional_user_key, $_SESSION['session_user_id']) &&
743
-                    !in_array($additional_user_key,$users_of_course)
744
-                ){
743
+                    !in_array($additional_user_key, $users_of_course)
744
+                ) {
745 745
                     $users[] = array(
746 746
                         $additional_user_value['col0'],
747 747
                         $additional_user_value['col1'],
@@ -792,20 +792,20 @@  discard block
 block discarded – undo
792 792
 
793 793
 function active_filter($active, $url_params, $row) {
794 794
 	$_user = api_get_user_info();
795
-	if ($active=='1') {
796
-		$action='AccountActive';
797
-		$image='accept';
795
+	if ($active == '1') {
796
+		$action = 'AccountActive';
797
+		$image = 'accept';
798 798
 	}
799 799
 
800
-	if ($active=='0') {
801
-		$action='AccountInactive';
802
-		$image='error';
800
+	if ($active == '0') {
801
+		$action = 'AccountInactive';
802
+		$image = 'error';
803 803
 	}
804 804
     $result = null;
805
-	if ($row['0']<>$_user['user_id']) {
805
+	if ($row['0'] <> $_user['user_id']) {
806 806
 	// you cannot lock yourself out otherwise you could disable all the accounts
807 807
 	// including your own => everybody is locked out and nobody can change it anymore.
808
-		$result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
808
+		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array(), ICON_SIZE_TINY);
809 809
 	}
810 810
 	return $result;
811 811
 }
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
 		$profiling_field_options_exact_values[] = $profiling_field_options;
840 840
 	}
841 841
     $profiling_field_options_exact_values_sql = '';
842
-	foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue){
842
+	foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue) {
843 843
 		$profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
844 844
 	}
845 845
 
@@ -880,9 +880,9 @@  discard block
 block discarded – undo
880 880
 function display_extra_profile_fields_filter()
881 881
 {
882 882
 	// getting all the additional user profile fields
883
-	$extra = UserManager::get_extra_fields(0,50,5,'ASC');
883
+	$extra = UserManager::get_extra_fields(0, 50, 5, 'ASC');
884 884
 
885
-	$return='<option value="">'.get_lang('SelectFilter').'</option>';
885
+	$return = '<option value="">'.get_lang('SelectFilter').'</option>';
886 886
 
887 887
 	// looping through the additional user profile fields
888 888
 	foreach ($extra as $id => $field_details) {
@@ -898,7 +898,7 @@  discard block
 block discarded – undo
898 898
 			case ExtraField::FIELD_TYPE_SELECT:
899 899
 			case ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
900 900
 				$return .= '<optgroup label="'.$field_details[3].'">';
901
-				foreach($field_details[9] as $option_id => $option_details) {
901
+				foreach ($field_details[9] as $option_id => $option_details) {
902 902
 					if ($_GET['subscribe_user_filter_value'] == $field_details[0].'*'.$option_details[1]) {
903 903
 						$selected = 'selected="selected"';
904 904
 					} else {
Please login to merge, or discard this patch.
main/user/subscribe_class.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
     $courseCode = api_get_course_id();
52 52
 
53 53
     $sql = "SELECT * FROM $course_class_table
54
-            WHERE course_code = '" . $courseCode. "'";
54
+            WHERE course_code = '".$courseCode."'";
55 55
     $res = Database::query($sql);
56 56
     $subscribed_classes = array();
57 57
     while ($obj = Database::fetch_object($res)) {
@@ -60,10 +60,10 @@  discard block
 block discarded – undo
60 60
     $sql = "SELECT c.id	FROM $class_table c WHERE 1 = 1";
61 61
     if (isset($_GET['keyword'])) {
62 62
         $keyword = Database::escape_string(trim($_GET['keyword']));
63
-        $sql .= " AND (c.name LIKE '%" . $keyword . "%')";
63
+        $sql .= " AND (c.name LIKE '%".$keyword."%')";
64 64
     }
65 65
     if (count($subscribed_classes) > 0) {
66
-        $sql .= " AND c.id NOT IN ('" . implode("','", $subscribed_classes) . "')";
66
+        $sql .= " AND c.id NOT IN ('".implode("','", $subscribed_classes)."')";
67 67
     }
68 68
     $res = Database::query($sql);
69 69
     $result = Database::num_rows($res);
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
     $class_user_table = Database :: get_main_table(TABLE_MAIN_CLASS_USER);
82 82
     $courseCode = api_get_course_id();
83 83
 
84
-    $sql = "SELECT * FROM $course_class_table WHERE course_code = '" . $courseCode . "'";
84
+    $sql = "SELECT * FROM $course_class_table WHERE course_code = '".$courseCode."'";
85 85
     $res = Database::query($sql);
86 86
     $subscribed_classes = array();
87 87
     while ($obj = Database::fetch_object($res)) {
@@ -97,10 +97,10 @@  discard block
 block discarded – undo
97 97
     $sql .= " WHERE 1 = 1";
98 98
     if (isset($_GET['keyword'])) {
99 99
         $keyword = Database::escape_string(trim($_GET['keyword']));
100
-        $sql .= " AND (c.name LIKE '%" . $keyword . "%')";
100
+        $sql .= " AND (c.name LIKE '%".$keyword."%')";
101 101
     }
102 102
     if (count($subscribed_classes) > 0) {
103
-        $sql .= " AND c.id NOT IN ('" . implode("','", $subscribed_classes) . "')";
103
+        $sql .= " AND c.id NOT IN ('".implode("','", $subscribed_classes)."')";
104 104
     }
105 105
     $sql .= " GROUP BY c.id, c.name ";
106 106
     $sql .= " ORDER BY col$column $direction ";
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
  * @return string Some HTML-code
120 120
  */
121 121
 function reg_filter($class_id) {
122
-    $result = "<a href=\"" . api_get_self() . "?register=yes&amp;class_id=" . $class_id . "\">" . get_lang("reg") . "</a>";
122
+    $result = "<a href=\"".api_get_self()."?register=yes&amp;class_id=".$class_id."\">".get_lang("reg")."</a>";
123 123
     return $result;
124 124
 }
125 125
 
Please login to merge, or discard this patch.
plugin/openmeetings/lang/english.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 $strings['VideoConferenceAddedToTheCalendar']   = "Videoconference added to the calendar";
21 21
 $strings['VideoConferenceAddedToTheLinkTool']   = "Videoconference added to the link tool";
22 22
 
23
-$strings['GoToTheVideoConference']   = "Go to the videoconference";
23
+$strings['GoToTheVideoConference'] = "Go to the videoconference";
24 24
 
25 25
 $strings['Records']             = "Recording";
26 26
 $strings['Meeting']             = "Meeting";
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 $strings['EnterConference']     = "Enter the videoconference";
32 32
 $strings['RecordList']          = "Recording list";
33 33
 $strings['ServerIsNotRunning']  = "Videoconference server is not running";
34
-$strings['ServerIsNotConfigured']  = "Videoconference server is not configured";
34
+$strings['ServerIsNotConfigured'] = "Videoconference server is not configured";
35 35
 
36 36
 $strings['XUsersOnLine']        = "%s user(s) online";
37 37
 
Please login to merge, or discard this patch.