Completed
Pull Request — 1.11.x (#1274)
by José
554:53 queued 513:46
created
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.
plugin/openmeetings/lang/french.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 $strings['VideoConferenceAddedToTheCalendar']   = "Vidéoconférence ajoutée au calendrier";
14 14
 $strings['VideoConferenceAddedToTheLinkTool']   = "Vidéoconférence ajoutée comme lien. Vous pouvez éditer et publier le lien sur la page principale du cours depuis l'outil liens.";
15 15
 
16
-$strings['GoToTheVideoConference']   = "Entrer dans la salle de conférence";
16
+$strings['GoToTheVideoConference'] = "Entrer dans la salle de conférence";
17 17
 
18 18
 $strings['Records']             = "Enregistrement";
19 19
 $strings['Meeting']             = "Salle de conférence";
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 $strings['EnterConference']     = "Entrer dans la salle de conférence";
25 25
 $strings['RecordList']          = "Liste des enregistrements";
26 26
 $strings['ServerIsNotRunning']  = "Le serveur de vidéoconférence ne fonctionne pas";
27
-$strings['ServerIsNotConfigured']  = "Le serveur de vidéoconférence n'est pas configuré correctement";
27
+$strings['ServerIsNotConfigured'] = "Le serveur de vidéoconférence n'est pas configuré correctement";
28 28
 
29 29
 $strings['XUsersOnLine']        = "%s utilisateurs dans la salle";
30 30
 
Please login to merge, or discard this patch.
plugin/openmeetings/lang/spanish.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 $strings['VideoConferenceAddedToTheCalendar']   = "Videoconferencia añadida al calendario";
14 14
 $strings['VideoConferenceAddedToTheLinkTool']   = "Videoconferencia añadida como enlace. Puede editar y publicar el enlace en la página principal del curso desde la herramienta de enlace.";
15 15
 
16
-$strings['GoToTheVideoConference']   = "Ir a la videoconferencia";
16
+$strings['GoToTheVideoConference'] = "Ir a la videoconferencia";
17 17
 
18 18
 $strings['Records']             = "Grabación";
19 19
 $strings['Meeting']             = "Sala de conferencia";
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 $strings['EnterConference']     = "Entrar a la videoconferencia";
25 25
 $strings['RecordList']          = "Lista de grabaciones";
26 26
 $strings['ServerIsNotRunning']  = "El servidor de videoconferencia no está funcionando";
27
-$strings['ServerIsNotConfigured']  = "El servidor de videoconferencia no está configurado correctamente";
27
+$strings['ServerIsNotConfigured'] = "El servidor de videoconferencia no está configurado correctamente";
28 28
 
29 29
 $strings['XUsersOnLine']        = "%s usuario(s) en la sala";
30 30
 
Please login to merge, or discard this patch.
plugin/createdrupaluser/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,6 +5,6 @@
 block discarded – undo
5 5
  * @author Imanol Losada Oriol <[email protected]>
6 6
  * @package chamilo.plugin.skype
7 7
  */
8
-require_once __DIR__ . '/config.php';
8
+require_once __DIR__.'/config.php';
9 9
 
10 10
 Skype::create()->install();
Please login to merge, or discard this patch.
plugin/createdrupaluser/config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,4 +6,4 @@
 block discarded – undo
6 6
  * @package chamilo.plugin.skype
7 7
  */
8 8
 
9
-require_once api_get_path(SYS_PATH) . 'main/inc/global.inc.php';
9
+require_once api_get_path(SYS_PATH).'main/inc/global.inc.php';
Please login to merge, or discard this patch.
plugin/createdrupaluser/install.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,6 +5,6 @@
 block discarded – undo
5 5
  * @author Imanol Losada Oriol <[email protected]>
6 6
  * @package chamilo.plugin.skype
7 7
  */
8
-require_once __DIR__ . '/config.php';
8
+require_once __DIR__.'/config.php';
9 9
 
10 10
 Skype::create()->install();
Please login to merge, or discard this patch.