Completed
Pull Request — 1.11.x (#1262)
by José
41:21
created
main/inc/ajax/online.ajax.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 
5 5
 $action = $_GET['a'];
6 6
 
7
-switch($action) {
7
+switch ($action) {
8 8
     case 'load_online_user':
9 9
         if (isset($_SESSION['who_is_online_counter'])) {
10 10
             $_SESSION['who_is_online_counter']++;
@@ -14,8 +14,8 @@  discard block
 block discarded – undo
14 14
         $images_to_show = 9;
15 15
 
16 16
         $page = intval($_REQUEST['online_page_nr']);
17
-        $max_page = ceil(who_is_online_count()/$images_to_show);
18
-        $page_rows = ($page-1)*9;
17
+        $max_page = ceil(who_is_online_count() / $images_to_show);
18
+        $page_rows = ($page - 1) * 9;
19 19
 
20 20
         if (!empty($max_page) && $page <= $max_page) {
21 21
             if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
Please login to merge, or discard this patch.
main/inc/ajax/message.ajax.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,11 +37,11 @@  discard block
 block discarded – undo
37 37
             break;
38 38
         }
39 39
         $track_online_table      = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE);
40
-        $tbl_my_user		     = Database::get_main_table(TABLE_MAIN_USER);
40
+        $tbl_my_user = Database::get_main_table(TABLE_MAIN_USER);
41 41
         $tbl_my_user_friend      = Database::get_main_table(TABLE_MAIN_USER_REL_USER);
42
-        $tbl_user 			     = Database::get_main_table(TABLE_MAIN_USER);
42
+        $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
43 43
         $tbl_access_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
44
-        $search				     = Database::escape_string($_REQUEST['q']);
44
+        $search = Database::escape_string($_REQUEST['q']);
45 45
 
46 46
         $access_url_id           = api_get_multiple_access_url() == 'true' ? api_get_current_access_url_id() : 1;
47 47
         $user_id                 = api_get_user_id();
@@ -49,9 +49,9 @@  discard block
 block discarded – undo
49 49
 
50 50
         $likeCondition = " AND (firstname LIKE '%$search%' OR lastname LIKE '%$search%' OR email LIKE '%$search%') ";
51 51
 
52
-        if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool') == 'true') {
52
+        if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {
53 53
             // All users
54
-            if (api_get_setting('allow_send_message_to_all_platform_users') == 'true' || api_is_platform_admin() ) {
54
+            if (api_get_setting('allow_send_message_to_all_platform_users') == 'true' || api_is_platform_admin()) {
55 55
                 if ($access_url_id != 0) {
56 56
                     $sql = "SELECT DISTINCT u.user_id as id, u.firstname, u.lastname, u.email
57 57
                             FROM $tbl_user u LEFT JOIN $tbl_access_url_rel_user r ON u.user_id = r.user_id
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
                                 $likeCondition";
98 98
                 }
99 99
             }
100
-        } elseif (api_get_setting('allow_social_tool')=='false' && api_get_setting('allow_message_tool')=='true') {
100
+        } elseif (api_get_setting('allow_social_tool') == 'false' && api_get_setting('allow_message_tool') == 'true') {
101 101
             if (api_get_setting('allow_send_message_to_all_platform_users') == 'true') {
102 102
                 $sql = "SELECT DISTINCT u.user_id as id, u.firstname, u.lastname, u.email
103 103
                         FROM $tbl_user u LEFT JOIN $tbl_access_url_rel_user r ON u.user_id = r.user_id
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
                             $likeCondition ";
109 109
             } else {
110 110
                 $time_limit = api_get_setting('time_limit_whosonline');
111
-                $online_time = time() - $time_limit*60;
111
+                $online_time = time() - $time_limit * 60;
112 112
                 $limit_date	 = api_get_utc_datetime($online_time);
113 113
                 $sql = "SELECT SELECT DISTINCT u.user_id as id, u.firstname, u.lastname, u.email
114 114
                         FROM $tbl_my_user u INNER JOIN $track_online_table t
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
                         $likeCondition";
118 118
             }
119 119
         }
120
-        $sql .=' LIMIT 20';
120
+        $sql .= ' LIMIT 20';
121 121
         $result = Database::query($sql);
122 122
 
123 123
         $showEmail = api_get_setting('show_email_addresses');
Please login to merge, or discard this patch.
main/inc/ajax/admin.ajax.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
             $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $urlInfo['url']));
51 51
             $cleanUrl = str_replace('/', '-', $url);
52 52
 
53
-            $newUrlDir = api_get_path(SYS_APP_PATH) . "home/$cleanUrl/admin/";
53
+            $newUrlDir = api_get_path(SYS_APP_PATH)."home/$cleanUrl/admin/";
54 54
         } else {
55
-            $newUrlDir = api_get_path(SYS_APP_PATH) . "home/admin/";
55
+            $newUrlDir = api_get_path(SYS_APP_PATH)."home/admin/";
56 56
         }
57 57
 
58 58
         if (!file_exists($newUrlDir)) {
@@ -166,15 +166,15 @@  discard block
 block discarded – undo
166 166
             }
167 167
 
168 168
             if ($system_version != $version_info) {
169
-                $output = '<br /><span style="color:red">' . get_lang('YourVersionNotUpToDate') . '. '.get_lang('LatestVersionIs').' <b>Chamilo '.$version_info.'</b>. '.get_lang('YourVersionIs').' <b>Chamilo '.$system_version. '</b>. '.str_replace('http://www.chamilo.org', '<a href="http://www.chamilo.org">http://www.chamilo.org</a>', get_lang('PleaseVisitOurWebsite')).'</span>';
169
+                $output = '<br /><span style="color:red">'.get_lang('YourVersionNotUpToDate').'. '.get_lang('LatestVersionIs').' <b>Chamilo '.$version_info.'</b>. '.get_lang('YourVersionIs').' <b>Chamilo '.$system_version.'</b>. '.str_replace('http://www.chamilo.org', '<a href="http://www.chamilo.org">http://www.chamilo.org</a>', get_lang('PleaseVisitOurWebsite')).'</span>';
170 170
             } else {
171 171
                 $output = '<br /><span style="color:green">'.get_lang('VersionUpToDate').': Chamilo '.$version_info.'</span>';
172 172
             }
173 173
         } else {
174
-            $output = '<span style="color:red">' . get_lang('ImpossibleToContactVersionServerPleaseTryAgain') . '</span>';
174
+            $output = '<span style="color:red">'.get_lang('ImpossibleToContactVersionServerPleaseTryAgain').'</span>';
175 175
         }
176 176
     } else {
177
-        $output = '<span style="color:red">' . get_lang('AllowurlfopenIsSetToOff') . '</span>';
177
+        $output = '<span style="color:red">'.get_lang('AllowurlfopenIsSetToOff').'</span>';
178 178
     }
179 179
     return $output;
180 180
 }
@@ -197,17 +197,17 @@  discard block
 block discarded – undo
197 197
     $getdata_str = count($getdata) ? '?' : '';
198 198
 
199 199
     foreach ($getdata as $k => $v) {
200
-                $getdata_str .= urlencode($k) .'='. urlencode($v) . '&';
200
+                $getdata_str .= urlencode($k).'='.urlencode($v).'&';
201 201
     }
202 202
 
203 203
     $crlf = "\r\n";
204
-    $req = $verb .' '. $uri . $getdata_str .' HTTP/1.1' . $crlf;
205
-    $req .= 'Host: '. $ip . $crlf;
206
-    $req .= 'User-Agent: Mozilla/5.0 Firefox/3.6.12' . $crlf;
207
-    $req .= 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' . $crlf;
208
-    $req .= 'Accept-Language: en-us,en;q=0.5' . $crlf;
209
-    $req .= 'Accept-Encoding: deflate' . $crlf;
210
-    $req .= 'Accept-Charset: utf-8;q=0.7,*;q=0.7' . $crlf;
204
+    $req = $verb.' '.$uri.$getdata_str.' HTTP/1.1'.$crlf;
205
+    $req .= 'Host: '.$ip.$crlf;
206
+    $req .= 'User-Agent: Mozilla/5.0 Firefox/3.6.12'.$crlf;
207
+    $req .= 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'.$crlf;
208
+    $req .= 'Accept-Language: en-us,en;q=0.5'.$crlf;
209
+    $req .= 'Accept-Encoding: deflate'.$crlf;
210
+    $req .= 'Accept-Charset: utf-8;q=0.7,*;q=0.7'.$crlf;
211 211
 
212 212
     $req .= $crlf;
213 213
 
Please login to merge, or discard this patch.
main/inc/ajax/exercise.ajax.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -30,10 +30,10 @@  discard block
 block discarded – undo
30 30
         $exercise_id = intval($_GET['exercise_id']);
31 31
         $page = intval($_REQUEST['page']); //page
32 32
         $limit = intval($_REQUEST['rows']); //quantity of rows
33
-        $sidx = $_REQUEST['sidx'];         //index to filter
34
-        $sord = $_REQUEST['sord'];         //asc or desc
33
+        $sidx = $_REQUEST['sidx']; //index to filter
34
+        $sord = $_REQUEST['sord']; //asc or desc
35 35
 
36
-        if (!in_array($sord, array('asc','desc'))) {
36
+        if (!in_array($sord, array('asc', 'desc'))) {
37 37
             $sord = 'desc';
38 38
         }
39 39
         // get index row - i.e. user click to sort $sord = $_GET['sord'];
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
         $total_pages = 0;
63 63
         if ($count > 0) {
64 64
             if (!empty($limit)) {
65
-                $total_pages = ceil($count/$limit);
65
+                $total_pages = ceil($count / $limit);
66 66
             }
67 67
         }
68 68
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
         $response->page = $page;
125 125
         $response->total = $total_pages;
126 126
         $response->records = $count;
127
-        $i=0;
127
+        $i = 0;
128 128
 
129 129
         if (!empty($results)) {
130 130
             foreach ($results as $row) {
@@ -138,22 +138,22 @@  discard block
 block discarded – undo
138 138
                             GROUP by question_id
139 139
                         ) as count_table";
140 140
                 $result_count = Database::query($sql);
141
-                $count_questions = Database::fetch_array($result_count,'ASSOC');
141
+                $count_questions = Database::fetch_array($result_count, 'ASSOC');
142 142
                 $count_questions = $count_questions['count_question_id'];
143 143
 
144 144
                 $row['count_questions'] = $count_questions;
145 145
 
146 146
                 $response->rows[$i]['id'] = $row['exe_id'];
147
-                $remaining = strtotime($row['start_date'])+($oExe->expired_time*60) - strtotime(api_get_utc_datetime(time()));
148
-                $h = floor($remaining/3600);
149
-                $m = floor(($remaining - ($h*3600))/60);
150
-                $s = ($remaining - ($h*3600) - ($m*60));
147
+                $remaining = strtotime($row['start_date']) + ($oExe->expired_time * 60) - strtotime(api_get_utc_datetime(time()));
148
+                $h = floor($remaining / 3600);
149
+                $m = floor(($remaining - ($h * 3600)) / 60);
150
+                $s = ($remaining - ($h * 3600) - ($m * 60));
151 151
                 $array = array(
152 152
                     $row['firstname'],
153 153
                     $row['lastname'],
154
-                    api_format_date($row['start_date'], DATE_TIME_FORMAT_LONG).' ['.($h>0?$h.':':'').sprintf("%02d",$m).':'.sprintf("%02d",$s).']',
154
+                    api_format_date($row['start_date'], DATE_TIME_FORMAT_LONG).' ['.($h > 0 ? $h.':' : '').sprintf("%02d", $m).':'.sprintf("%02d", $s).']',
155 155
                     $row['count_questions'],
156
-                    round($row['score']*100).'%'
156
+                    round($row['score'] * 100).'%'
157 157
                 );
158 158
                 $response->rows[$i]['cell'] = $array;
159 159
                 $i++;
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
         break;
210 210
     case 'add_question_to_reminder':
211 211
         /** @var Exercise $objExercise */
212
-        $objExercise  = $_SESSION['objExercise'];
212
+        $objExercise = $_SESSION['objExercise'];
213 213
         if (empty($objExercise)) {
214 214
             echo 0;
215 215
             exit;
@@ -362,8 +362,8 @@  discard block
 block discarded – undo
362 362
                 $objQuestionTmp = Question::read($my_question_id, $course_id);
363 363
 
364 364
                 // Getting free choice data.
365
-                if ($objQuestionTmp->type  == FREE_ANSWER && $type == 'all') {
366
-                    $my_choice = isset($_REQUEST['free_choice'][$my_question_id]) && !empty($_REQUEST['free_choice'][$my_question_id]) ? $_REQUEST['free_choice'][$my_question_id]: null;
365
+                if ($objQuestionTmp->type == FREE_ANSWER && $type == 'all') {
366
+                    $my_choice = isset($_REQUEST['free_choice'][$my_question_id]) && !empty($_REQUEST['free_choice'][$my_question_id]) ? $_REQUEST['free_choice'][$my_question_id] : null;
367 367
                 }
368 368
 
369 369
                 if ($type == 'all') {
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
                         $session_id,
408 408
                         $my_question_id
409 409
                     );
410
-                    if ($objQuestionTmp->type  == HOT_SPOT) {
410
+                    if ($objQuestionTmp->type == HOT_SPOT) {
411 411
                         Event::delete_attempt_hotspot(
412 412
                             $exe_id,
413 413
                             api_get_user_id(),
Please login to merge, or discard this patch.
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/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.