Passed
Push — 1.10.x ( a2cc02...b21e58 )
by Yannick
608:36 queued 565:17
created
main/inc/ajax/chat.ajax.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
  * Responses to AJAX calls
6 6
  */
7 7
 
8
-$_dont_save_user_course_access  = true;
8
+$_dont_save_user_course_access = true;
9 9
 
10 10
 require_once '../global.inc.php';
11 11
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 }
35 35
 
36 36
 $to_user_id = isset($_REQUEST['to']) ? $_REQUEST['to'] : null;
37
-$message	= isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
37
+$message = isset($_REQUEST['message']) ? $_REQUEST['message'] : null;
38 38
 
39 39
 if (!isset($_SESSION['chatHistory'])) {
40 40
     $_SESSION['chatHistory'] = array();
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 }
46 46
 
47 47
 $chat = new Chat();
48
-if (chat::disableChat()){
48
+if (chat::disableChat()) {
49 49
     exit;
50 50
 }
51 51
 if ($chat->is_chat_blocked_by_exercises()) {
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
             $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
86 86
         }
87 87
 
88
-        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
88
+        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH)."chat/video.php?room={$room['id']}";
89 89
         $videoChatLink = Display::url(
90
-            Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
90
+            Display::returnFontAwesomeIcon('video-camera').get_lang('StartVideoChat'),
91 91
             $videoChatUrl
92 92
         );
93 93
 
Please login to merge, or discard this patch.
main/inc/ajax/myspace.ajax.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,9 +58,9 @@
 block discarded – undo
58 58
             $db['is_empty'] = false;
59 59
             $db['result'] = convert_to_string($sql_result);
60 60
             $rst = get_stats($user_id, $course_code, $start_date, $end_date);
61
-            $foo_stats = '<strong>' . get_lang('Total') . ': </strong>' . $rst['total'] . '<br />';
62
-            $foo_stats .= '<strong>' . get_lang('Average') . ': </strong>' . $rst['avg'] . '<br />';
63
-            $foo_stats .= '<strong>' . get_lang('Quantity') . ' : </strong>' . $rst['times'] . '<br />';
61
+            $foo_stats = '<strong>'.get_lang('Total').': </strong>'.$rst['total'].'<br />';
62
+            $foo_stats .= '<strong>'.get_lang('Average').': </strong>'.$rst['avg'].'<br />';
63
+            $foo_stats .= '<strong>'.get_lang('Quantity').' : </strong>'.$rst['times'].'<br />';
64 64
             $db['stats'] = $foo_stats;
65 65
             $db['graph_result'] = grapher($sql_result, $start_date, $end_date, $type);
66 66
         } else {
Please login to merge, or discard this patch.
main/inc/ajax/user_manager.ajax.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
                 <div class="row">
59 59
                     <div class="col-sm-10 col-sm-offset-2">
60 60
                         <a class="btn btn-primary" id="send_message_link">
61
-                            <em class="fa fa-envelope"></em> ' . get_lang('Send') . '
61
+                            <em class="fa fa-envelope"></em> ' . get_lang('Send').'
62 62
                         </a>
63 63
                     </div>
64 64
                 </div>
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
             if (!empty($user_id)) {
114 114
                 $user_table = Database :: get_main_table(TABLE_MAIN_USER);
115
-                $sql="UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
115
+                $sql = "UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
116 116
                 $result = Database::query($sql);
117 117
 
118 118
                 //Send and email if account is active
@@ -122,13 +122,13 @@  discard block
 block discarded – undo
122 122
                     $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
123 123
                     $email_admin = api_get_setting('emailAdministrator');
124 124
                     $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
125
-                    $emailbody=get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";
125
+                    $emailbody = get_lang('Dear')." ".stripslashes($recipient_name).",\n\n";
126 126
 
127
-                    $emailbody.=sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
128
-                    $emailbody.=sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
129
-                    $emailbody.=get_lang('HaveFun')."\n\n";
127
+                    $emailbody .= sprintf(get_lang('YourAccountOnXHasJustBeenApprovedByOneOfOurAdministrators'), api_get_setting('siteName'))."\n";
128
+                    $emailbody .= sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
129
+                    $emailbody .= get_lang('HaveFun')."\n\n";
130 130
                     //$emailbody.=get_lang('Problem'). "\n\n". get_lang('SignatureFormula');
131
-                    $emailbody.=api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
131
+                    $emailbody .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator');
132 132
 
133 133
                     $additionalParameters = array(
134 134
                         'smsType' => SmsPlugin::ACCOUNT_APPROVED_CONNECT,
Please login to merge, or discard this patch.
main/inc/ajax/thematic.ajax.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 			}
99 99
 			$new_thematic_list = array();
100 100
 
101
-			foreach($thematic_list_temp as $item) {
102
-				if (!empty($item['attendance_id']) ) {
101
+			foreach ($thematic_list_temp as $item) {
102
+				if (!empty($item['attendance_id'])) {
103 103
 					$new_thematic_list[$item['id']] = array('attendance_id' =>$item['attendance_id'], 'start_date'=>$item['start_date']);
104 104
 				}
105 105
 			}
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 					//checking if was already taken
116 116
 					foreach ($new_thematic_list as $key => $thematic_item) {
117 117
 						//if ($calendar['db_date_time'] == $thematic_item['start_date'] && $calendar['attendance_id'] == $thematic_item['attendance_id'] ) {
118
-						if ($calendar['db_date_time'] == $thematic_item['start_date'] ) {
118
+						if ($calendar['db_date_time'] == $thematic_item['start_date']) {
119 119
 							$insert = false;
120 120
 							if ($thematic_advance_id == $key) {
121 121
 								$insert = true;
Please login to merge, or discard this patch.
main/inc/local.inc.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
     $_user['status']  = $uData['status'];
131 131
     Session::write('_user', $_user);
132 132
     Session::erase('conditional_login');
133
-    $uidReset=true;
133
+    $uidReset = true;
134 134
     Event::event_login($_user['user_id']);
135 135
 }
136 136
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 
213 213
             //is necessary verify check
214 214
             if ($legal_type == 1) {
215
-                if ((isset($_POST['legal_accept']) && $_POST['legal_accept']=='1')) {
215
+                if ((isset($_POST['legal_accept']) && $_POST['legal_accept'] == '1')) {
216 216
                     $legal_option = true;
217 217
                 } else {
218 218
                     $legal_option = false;
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 
222 222
             //no is check option
223 223
             if ($legal_type == 0) {
224
-                $legal_option=true;
224
+                $legal_option = true;
225 225
             }
226 226
 
227 227
             if (isset($_POST['legal_accept_type']) && $legal_option === true) {
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
                  * Process external authentication
515 515
                  * on the basis of the given login name
516 516
                  */
517
-                $loginFailed = true;  // Default initialisation. It could
517
+                $loginFailed = true; // Default initialisation. It could
518 518
                 // change after the external authentication
519 519
                 $key = $uData['auth_source']; //'ldap','shibboleth'...
520 520
                 /* >>>>>>>> External authentication modules <<<<<<<<< */
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
             }
534 534
         } else {
535 535
             // login failed, Database::num_rows($result) <= 0
536
-            $loginFailed = true;  // Default initialisation. It could
536
+            $loginFailed = true; // Default initialisation. It could
537 537
             // change after the external authentication
538 538
 
539 539
             /*
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
                         include_once($thisAuthSource['newUser']);
560 560
                     } else {
561 561
                         error_log(
562
-                            'Chamilo Authentication file '. $thisAuthSource['newUser'].
562
+                            'Chamilo Authentication file '.$thisAuthSource['newUser'].
563 563
                             ' could not be found - this might prevent your system from using'.
564 564
                             ' the authentication process in the user creation process',
565 565
                             0
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
             online_logout(null, false);
669 669
             $osso->logout(); //redirects and exits
670 670
         }
671
-    } elseif (api_get_setting('openid_authentication')=='true') {
671
+    } elseif (api_get_setting('openid_authentication') == 'true') {
672 672
         if (!empty($_POST['openid_url'])) {
673 673
             include api_get_path(SYS_CODE_PATH).'auth/openid/login.php';
674 674
             openid_begin(trim($_POST['openid_url']), api_get_path(WEB_PATH).'index.php');
@@ -681,7 +681,7 @@  discard block
 block discarded – undo
681 681
             if ($res['status'] == 'success') {
682 682
                 $id1 = Database::escape_string($res['openid.identity']);
683 683
                 //have another id with or without the final '/'
684
-                $id2 = (substr($id1, -1, 1)=='/'?substr($id1, 0, -1):$id1.'/');
684
+                $id2 = (substr($id1, -1, 1) == '/' ? substr($id1, 0, -1) : $id1.'/');
685 685
                 //lookup the user in the main database
686 686
                 $user_table = Database::get_main_table(TABLE_MAIN_USER);
687 687
                 $sql = "SELECT user_id, username, password, auth_source, active, expiration_date
@@ -690,14 +690,14 @@  discard block
 block discarded – undo
690 690
                         OR openid = '$id2' ";
691 691
                 $result = Database::query($sql);
692 692
                 if ($result !== false) {
693
-                    if (Database::num_rows($result)>0) {
693
+                    if (Database::num_rows($result) > 0) {
694 694
                         $uData = Database::fetch_array($result);
695 695
 
696 696
                         if ($uData['auth_source'] == PLATFORM_AUTH_SOURCE) {
697 697
                             //the authentification of this user is managed by Chamilo itself
698 698
 
699 699
                             // check if the account is active (not locked)
700
-                            if ($uData['active']=='1') {
700
+                            if ($uData['active'] == '1') {
701 701
                                 // check if the expiration date has not been reached
702 702
                                 if ($uData['expiration_date'] > date('Y-m-d H:i:s')
703 703
                                     || empty($uData['expiration_date'])
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
     (isset($_SESSION['_cid']) && $cidReq != $_SESSION['_cid']))
776 776
 ) {
777 777
     $cidReset = true;
778
-    $gidReset = true;    // As groups depend from courses, group id is reset
778
+    $gidReset = true; // As groups depend from courses, group id is reset
779 779
 }
780 780
 
781 781
 /* USER INIT */
@@ -864,8 +864,8 @@  discard block
 block discarded – undo
864 864
             $tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
865 865
 
866 866
             if (!empty($_GET['id_session'])) {
867
-                $sql = 'SELECT name FROM '.$tbl_session . '
868
-                        WHERE id="'.intval($_GET['id_session']) . '"';
867
+                $sql = 'SELECT name FROM '.$tbl_session.'
868
+                        WHERE id="'.intval($_GET['id_session']).'"';
869 869
                 $rs = Database::query($sql);
870 870
                 if (Database::num_rows($rs)) {
871 871
                     list($_SESSION['session_name']) = Database::fetch_array(
@@ -956,7 +956,7 @@  discard block
 block discarded – undo
956 956
         // Moreover, if we want to track a course with another session it can be usefull
957 957
         if (!empty($_GET['id_session']) && is_numeric($_GET['id_session'])) {
958 958
             $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
959
-            $sql = 'SELECT name FROM '.$tbl_session . ' WHERE id="'.intval($_GET['id_session']). '"';
959
+            $sql = 'SELECT name FROM '.$tbl_session.' WHERE id="'.intval($_GET['id_session']).'"';
960 960
             $rs = Database::query($sql);
961 961
             if (Database::num_rows($rs)) {
962 962
                 list($_SESSION['session_name']) = Database::fetch_array($rs);
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
1005 1005
                     $session_lifetime    = 3600; // 1 hour
1006 1006
                 }*/
1007 1007
 
1008
-                $session_lifetime    = 3600; // 1 hour
1008
+                $session_lifetime = 3600; // 1 hour
1009 1009
 
1010 1010
                 $course_code = $_course['sysCode'];
1011 1011
                 $time = api_get_utc_datetime();
@@ -1031,7 +1031,7 @@  discard block
 block discarded – undo
1031 1031
                         Database::query($sql);
1032 1032
                     } else {
1033 1033
                         $ip = api_get_real_ip();
1034
-                        $sql="INSERT INTO $course_tracking_table (c_id, user_ip, user_id, login_course_date, logout_course_date, counter, session_id)" .
1034
+                        $sql = "INSERT INTO $course_tracking_table (c_id, user_ip, user_id, login_course_date, logout_course_date, counter, session_id)".
1035 1035
                             "VALUES('".$_course['real_id']."', '".$ip."', '".$_user['user_id']."', '$time', '$time', '1','".api_get_session_id()."')";
1036 1036
                         Database::query($sql);
1037 1037
                     }
@@ -1096,8 +1096,8 @@  discard block
 block discarded – undo
1096 1096
         if (Database::num_rows($result) > 0) { // this  user have a recorded state for this course
1097 1097
             $cuData = Database::fetch_array($result, 'ASSOC');
1098 1098
 
1099
-            $is_courseAdmin = (bool)($cuData['status'] == 1);
1100
-            $is_courseTutor = (bool)($cuData['is_tutor'] == 1);
1099
+            $is_courseAdmin = (bool) ($cuData['status'] == 1);
1100
+            $is_courseTutor = (bool) ($cuData['is_tutor'] == 1);
1101 1101
             $is_courseMember = true;
1102 1102
         }
1103 1103
 
@@ -1108,7 +1108,7 @@  discard block
 block discarded – undo
1108 1108
                 // This user has no status related to this course
1109 1109
                 // The user is subscribed in a session? The user is a Session coach a Session admin ?
1110 1110
 
1111
-                $tbl_session  = Database :: get_main_table(TABLE_MAIN_SESSION);
1111
+                $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
1112 1112
                 $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
1113 1113
                 $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
1114 1114
 
@@ -1221,7 +1221,7 @@  discard block
 block discarded – undo
1221 1221
 
1222 1222
             //If I'm the admin platform i'm a teacher of the course
1223 1223
             if ($is_platformAdmin) {
1224
-                $is_courseAdmin     = true;
1224
+                $is_courseAdmin = true;
1225 1225
             }
1226 1226
         }
1227 1227
     } else { // keys missing => not anymore in the course - user relation
@@ -1379,12 +1379,12 @@  discard block
 block discarded – undo
1379 1379
     ($logging_in && exist_firstpage_parameter())
1380 1380
 ) {
1381 1381
     $redirectCourseDir = api_get_firstpage_parameter();
1382
-    api_delete_firstpage_parameter();    // delete the cookie
1382
+    api_delete_firstpage_parameter(); // delete the cookie
1383 1383
 
1384 1384
     if (!isset($_SESSION['request_uri'])) {
1385 1385
         if (CourseManager::get_course_id_from_path($redirectCourseDir)) {
1386 1386
             $_SESSION['noredirection'] = false;
1387
-            $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir . '/';
1387
+            $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH).$redirectCourseDir.'/';
1388 1388
         }
1389 1389
     }
1390 1390
 } elseif (api_user_is_login() && exist_firstpage_parameter()) {
@@ -1392,7 +1392,7 @@  discard block
 block discarded – undo
1392 1392
     api_delete_firstpage_parameter(); // delete the cookie
1393 1393
     if (CourseManager::get_course_id_from_path($redirectCourseDir)) {
1394 1394
         $_SESSION['noredirection'] = false;
1395
-        $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH) . $redirectCourseDir . '/';
1395
+        $_SESSION['request_uri'] = api_get_path(WEB_COURSE_PATH).$redirectCourseDir.'/';
1396 1396
     }
1397 1397
 }
1398 1398
 
Please login to merge, or discard this patch.
main/inc/lib/AnnouncementEmail.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -196,7 +196,7 @@
 block discarded – undo
196 196
      *
197 197
      * @return array
198 198
      */
199
-    public function sender($key = '',  $userId = '')
199
+    public function sender($key = '', $userId = '')
200 200
     {
201 201
         $_user = api_get_user_info($userId);
202 202
 
Please login to merge, or discard this patch.
main/inc/lib/custom_pages.class.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
      */
36 36
     public static function path($name = '')
37 37
     {
38
-        return api_get_path(SYS_PATH) . 'custompages/' . $name;
38
+        return api_get_path(SYS_PATH).'custompages/'.$name;
39 39
     }
40 40
 
41 41
     /**
@@ -50,12 +50,12 @@  discard block
 block discarded – undo
50 50
             return false;
51 51
         }
52 52
 
53
-        $file = self::path($page_name . '.php');
53
+        $file = self::path($page_name.'.php');
54 54
         if (file_exists($file)) {
55 55
             include($file);
56 56
             exit;
57 57
         } else {
58
-            error_log('CustomPages::displayPage : could not read file ' . $file);
58
+            error_log('CustomPages::displayPage : could not read file '.$file);
59 59
         }
60 60
     }
61 61
 
@@ -69,14 +69,14 @@  discard block
 block discarded – undo
69 69
     public static function getURLImages($url_id = null)
70 70
     {
71 71
         if (is_null($url_id)) {
72
-            $url = 'http://' . $_SERVER['HTTP_HOST'] . '/';
72
+            $url = 'http://'.$_SERVER['HTTP_HOST'].'/';
73 73
             $url_id = UrlManager::get_url_id($url);
74 74
         }
75
-        $url_images_dir = api_get_path(SYS_PATH) . 'custompages/url-images/';
75
+        $url_images_dir = api_get_path(SYS_PATH).'custompages/url-images/';
76 76
         $images = array();
77 77
         for ($img_id = 1; $img_id <= 3; $img_id++) {
78
-            if (file_exists($url_images_dir . $url_id . '_url_image_' . $img_id . '.png')) {
79
-                $images[] = api_get_path(WEB_PATH) . 'custompages/url-images/' . $url_id . '_url_image_' . $img_id . '.png';
78
+            if (file_exists($url_images_dir.$url_id.'_url_image_'.$img_id.'.png')) {
79
+                $images[] = api_get_path(WEB_PATH).'custompages/url-images/'.$url_id.'_url_image_'.$img_id.'.png';
80 80
             }
81 81
         }
82 82
 
Please login to merge, or discard this patch.
main/inc/lib/notification.lib.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
                 $newMessageText = '';
356 356
                 $linkToNewMessage = Display::url(
357 357
                     get_lang('SeeMessage'),
358
-                    api_get_path(WEB_CODE_PATH) . 'messages/inbox.php'
358
+                    api_get_path(WEB_CODE_PATH).'messages/inbox.php'
359 359
                 );
360 360
                 break;
361 361
             case self::NOTIFICATION_TYPE_MESSAGE:
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
                 }
371 371
                 $linkToNewMessage = Display::url(
372 372
                     get_lang('SeeMessage'),
373
-                    api_get_path(WEB_CODE_PATH) . 'messages/inbox.php'
373
+                    api_get_path(WEB_CODE_PATH).'messages/inbox.php'
374 374
                 );
375 375
                 break;
376 376
             case self::NOTIFICATION_TYPE_INVITATION:
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
                 }
386 386
                 $linkToNewMessage = Display::url(
387 387
                     get_lang('SeeInvitation'),
388
-                    api_get_path(WEB_CODE_PATH) . 'social/invitations.php'
388
+                    api_get_path(WEB_CODE_PATH).'social/invitations.php'
389 389
                 );
390 390
                 break;
391 391
             case self::NOTIFICATION_TYPE_GROUP:
Please login to merge, or discard this patch.
main/inc/lib/usermanager.lib.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     const USER_FIELD_TYPE_TIMEZONE = 11;
35 35
     const USER_FIELD_TYPE_SOCIAL_PROFILE = 12;
36 36
     const USER_FIELD_TYPE_FILE = 13;
37
-    const USER_FIELD_TYPE_MOBILE_PHONE_NUMBER  = 14;
37
+    const USER_FIELD_TYPE_MOBILE_PHONE_NUMBER = 14;
38 38
 
39 39
     private static $encryptionMethod;
40 40
 
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
         }
281 281
 
282 282
         if (empty($password)) {
283
-            Display::addFlash(Display::return_message(get_lang('ThisFieldIsRequired').': '.get_lang('Password') , 'warning'));
283
+            Display::addFlash(Display::return_message(get_lang('ThisFieldIsRequired').': '.get_lang('Password'), 'warning'));
284 284
 
285 285
             return false;
286 286
         }
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
         $sql = "UPDATE $table_user SET active = 1 WHERE id IN ($ids)";
759 759
         $r = Database::query($sql);
760 760
         if ($r !== false) {
761
-            Event::addEvent(LOG_USER_ENABLE,LOG_USER_ID,$ids);
761
+            Event::addEvent(LOG_USER_ENABLE, LOG_USER_ID, $ids);
762 762
         }
763 763
         return $r;
764 764
     }
@@ -1162,7 +1162,7 @@  discard block
 block discarded – undo
1162 1162
             // 1. Conversion of unacceptable letters (latinian letters with accents for example) into ASCII letters in order they not to be totally removed.
1163 1163
             // 2. Applying the strict purifier.
1164 1164
             // 3. Length limitation.
1165
-            $return  = api_get_setting('login_is_email') == 'true' ? substr(preg_replace(USERNAME_PURIFIER_MAIL, '', $username), 0, USERNAME_MAX_LENGTH) : substr(preg_replace(USERNAME_PURIFIER, '', $username), 0, USERNAME_MAX_LENGTH);
1165
+            $return = api_get_setting('login_is_email') == 'true' ? substr(preg_replace(USERNAME_PURIFIER_MAIL, '', $username), 0, USERNAME_MAX_LENGTH) : substr(preg_replace(USERNAME_PURIFIER, '', $username), 0, USERNAME_MAX_LENGTH);
1166 1166
             $return = URLify::transliterate($return);
1167 1167
             return $return;
1168 1168
         }
@@ -1254,12 +1254,12 @@  discard block
 block discarded – undo
1254 1254
 
1255 1255
         if (!is_null($order)) {
1256 1256
             $order = Database::escape_string($order);
1257
-            $sql .= ' ORDER BY ' . $order;
1257
+            $sql .= ' ORDER BY '.$order;
1258 1258
         }
1259 1259
 
1260 1260
         if (!is_null($limit)) {
1261 1261
             $limit = Database::escape_string($limit);
1262
-            $sql .= ' LIMIT ' . $limit;
1262
+            $sql .= ' LIMIT '.$limit;
1263 1263
         }
1264 1264
 
1265 1265
         $rs = Database::query($sql);
@@ -1432,7 +1432,7 @@  discard block
 block discarded – undo
1432 1432
             // In exceptional cases, on some portals, the intermediate base user
1433 1433
             // directory might not have been created. Make sure it is before
1434 1434
             // going further.
1435
-            $rootPath = api_get_path(SYS_UPLOAD_PATH) . 'users/' . substr((string) $id, 0, 1);
1435
+            $rootPath = api_get_path(SYS_UPLOAD_PATH).'users/'.substr((string) $id, 0, 1);
1436 1436
             if (!is_dir($rootPath)) {
1437 1437
                 $perm = api_get_permissions_for_new_directories();
1438 1438
                 try {
@@ -1685,7 +1685,7 @@  discard block
 block discarded – undo
1685 1685
         $path_info = self::get_user_picture_path_by_id($user_id, 'system');
1686 1686
         $path = $path_info['dir'];
1687 1687
         if (!empty($extra_field)) {
1688
-            $path .= $extra_field . '/';
1688
+            $path .= $extra_field.'/';
1689 1689
         }
1690 1690
         // If this directory does not exist - we create it.
1691 1691
         if (!file_exists($path)) {
@@ -1693,7 +1693,7 @@  discard block
 block discarded – undo
1693 1693
         }
1694 1694
 
1695 1695
         if (filter_extension($file)) {
1696
-            if (@move_uploaded_file($source_file,$path.$file)) {
1696
+            if (@move_uploaded_file($source_file, $path.$file)) {
1697 1697
                 if ($extra_field) {
1698 1698
                     return $extra_field.'/'.$file;
1699 1699
                 } else {
@@ -1944,10 +1944,10 @@  discard block
 block discarded – undo
1944 1944
         if (count($extra_files) > 0) {
1945 1945
             $extra_file_list = '<div class="files-production"><ul id="productions">';
1946 1946
             foreach ($extra_files as $file) {
1947
-                $filename = substr($file,strlen($extra_field)+1);
1947
+                $filename = substr($file, strlen($extra_field) + 1);
1948 1948
                 $extra_file_list .= '<li>'.Display::return_icon('archive.png').'<a href="'.$path.$extra_field.'/'.urlencode($filename).'" target="_blank">'.htmlentities($filename).'</a> ';
1949 1949
                 if ($showdelete) {
1950
-                    $extra_file_list .= '<input style="width:16px;" type="image" name="remove_extra_' . $extra_field . '['.urlencode($file).']" src="'.$del_image.'" alt="'.$del_text.'" title="'.$del_text.' '.htmlentities($filename).'" onclick="javascript: return confirmation(\''.htmlentities($filename).'\');" /></li>';
1950
+                    $extra_file_list .= '<input style="width:16px;" type="image" name="remove_extra_'.$extra_field.'['.urlencode($file).']" src="'.$del_image.'" alt="'.$del_text.'" title="'.$del_text.' '.htmlentities($filename).'" onclick="javascript: return confirmation(\''.htmlentities($filename).'\');" /></li>';
1951 1951
                 }
1952 1952
             }
1953 1953
             $extra_file_list .= '</ul></div>';
@@ -2531,7 +2531,7 @@  discard block
 block discarded – undo
2531 2531
 
2532 2532
         if (api_is_allowed_to_create_course()) {
2533 2533
             $sessionListFromCourseCoach = array();
2534
-            $sql =" SELECT DISTINCT session_id
2534
+            $sql = " SELECT DISTINCT session_id
2535 2535
                     FROM $tbl_session_course_user
2536 2536
                     WHERE user_id = $user_id AND status = 2 ";
2537 2537
 
@@ -2539,7 +2539,7 @@  discard block
 block discarded – undo
2539 2539
             if (Database::num_rows($result)) {
2540 2540
                 $result = Database::store_result($result);
2541 2541
                 foreach ($result as $session) {
2542
-                    $sessionListFromCourseCoach[]= $session['session_id'];
2542
+                    $sessionListFromCourseCoach[] = $session['session_id'];
2543 2543
                 }
2544 2544
             }
2545 2545
             if (!empty($sessionListFromCourseCoach)) {
@@ -2562,7 +2562,7 @@  discard block
 block discarded – undo
2562 2562
                 ORDER BY access_start_date, access_end_date, name";
2563 2563
 
2564 2564
         $result = Database::query($sql);
2565
-        if (Database::num_rows($result)>0) {
2565
+        if (Database::num_rows($result) > 0) {
2566 2566
             while ($row = Database::fetch_assoc($result)) {
2567 2567
                 $sessions[$row['id']] = $row;
2568 2568
             }
@@ -2578,7 +2578,7 @@  discard block
 block discarded – undo
2578 2578
                 ORDER BY access_start_date, access_end_date, name";
2579 2579
 
2580 2580
         $result = Database::query($sql);
2581
-        if (Database::num_rows($result)>0) {
2581
+        if (Database::num_rows($result) > 0) {
2582 2582
             while ($row = Database::fetch_assoc($result)) {
2583 2583
                 if (empty($sessions[$row['id']])) {
2584 2584
                     $sessions[$row['id']] = $row;
@@ -3567,13 +3567,13 @@  discard block
 block discarded – undo
3567 3567
         $useExtraFields = false;
3568 3568
         $extraFields = UserManager::get_extra_filtrable_fields();
3569 3569
         $extraFieldResult = array();
3570
-        if (is_array($extraFields) && count($extraFields)>0 ) {
3570
+        if (is_array($extraFields) && count($extraFields) > 0) {
3571 3571
             foreach ($extraFields as $extraField) {
3572 3572
                 $varName = 'field_'.$extraField['variable'];
3573 3573
                 if (UserManager::is_extra_field_available($extraField['variable'])) {
3574
-                    if (isset($_GET[$varName]) && $_GET[$varName]!='0') {
3574
+                    if (isset($_GET[$varName]) && $_GET[$varName] != '0') {
3575 3575
                         $useExtraFields = true;
3576
-                        $extraFieldResult[]= UserManager::get_extra_user_data_by_value(
3576
+                        $extraFieldResult[] = UserManager::get_extra_user_data_by_value(
3577 3577
                             $extraField['variable'],
3578 3578
                             $_GET[$varName]
3579 3579
                         );
@@ -3584,17 +3584,17 @@  discard block
 block discarded – undo
3584 3584
 
3585 3585
         if ($useExtraFields) {
3586 3586
             $finalResult = array();
3587
-            if (count($extraFieldResult)>1) {
3588
-                for ($i=0; $i < count($extraFieldResult) -1; $i++) {
3589
-                    if (is_array($extraFieldResult[$i+1])) {
3590
-                        $finalResult  = array_intersect($extraFieldResult[$i], $extraFieldResult[$i+1]);
3587
+            if (count($extraFieldResult) > 1) {
3588
+                for ($i = 0; $i < count($extraFieldResult) - 1; $i++) {
3589
+                    if (is_array($extraFieldResult[$i + 1])) {
3590
+                        $finalResult = array_intersect($extraFieldResult[$i], $extraFieldResult[$i + 1]);
3591 3591
                     }
3592 3592
                 }
3593 3593
             } else {
3594 3594
                 $finalResult = $extraFieldResult[0];
3595 3595
             }
3596 3596
 
3597
-            if (is_array($finalResult) && count($finalResult)>0) {
3597
+            if (is_array($finalResult) && count($finalResult) > 0) {
3598 3598
                 $whereFilter = " AND u.id IN  ('".implode("','", $finalResult)."') ";
3599 3599
             } else {
3600 3600
                 //no results
@@ -3767,7 +3767,7 @@  discard block
 block discarded – undo
3767 3767
             $sql = 'DELETE FROM '.$tbl_my_friend.'
3768 3768
                     WHERE relation_type <> '.USER_RELATION_TYPE_RRHH.' AND friend_user_id='.$friend_id.' '.$extra_condition;
3769 3769
             Database::query($sql);
3770
-            $sql= 'DELETE FROM '.$tbl_my_friend.'
3770
+            $sql = 'DELETE FROM '.$tbl_my_friend.'
3771 3771
                    WHERE relation_type <> '.USER_RELATION_TYPE_RRHH.' AND user_id='.$friend_id.' '.$extra_condition;
3772 3772
             Database::query($sql);
3773 3773
         } else {
@@ -3961,7 +3961,7 @@  discard block
 block discarded – undo
3961 3961
 
3962 3962
         if (!empty($lastConnectionDate)) {
3963 3963
             $lastConnectionDate = Database::escape_string($lastConnectionDate);
3964
-            $userConditions .=  " AND u.last_login <= '$lastConnectionDate' ";
3964
+            $userConditions .= " AND u.last_login <= '$lastConnectionDate' ";
3965 3965
         }
3966 3966
 
3967 3967
         $courseConditions = null;
@@ -4028,7 +4028,7 @@  discard block
 block discarded – undo
4028 4028
                 break;
4029 4029
             case STUDENT_BOSS :
4030 4030
                 $drhConditions = " AND friend_user_id = $userId AND "
4031
-                . "relation_type = " . USER_RELATION_TYPE_BOSS;
4031
+                . "relation_type = ".USER_RELATION_TYPE_BOSS;
4032 4032
                 break;
4033 4033
         }
4034 4034
 
@@ -4118,7 +4118,7 @@  discard block
 block discarded – undo
4118 4118
                 . "INNER JOIN $userRelAccessUrlTable a ON (a.user_id = s.user_id) "
4119 4119
                 . "WHERE friend_user_id = $userId "
4120 4120
                 . "AND relation_type = $relationType "
4121
-                . "AND access_url_id = " . api_get_current_access_url_id() . "";
4121
+                . "AND access_url_id = ".api_get_current_access_url_id()."";
4122 4122
         } else {
4123 4123
             $sql = "SELECT user_id FROM $userRelUserTable "
4124 4124
                 . "WHERE friend_user_id = $userId "
@@ -4393,7 +4393,7 @@  discard block
 block discarded – undo
4393 4393
         if (empty($years)) {
4394 4394
             $years = 1;
4395 4395
         }
4396
-        $inactive_time = $years * 31536000;  //1 year
4396
+        $inactive_time = $years * 31536000; //1 year
4397 4397
         $rs = Database::query($sql);
4398 4398
         if (Database::num_rows($rs) > 0) {
4399 4399
             if ($last_login_date = Database::result($rs, 0, 0)) {
@@ -4526,7 +4526,7 @@  discard block
 block discarded – undo
4526 4526
                         'extra_'.$field_details[1],
4527 4527
                         $field_details[3],
4528 4528
                         $options,
4529
-                        array('id' => 'extra_' . $field_details[1])
4529
+                        array('id' => 'extra_'.$field_details[1])
4530 4530
                     );
4531 4531
 
4532 4532
                     if (!$admin_permissions) {
@@ -4680,7 +4680,7 @@  discard block
 block discarded – undo
4680 4680
                     $extra_field = 'extra_'.$field_details[1];
4681 4681
                     $form->addElement('file', $extra_field, $field_details[3], null, '');
4682 4682
                     if ($extra_file_list = UserManager::build_user_extra_file_list($user_id, $field_details[1], '', true)) {
4683
-                        $form->addElement('static', $extra_field . '_list', null, $extra_file_list);
4683
+                        $form->addElement('static', $extra_field.'_list', null, $extra_file_list);
4684 4684
                     }
4685 4685
                     if ($field_details[7] == 0) {
4686 4686
                         $form->freeze($extra_field);
@@ -4820,7 +4820,7 @@  discard block
 block discarded – undo
4820 4820
         $direction = null,
4821 4821
         $active = null,
4822 4822
         $lastConnectionDate = null
4823
-    ){
4823
+    ) {
4824 4824
         return self::getUsersFollowedByUser(
4825 4825
                 $userId, $userStatus, $getOnlyUserId, $getSql, $getCount, $from, $numberItems, $column, $direction,
4826 4826
                 $active, $lastConnectionDate, STUDENT_BOSS
@@ -4987,12 +4987,12 @@  discard block
 block discarded – undo
4987 4987
         if (!empty($_SERVER['HTTPS'])) {
4988 4988
             $url = 'https://secure.gravatar.com/avatar/';
4989 4989
         }
4990
-        $url .= md5( strtolower( trim( $email ) ) );
4990
+        $url .= md5(strtolower(trim($email)));
4991 4991
         $url .= "?s=$s&d=$d&r=$r";
4992
-        if ( $img ) {
4993
-            $url = '<img src="' . $url . '"';
4994
-            foreach ( $atts as $key => $val )
4995
-                $url .= ' ' . $key . '="' . $val . '"';
4992
+        if ($img) {
4993
+            $url = '<img src="'.$url.'"';
4994
+            foreach ($atts as $key => $val)
4995
+                $url .= ' '.$key.'="'.$val.'"';
4996 4996
             $url .= ' />';
4997 4997
         }
4998 4998
         return $url;
Please login to merge, or discard this patch.