Completed
Push — 1.11.x ( b5113d...148111 )
by José
54:42 queued 27:38
created
main/inc/ajax/chat.ajax.php 1 patch
Switch Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -55,56 +55,56 @@
 block discarded – undo
55 55
 }
56 56
 
57 57
 switch ($action) {
58
-    case 'chatheartbeat':
59
-        $chat->heartbeat();
60
-        break;
61
-    case 'closechat':
62
-        $chat->close();
63
-        break;
64
-    case 'sendchat':
65
-        $chat->send(api_get_user_id(), $to_user_id, $message);
66
-        break;
67
-    case 'startchatsession':
68
-        $chat->startSession();
69
-        break;
70
-    case 'set_status':
71
-        $status = isset($_REQUEST['status']) ? intval($_REQUEST['status']) : 0;
72
-        $chat->setUserStatus($status);
73
-        break;
74
-    case 'create_room':
75
-        $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
76
-
77
-        if ($room === false) {
78
-            $createdRoom = VideoChat::createRoom(api_get_user_id(), $to_user_id);
79
-
80
-            if ($createdRoom === false) {
81
-                echo Display::return_message(get_lang('ChatRoomNotCreated'), 'error');
82
-                break;
58
+        case 'chatheartbeat':
59
+            $chat->heartbeat();
60
+            break;
61
+        case 'closechat':
62
+            $chat->close();
63
+            break;
64
+        case 'sendchat':
65
+            $chat->send(api_get_user_id(), $to_user_id, $message);
66
+            break;
67
+        case 'startchatsession':
68
+            $chat->startSession();
69
+            break;
70
+        case 'set_status':
71
+            $status = isset($_REQUEST['status']) ? intval($_REQUEST['status']) : 0;
72
+            $chat->setUserStatus($status);
73
+            break;
74
+        case 'create_room':
75
+            $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
76
+
77
+            if ($room === false) {
78
+                $createdRoom = VideoChat::createRoom(api_get_user_id(), $to_user_id);
79
+
80
+                if ($createdRoom === false) {
81
+                    echo Display::return_message(get_lang('ChatRoomNotCreated'), 'error');
82
+                    break;
83
+                }
84
+
85
+                $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
83 86
             }
84 87
 
85
-            $room = VideoChat::getChatRoomByUsers(api_get_user_id(), $to_user_id);
86
-        }
87
-
88
-        $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
89
-        $videoChatLink = Display::url(
90
-            Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
91
-            $videoChatUrl
92
-        );
93
-
94
-        $chat->send(
95
-            api_get_user_id(),
96
-            $to_user_id,
97
-            $videoChatLink,
98
-            false,
99
-            false
100
-        );
101
-
102
-        echo Display::tag('p', $videoChatLink, ['class' => 'lead']);
103
-        break;
104
-    case 'notify_not_support':
105
-        $chat->send(api_get_user_id(), $to_user_id, get_lang('TheXUserBrowserDoesNotSupportWebRTC'));
106
-        break;
107
-    default:
108
-        echo '';
88
+            $videoChatUrl = api_get_path(WEB_LIBRARY_JS_PATH) . "chat/video.php?room={$room['id']}";
89
+            $videoChatLink = Display::url(
90
+                Display::returnFontAwesomeIcon('video-camera') . get_lang('StartVideoChat'),
91
+                $videoChatUrl
92
+            );
93
+
94
+            $chat->send(
95
+                api_get_user_id(),
96
+                $to_user_id,
97
+                $videoChatLink,
98
+                false,
99
+                false
100
+            );
101
+
102
+            echo Display::tag('p', $videoChatLink, ['class' => 'lead']);
103
+            break;
104
+        case 'notify_not_support':
105
+            $chat->send(api_get_user_id(), $to_user_id, get_lang('TheXUserBrowserDoesNotSupportWebRTC'));
106
+            break;
107
+        default:
108
+            echo '';
109 109
 }
110 110
 exit;
Please login to merge, or discard this patch.
main/lp/storageapi.php 1 patch
Switch Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -15,52 +15,52 @@
 block discarded – undo
15 15
 }
16 16
 
17 17
 switch ($_REQUEST['action']) {
18
-    case "get":
19
-        print storage_get($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
20
-        break;
21
-    case "set":
22
-        if (storage_can_set($_REQUEST['svuser'])) {
23
-            print storage_set($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
24
-        }
25
-        break;
26
-    case "getall":
27
-        print storage_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco']);
28
-        break;
29
-    case "stackpush":
30
-        if (storage_can_set($_REQUEST['svuser'])) {
31
-            print storage_stack_push($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
32
-        }
33
-        break;
34
-    case "stackpop":
35
-        if (storage_can_set($_REQUEST['svuser'])) {
36
-            print storage_stack_pop($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
37
-        }
38
-        break;
39
-    case "stacklength":
40
-        print storage_stack_length($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
41
-        break;
42
-    case "stackclear":
43
-        if (storage_can_set($_REQUEST['svuser'])) {
44
-            print storage_stack_clear($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
45
-        }
46
-        break;
47
-    case "stackgetall":
48
-        if (storage_can_set($_REQUEST['svuser']))
49
-            print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
50
-        break;
51
-    case "getposition":
52
-        print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
53
-        break;
54
-    case "getleaders":
55
-        print storage_get_leaders($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc'], $_REQUEST['svlength']);
56
-        break;
57
-    case "usersgetall":
58
-// security issue
59
-        print "NOT allowed, security issue, see sources";
60
-//		print storage_get_all_users();
61
-        break;
62
-    default:
63
-        // Do nothing
18
+        case "get":
19
+            print storage_get($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
20
+            break;
21
+        case "set":
22
+            if (storage_can_set($_REQUEST['svuser'])) {
23
+                print storage_set($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
24
+            }
25
+            break;
26
+        case "getall":
27
+            print storage_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco']);
28
+            break;
29
+        case "stackpush":
30
+            if (storage_can_set($_REQUEST['svuser'])) {
31
+                print storage_stack_push($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svvalue']);
32
+            }
33
+            break;
34
+        case "stackpop":
35
+            if (storage_can_set($_REQUEST['svuser'])) {
36
+                print storage_stack_pop($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
37
+            }
38
+            break;
39
+        case "stacklength":
40
+            print storage_stack_length($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
41
+            break;
42
+        case "stackclear":
43
+            if (storage_can_set($_REQUEST['svuser'])) {
44
+                print storage_stack_clear($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
45
+            }
46
+            break;
47
+        case "stackgetall":
48
+            if (storage_can_set($_REQUEST['svuser']))
49
+                print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']);
50
+            break;
51
+        case "getposition":
52
+            print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']);
53
+            break;
54
+        case "getleaders":
55
+            print storage_get_leaders($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc'], $_REQUEST['svlength']);
56
+            break;
57
+        case "usersgetall":
58
+    // security issue
59
+            print "NOT allowed, security issue, see sources";
60
+    //		print storage_get_all_users();
61
+            break;
62
+        default:
63
+            // Do nothing
64 64
 }
65 65
 
66 66
 function storage_can_set($sv_user) {
Please login to merge, or discard this patch.
main/upload/upload.php 1 patch
Switch Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -31,14 +31,14 @@
 block discarded – undo
31 31
  * Redirect to the correct script to handle this type of upload
32 32
  */
33 33
 switch ($toolFromSession) {
34
-    case TOOL_LEARNPATH:
35
-        require 'upload.scorm.php';
36
-        break;
37
-    //the following cases need to be distinguished later on
38
-    case TOOL_DROPBOX:
39
-    case TOOL_STUDENTPUBLICATION:
40
-    case TOOL_DOCUMENT:
41
-    default:
42
-        require 'upload.document.php';
43
-        break;
34
+        case TOOL_LEARNPATH:
35
+            require 'upload.scorm.php';
36
+            break;
37
+        //the following cases need to be distinguished later on
38
+        case TOOL_DROPBOX:
39
+        case TOOL_STUDENTPUBLICATION:
40
+        case TOOL_DOCUMENT:
41
+        default:
42
+            require 'upload.document.php';
43
+            break;
44 44
 }
Please login to merge, or discard this patch.
main/auth/courses.php 1 patch
Switch Indentation   +136 added lines, -136 removed lines patch added patch discarded remove patch
@@ -175,28 +175,53 @@  discard block
 block discarded – undo
175 175
 }
176 176
 
177 177
 switch ($action) {
178
-    case 'subscribe_user_with_password':
179
-        $courses_controller->subscribe_user(
180
-            isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
181
-            isset($_POST['search_term']) ? $_POST['search_term'] : '',
182
-            isset($_POST['category_code']) ? $_POST['category_code'] : ''
183
-        );
184
-        break;
185
-    case 'createcoursecategory':
186
-        $courses_controller->categories_list($action);
187
-        break;
188
-    case 'deletecoursecategory':
189
-        $courses_controller->courses_list($action);
190
-        break;
191
-    case 'sortmycourses':
192
-        $courses_controller->courses_list($action);
193
-        break;
194
-    case 'subscribe':
195
-        if (!$user_can_view_page) {
196
-            api_not_allowed(true);
197
-        }
198
-
199
-        if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
178
+        case 'subscribe_user_with_password':
179
+            $courses_controller->subscribe_user(
180
+                isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
181
+                isset($_POST['search_term']) ? $_POST['search_term'] : '',
182
+                isset($_POST['category_code']) ? $_POST['category_code'] : ''
183
+            );
184
+            break;
185
+        case 'createcoursecategory':
186
+            $courses_controller->categories_list($action);
187
+            break;
188
+        case 'deletecoursecategory':
189
+            $courses_controller->courses_list($action);
190
+            break;
191
+        case 'sortmycourses':
192
+            $courses_controller->courses_list($action);
193
+            break;
194
+        case 'subscribe':
195
+            if (!$user_can_view_page) {
196
+                api_not_allowed(true);
197
+            }
198
+
199
+            if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
200
+                $courses_controller->courses_categories(
201
+                    $action,
202
+                    $categoryCode,
203
+                    null,
204
+                    null,
205
+                    null,
206
+                    $limit
207
+                );
208
+            } else {
209
+                header('Location: ' . api_get_self());
210
+                exit;
211
+            }
212
+            break;
213
+        case 'display_random_courses':
214
+            if (!$user_can_view_page) {
215
+                api_not_allowed(true);
216
+            }
217
+
218
+            $courses_controller->courses_categories($action);
219
+            break;
220
+        case 'display_courses':
221
+            if (!$user_can_view_page) {
222
+                api_not_allowed(true);
223
+            }
224
+
200 225
             $courses_controller->courses_categories(
201 226
                 $action,
202 227
                 $categoryCode,
@@ -205,127 +230,102 @@  discard block
 block discarded – undo
205 230
                 null,
206 231
                 $limit
207 232
             );
208
-        } else {
209
-            header('Location: ' . api_get_self());
210
-            exit;
211
-        }
212
-        break;
213
-    case 'display_random_courses':
214
-        if (!$user_can_view_page) {
215
-            api_not_allowed(true);
216
-        }
217
-
218
-        $courses_controller->courses_categories($action);
219
-        break;
220
-    case 'display_courses':
221
-        if (!$user_can_view_page) {
222
-            api_not_allowed(true);
223
-        }
224
-
225
-        $courses_controller->courses_categories(
226
-            $action,
227
-            $categoryCode,
228
-            null,
229
-            null,
230
-            null,
231
-            $limit
232
-        );
233
-        break;
234
-    case 'display_sessions':
235
-        if (!$user_can_view_page) {
236
-            api_not_allowed(true);
237
-        }
238
-
239
-        $courses_controller->sessionsList($action, $nameTools, $limit);
240
-        break;
241
-    case 'subscribe_to_session':
242
-        if (!$user_can_view_page) {
243
-            api_not_allowed(true);
244
-        }
245
-
246
-        $userId = api_get_user_id();
247
-        $confirmed = isset($_GET['confirm']);
248
-        $sessionId = intval($_GET['session_id']);
249
-
250
-        if (empty($userId)) {
251
-            api_not_allowed();
252
-            exit;
253
-        }
254
-
255
-        if (!$confirmed) {
256
-            $template = new Template(null, false, false, false, false, false);
257
-            $template->assign('session_id', $sessionId);
258
-
259
-            $layout = $template->get_template('auth/confirm_session_subscription.tpl');
260
-
261
-            echo $template->fetch($layout);
262
-            exit;
263
-        }
264
-
265
-        $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
266
-        if ($registrationAllowed === 'true') {
267
-            $entityManager = Database::getManager();
268
-            $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
269
-
270
-            $sequences = $repository->getRequirements(
271
-                $sessionId,
272
-                SequenceResource::SESSION_TYPE
273
-            );
233
+            break;
234
+        case 'display_sessions':
235
+            if (!$user_can_view_page) {
236
+                api_not_allowed(true);
237
+            }
238
+
239
+            $courses_controller->sessionsList($action, $nameTools, $limit);
240
+            break;
241
+        case 'subscribe_to_session':
242
+            if (!$user_can_view_page) {
243
+                api_not_allowed(true);
244
+            }
274 245
 
275
-            if (count($sequences) > 0) {
276
-                $requirementsData = SequenceResourceManager::checkRequirementsForUser(
277
-                    $sequences,
278
-                    SequenceResource::SESSION_TYPE,
279
-                    $userId
246
+            $userId = api_get_user_id();
247
+            $confirmed = isset($_GET['confirm']);
248
+            $sessionId = intval($_GET['session_id']);
249
+
250
+            if (empty($userId)) {
251
+                api_not_allowed();
252
+                exit;
253
+            }
254
+
255
+            if (!$confirmed) {
256
+                $template = new Template(null, false, false, false, false, false);
257
+                $template->assign('session_id', $sessionId);
258
+
259
+                $layout = $template->get_template('auth/confirm_session_subscription.tpl');
260
+
261
+                echo $template->fetch($layout);
262
+                exit;
263
+            }
264
+
265
+            $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
266
+            if ($registrationAllowed === 'true') {
267
+                $entityManager = Database::getManager();
268
+                $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
269
+
270
+                $sequences = $repository->getRequirements(
271
+                    $sessionId,
272
+                    SequenceResource::SESSION_TYPE
280 273
                 );
281 274
 
282
-                $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
275
+                if (count($sequences) > 0) {
276
+                    $requirementsData = SequenceResourceManager::checkRequirementsForUser(
277
+                        $sequences,
278
+                        SequenceResource::SESSION_TYPE,
279
+                        $userId
280
+                    );
281
+
282
+                    $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
283 283
 
284
-                if (!$continueWithSubscription) {
285
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
286
-                    exit;
284
+                    if (!$continueWithSubscription) {
285
+                        header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
286
+                        exit;
287
+                    }
287 288
                 }
288
-            }
289 289
 
290
-            SessionManager::subscribe_users_to_session(
291
-                $_GET['session_id'],
292
-                array($userId),
293
-                SESSION_VISIBLE_READ_ONLY,
294
-                false
295
-            );
290
+                SessionManager::subscribe_users_to_session(
291
+                    $_GET['session_id'],
292
+                    array($userId),
293
+                    SESSION_VISIBLE_READ_ONLY,
294
+                    false
295
+                );
296 296
 
297
-            $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
298
-            $count = count($coursesList);
299
-            $url = '';
300
-
301
-            if ($count <= 0) {
302
-                // no course in session -> return to catalog
303
-                $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
304
-            } elseif ($count == 1) {
305
-                // only one course, so redirect directly to this course
306
-                foreach ($coursesList as $course) {
307
-                    $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
297
+                $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
298
+                $count = count($coursesList);
299
+                $url = '';
300
+
301
+                if ($count <= 0) {
302
+                    // no course in session -> return to catalog
303
+                    $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
304
+                } elseif ($count == 1) {
305
+                    // only one course, so redirect directly to this course
306
+                    foreach ($coursesList as $course) {
307
+                        $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
308
+                    }
309
+                } else {
310
+                    $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
308 311
                 }
309
-            } else {
310
-                $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
312
+                header('Location: ' . $url);
313
+                exit;
311 314
             }
312
-            header('Location: ' . $url);
313
-            exit;
314
-        }
315
-        //else show error message?
316
-        break;
317
-    case 'search_tag':
318
-        if (!$user_can_view_page) {
319
-            api_not_allowed(true);
320
-        }
321
-
322
-        $courses_controller->sessionsListByCoursesTag($limit);
323
-        break;
324
-    case 'search_session':
325
-        if (!$user_can_view_page) {
326
-            api_not_allowed(true);
327
-        }
328
-
329
-        $courses_controller->sessionListBySearch($limit);
330
-        break;
315
+            //else show error message?
316
+            break;
317
+        case 'search_tag':
318
+            if (!$user_can_view_page) {
319
+                api_not_allowed(true);
320
+            }
321
+
322
+            $courses_controller->sessionsListByCoursesTag($limit);
323
+            break;
324
+        case 'search_session':
325
+            if (!$user_can_view_page) {
326
+                api_not_allowed(true);
327
+            }
328
+
329
+            $courses_controller->sessionListBySearch($limit);
330
+            break;
331 331
 }
Please login to merge, or discard this patch.