Completed
Push — 1.10.x ( c82817...6a93c3 )
by Yannick
202:42 queued 149:59
created
main/inc/ajax/skill.ajax.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
         $return_skills = array();
40 40
         foreach ($skills as $skill) {
41 41
             $skill['caption'] = $skill['name'];
42
-            $skill['value'] =  $skill['id'];
42
+            $skill['value'] = $skill['id'];
43 43
             $return_skills[] = $skill;
44 44
         }
45 45
         echo json_encode($return_skills);
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
         if (!empty($gradebooks)) {
52 52
             foreach ($gradebooks as $gradebook) {
53 53
                 if ($gradebook['parent_id'] == 0 && !empty($gradebook['certif_min_score']) && !empty($gradebook['document_id'])) {
54
-                    $gradebook_list[]  = $gradebook;
54
+                    $gradebook_list[] = $gradebook;
55 55
                     //$gradebook['name'] = $gradebook['name'];
56 56
                     //$gradebook_list[]  = $gradebook;
57 57
                 } else {
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         $return = array();
68 68
         foreach ($gradebooks as $item) {
69 69
             $item['caption'] = $item['name'];
70
-            $item['value'] =  $item['id'];
70
+            $item['value'] = $item['id'];
71 71
             $return[] = $item;
72 72
         }
73 73
         echo json_encode($return);
@@ -92,13 +92,13 @@  discard block
 block discarded – undo
92 92
         }
93 93
         break;
94 94
     case 'get_skills_by_profile':
95
-        $skill_rel_profile   = new SkillRelProfile();
95
+        $skill_rel_profile = new SkillRelProfile();
96 96
         $profile_id = isset($_REQUEST['profile_id']) ? $_REQUEST['profile_id'] : null;
97 97
         $skills = $skill_rel_profile->get_skills_by_profile($profile_id);
98 98
         echo json_encode($skills);
99 99
         break;
100 100
     case 'get_saved_profiles':
101
-        $skill_profile   = new SkillProfile();
101
+        $skill_profile = new SkillProfile();
102 102
         $profiles = $skill_profile->get_all();
103 103
         Display::display_no_header();
104 104
         Display::$global_template->assign('profiles', $profiles);
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
             $success = false;
188 188
         }
189 189
 
190
-        $result = array (
190
+        $result = array(
191 191
             'success' => $success,
192 192
             'data' => $return
193 193
         );
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
         $skills = $skill->get_direct_parents($id);
199 199
         $return = array();
200 200
         foreach ($skills as $skill) {
201
-            $return [$skill['data']['id']] = array (
201
+            $return [$skill['data']['id']] = array(
202 202
                 'id'        => $skill['data']['id'],
203 203
                 'parent_id' => $skill['data']['parent_id'],
204 204
                 'name'      => $skill['data']['name']
@@ -207,8 +207,8 @@  discard block
 block discarded – undo
207 207
         echo json_encode($return);
208 208
         break;
209 209
     case 'profile_matches':
210
-        $skill_rel_user  = new SkillRelUser();
211
-        $skills = (!empty($_REQUEST['skill_id'])?$_REQUEST['skill_id']:array());
210
+        $skill_rel_user = new SkillRelUser();
211
+        $skills = (!empty($_REQUEST['skill_id']) ? $_REQUEST['skill_id'] : array());
212 212
 
213 213
         $total_skills_to_search = $skills;
214 214
         $users  = $skill_rel_user->get_user_by_skills($skills);
Please login to merge, or discard this patch.
main/inc/ajax/forum.ajax.php 1 patch
Spacing   +5 added lines, -5 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 '../global.inc.php';
11
-require_once api_get_path(SYS_CODE_PATH) . 'forum/forumfunction.inc.php';
11
+require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
12 12
 
13 13
 // First, protect this script
14 14
 api_protect_course_script(false);
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
                     break;
64 64
                 }
65 65
                 // If pass all previous control, user can edit post
66
-                $courseId = isset($_REQUEST['c_id'])? intval($_REQUEST['c_id']) : api_get_course_int_id();
66
+                $courseId = isset($_REQUEST['c_id']) ? intval($_REQUEST['c_id']) : api_get_course_int_id();
67 67
                 $json['courseId'] = $courseId;
68
-                $forumId = isset($_REQUEST['forum'])? intval($_REQUEST['forum']) : null;
68
+                $forumId = isset($_REQUEST['forum']) ? intval($_REQUEST['forum']) : null;
69 69
                 $json['forum'] = $forumId;
70
-                $threadId = isset($_REQUEST['thread'])? intval($_REQUEST['thread']) : null;
70
+                $threadId = isset($_REQUEST['thread']) ? intval($_REQUEST['thread']) : null;
71 71
                 $json['thread'] = $threadId;
72
-                $postId = isset($_REQUEST['postId'])? intval($_REQUEST['postId']) : null;
72
+                $postId = isset($_REQUEST['postId']) ? intval($_REQUEST['postId']) : null;
73 73
                 $json['postId'] = $postId;
74 74
 
75 75
                 if (!empty($courseId) &&
Please login to merge, or discard this patch.
main/inc/ajax/link.ajax.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
             // set URL and other appropriate options
24 24
             $defaults = array(
25 25
                 CURLOPT_URL => $url,
26
-                CURLOPT_FOLLOWLOCATION => true,         // follow redirects accept youtube.com
26
+                CURLOPT_FOLLOWLOCATION => true, // follow redirects accept youtube.com
27 27
                 CURLOPT_HEADER => 0,
28 28
                 CURLOPT_RETURNTRANSFER => true,
29 29
                 CURLOPT_TIMEOUT => 4
Please login to merge, or discard this patch.
main/inc/ajax/session.ajax.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
             $list_sessions = SessionManager::get_sessions_by_user($user_id, true);
16 16
             if (!empty($list_sessions)) {
17 17
                 foreach ($list_sessions as $session_item) {
18
-                    echo $session_item['session_name'] . '<br />';
18
+                    echo $session_item['session_name'].'<br />';
19 19
                 }
20 20
             } else {
21 21
                 echo get_lang('NoSessionsForThisUser');
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
                 [
30 30
                     's.name' => [
31 31
                         'operator' => 'LIKE',
32
-                        'value' => "%" . $_REQUEST['q'] . "%"
32
+                        'value' => "%".$_REQUEST['q']."%"
33 33
                     ]
34 34
                 ]
35 35
             );
Please login to merge, or discard this patch.
main/inc/ajax/nanogong.ajax.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 $action = $_REQUEST['a'];
12 12
 
13 13
 unset($_REQUEST['a']);
14
-$js_path 		= api_get_path(WEB_LIBRARY_PATH).'javascript/';
14
+$js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
15 15
 
16 16
 //Fix in order to add the exe_id
17 17
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 				$user_info = api_get_user_info($nano->params['user_id']);
40 40
 				$name = get_lang('Quiz').'-'.$user_info['firstname'].'-'.$user_info['lastname'].'.'.$info['extension'];
41 41
 				$download = true;
42
-				if (isset($_REQUEST['download'])  && $_REQUEST['download'] == 0) {
42
+				if (isset($_REQUEST['download']) && $_REQUEST['download'] == 0) {
43 43
 					$download = false;
44 44
 				}
45 45
 				DocumentManager::file_send_for_download($file_path, $download);
Please login to merge, or discard this patch.
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/course.ajax.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
                     0, //howMany
74 74
                     1, //$orderby = 1
75 75
                     'ASC',
76
-                    -1,  //visibility
76
+                    -1, //visibility
77 77
                     $_GET['q'],
78 78
                     null, //$urlId
79 79
                     true //AlsoSearchCode
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
                 if (!empty($course['category_code'])) {
94 94
                     $parents = getParentsToString($course['category_code']);
95
-                    $title = $parents . $course['title'];
95
+                    $title = $parents.$course['title'];
96 96
                 }
97 97
 
98 98
                 $results['items'][] = array(
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
                     INNER JOIN $session_course_user r ON u.user_id = r.user_id
173 173
                     WHERE session_id = %d AND c_id =  '%s'
174 174
                     AND (u.firstname LIKE '%s' OR u.username LIKE '%s' OR u.lastname LIKE '%s')";
175
-            $needle = '%' . $_GET['q'] . '%';
175
+            $needle = '%'.$_GET['q'].'%';
176 176
             $sql_query = sprintf($sql, $_GET['session_id'], $course['real_id'], $needle, $needle, $needle);
177 177
 
178 178
             $result = Database::query($sql_query);
@@ -191,11 +191,11 @@  discard block
 block discarded – undo
191 191
     case 'search_exercise_by_course':
192 192
         if (api_is_platform_admin()) {
193 193
             $course = api_get_course_info_by_id($_GET['course_id']);
194
-            $session_id = (!empty($_GET['session_id'])) ?  intval($_GET['session_id']) : 0 ;
194
+            $session_id = (!empty($_GET['session_id'])) ? intval($_GET['session_id']) : 0;
195 195
             $exercises = ExerciseLib::get_all_exercises($course, $session_id, false, $_GET['q'], true, 3);
196 196
 
197 197
             foreach ($exercises as $exercise) {
198
-                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']) );
198
+                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']));
199 199
             }
200 200
             if (!empty($data)) {
201 201
                 $data[] = array('id' => 'T', 'text' => 'TODOS');
@@ -220,11 +220,11 @@  discard block
 block discarded – undo
220 220
                 $sql,
221 221
                 intval($_GET['course_id']),
222 222
                 intval($_GET['session_id']),
223
-                '%' . Database::escape_string($_GET['q']).'%'
223
+                '%'.Database::escape_string($_GET['q']).'%'
224 224
             );
225 225
             $result = Database::query($sql_query);
226 226
             while ($survey = Database::fetch_assoc($result)) {
227
-                $survey['title'] .= ($survey['anonymous'] == 1) ? ' (' . get_lang('Anonymous') . ')' : '';
227
+                $survey['title'] .= ($survey['anonymous'] == 1) ? ' ('.get_lang('Anonymous').')' : '';
228 228
                 $data[] = array(
229 229
                     'id' => $survey['id'],
230 230
                     'text' => strip_tags(html_entity_decode($survey['title']))
Please login to merge, or discard this patch.