x Sorry, these patches are not available anymore due to data migration. Please run a fresh inspection.
Completed
Pull Request — 1.11.x (#1359)
by José
193:39 queued 155:02
created
main/upload/upload.php 1 patch
Switch Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -26,14 +26,14 @@
 block discarded – undo
26 26
  * Redirect to the correct script to handle this type of upload
27 27
  */
28 28
 switch ($_SESSION['my_tool']) {
29
-    case TOOL_LEARNPATH:
30
-        require 'upload.scorm.php';
31
-        break;
32
-    //the following cases need to be distinguished later on
33
-    case TOOL_DROPBOX:
34
-    case TOOL_STUDENTPUBLICATION:
35
-    case TOOL_DOCUMENT:
36
-    default:
37
-        require 'upload.document.php';
38
-        break;
29
+        case TOOL_LEARNPATH:
30
+            require 'upload.scorm.php';
31
+            break;
32
+        //the following cases need to be distinguished later on
33
+        case TOOL_DROPBOX:
34
+        case TOOL_STUDENTPUBLICATION:
35
+        case TOOL_DOCUMENT:
36
+        default:
37
+            require 'upload.document.php';
38
+            break;
39 39
 }
Please login to merge, or discard this patch.
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/auth/courses.php 1 patch
Switch Indentation   +135 added lines, -135 removed lines patch added patch discarded remove patch
@@ -171,28 +171,52 @@  discard block
 block discarded – undo
171 171
 }
172 172
 
173 173
 switch ($action) {
174
-    case 'subscribe_user_with_password':
175
-        $courses_controller->subscribe_user(
176
-            isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
177
-            isset($_POST['search_term']) ? $_POST['search_term'] : '',
178
-            isset($_POST['category_code']) ? $_POST['category_code'] : ''
179
-        );
180
-        break;
181
-    case 'createcoursecategory':
182
-        $courses_controller->categories_list($action);
183
-        break;
184
-    case 'deletecoursecategory':
185
-        $courses_controller->courses_list($action);
186
-        break;
187
-    case 'sortmycourses':
188
-        $courses_controller->courses_list($action);
189
-        break;
190
-    case 'subscribe':
191
-        if (!$user_can_view_page) {
192
-            api_not_allowed(true);
193
-        }
194
-
195
-        if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
174
+        case 'subscribe_user_with_password':
175
+            $courses_controller->subscribe_user(
176
+                isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
177
+                isset($_POST['search_term']) ? $_POST['search_term'] : '',
178
+                isset($_POST['category_code']) ? $_POST['category_code'] : ''
179
+            );
180
+            break;
181
+        case 'createcoursecategory':
182
+            $courses_controller->categories_list($action);
183
+            break;
184
+        case 'deletecoursecategory':
185
+            $courses_controller->courses_list($action);
186
+            break;
187
+        case 'sortmycourses':
188
+            $courses_controller->courses_list($action);
189
+            break;
190
+        case 'subscribe':
191
+            if (!$user_can_view_page) {
192
+                api_not_allowed(true);
193
+            }
194
+
195
+            if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
196
+                $courses_controller->courses_categories(
197
+                    $action,
198
+                    $categoryCode,
199
+                    null,
200
+                    null,
201
+                    null,
202
+                    $limit
203
+                );
204
+            } else {
205
+                header('Location: ' . api_get_self());
206
+            }
207
+            break;
208
+        case 'display_random_courses':
209
+            if (!$user_can_view_page) {
210
+                api_not_allowed(true);
211
+            }
212
+
213
+            $courses_controller->courses_categories($action);
214
+            break;
215
+        case 'display_courses':
216
+            if (!$user_can_view_page) {
217
+                api_not_allowed(true);
218
+            }
219
+
196 220
             $courses_controller->courses_categories(
197 221
                 $action,
198 222
                 $categoryCode,
@@ -201,126 +225,102 @@  discard block
 block discarded – undo
201 225
                 null,
202 226
                 $limit
203 227
             );
204
-        } else {
205
-            header('Location: ' . api_get_self());
206
-        }
207
-        break;
208
-    case 'display_random_courses':
209
-        if (!$user_can_view_page) {
210
-            api_not_allowed(true);
211
-        }
212
-
213
-        $courses_controller->courses_categories($action);
214
-        break;
215
-    case 'display_courses':
216
-        if (!$user_can_view_page) {
217
-            api_not_allowed(true);
218
-        }
219
-
220
-        $courses_controller->courses_categories(
221
-            $action,
222
-            $categoryCode,
223
-            null,
224
-            null,
225
-            null,
226
-            $limit
227
-        );
228
-        break;
229
-    case 'display_sessions':
230
-        if (!$user_can_view_page) {
231
-            api_not_allowed(true);
232
-        }
233
-
234
-        $courses_controller->sessionsList($action, $nameTools, $limit);
235
-        break;
236
-    case 'subscribe_to_session':
237
-        if (!$user_can_view_page) {
238
-            api_not_allowed(true);
239
-        }
240
-
241
-        $userId = api_get_user_id();
242
-        $confirmed = isset($_GET['confirm']);
243
-        $sessionId = intval($_GET['session_id']);
244
-
245
-        if (empty($userId)) {
246
-            api_not_allowed();
247
-            exit;
248
-        }
249
-
250
-        if (!$confirmed) {
251
-            $template = new Template(null, false, false, false, false, false);
252
-            $template->assign('session_id', $sessionId);
253
-
254
-            $layout = $template->get_template('auth/confirm_session_subscription.tpl');
255
-
256
-            echo $template->fetch($layout);
257
-            exit;
258
-        }
259
-
260
-        $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
261
-        if ($registrationAllowed === 'true') {
262
-            $entityManager = Database::getManager();
263
-            $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
264
-
265
-            $sequences = $repository->getRequirements(
266
-                $sessionId,
267
-                SequenceResource::SESSION_TYPE
268
-            );
228
+            break;
229
+        case 'display_sessions':
230
+            if (!$user_can_view_page) {
231
+                api_not_allowed(true);
232
+            }
233
+
234
+            $courses_controller->sessionsList($action, $nameTools, $limit);
235
+            break;
236
+        case 'subscribe_to_session':
237
+            if (!$user_can_view_page) {
238
+                api_not_allowed(true);
239
+            }
240
+
241
+            $userId = api_get_user_id();
242
+            $confirmed = isset($_GET['confirm']);
243
+            $sessionId = intval($_GET['session_id']);
269 244
 
270
-            if (count($sequences) > 0) {
271
-                $requirementsData = SequenceResourceManager::checkRequirementsForUser(
272
-                    $sequences,
273
-                    SequenceResource::SESSION_TYPE,
274
-                    $userId
245
+            if (empty($userId)) {
246
+                api_not_allowed();
247
+                exit;
248
+            }
249
+
250
+            if (!$confirmed) {
251
+                $template = new Template(null, false, false, false, false, false);
252
+                $template->assign('session_id', $sessionId);
253
+
254
+                $layout = $template->get_template('auth/confirm_session_subscription.tpl');
255
+
256
+                echo $template->fetch($layout);
257
+                exit;
258
+            }
259
+
260
+            $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
261
+            if ($registrationAllowed === 'true') {
262
+                $entityManager = Database::getManager();
263
+                $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
264
+
265
+                $sequences = $repository->getRequirements(
266
+                    $sessionId,
267
+                    SequenceResource::SESSION_TYPE
275 268
                 );
276 269
 
277
-                $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
270
+                if (count($sequences) > 0) {
271
+                    $requirementsData = SequenceResourceManager::checkRequirementsForUser(
272
+                        $sequences,
273
+                        SequenceResource::SESSION_TYPE,
274
+                        $userId
275
+                    );
276
+
277
+                    $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
278 278
 
279
-                if (!$continueWithSubscription) {
280
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
281
-                    exit;
279
+                    if (!$continueWithSubscription) {
280
+                        header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
281
+                        exit;
282
+                    }
282 283
                 }
283
-            }
284 284
 
285
-            SessionManager::suscribe_users_to_session(
286
-                $_GET['session_id'],
287
-                array($userId),
288
-                SESSION_VISIBLE_READ_ONLY,
289
-                false
290
-            );
285
+                SessionManager::suscribe_users_to_session(
286
+                    $_GET['session_id'],
287
+                    array($userId),
288
+                    SESSION_VISIBLE_READ_ONLY,
289
+                    false
290
+                );
291 291
 
292
-            $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
293
-            $count = count($coursesList);
294
-            $url = '';
295
-
296
-            if ($count <= 0) {
297
-                // no course in session -> return to catalog
298
-                $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
299
-            } elseif ($count == 1) {
300
-                // only one course, so redirect directly to this course
301
-                foreach ($coursesList as $course) {
302
-                    $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
292
+                $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
293
+                $count = count($coursesList);
294
+                $url = '';
295
+
296
+                if ($count <= 0) {
297
+                    // no course in session -> return to catalog
298
+                    $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
299
+                } elseif ($count == 1) {
300
+                    // only one course, so redirect directly to this course
301
+                    foreach ($coursesList as $course) {
302
+                        $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
303
+                    }
304
+                } else {
305
+                    $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
303 306
                 }
304
-            } else {
305
-                $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
307
+                header('Location: ' . $url);
308
+                exit;
306 309
             }
307
-            header('Location: ' . $url);
308
-            exit;
309
-        }
310
-        //else show error message?
311
-        break;
312
-    case 'search_tag':
313
-        if (!$user_can_view_page) {
314
-            api_not_allowed(true);
315
-        }
316
-
317
-        $courses_controller->sessionsListByCoursesTag($limit);
318
-        break;
319
-    case 'search_session':
320
-        if (!$user_can_view_page) {
321
-            api_not_allowed(true);
322
-        }
323
-
324
-        $courses_controller->sessionListBySearch($limit);
325
-        break;
310
+            //else show error message?
311
+            break;
312
+        case 'search_tag':
313
+            if (!$user_can_view_page) {
314
+                api_not_allowed(true);
315
+            }
316
+
317
+            $courses_controller->sessionsListByCoursesTag($limit);
318
+            break;
319
+        case 'search_session':
320
+            if (!$user_can_view_page) {
321
+                api_not_allowed(true);
322
+            }
323
+
324
+            $courses_controller->sessionListBySearch($limit);
325
+            break;
326 326
 }
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.