Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php

@@ -243,6 +243,11 @@ public static function getExistingSettings(): array
                 ],
             ],
             'course' => [
+                [
+                    'name' => 'access_url_specific_files',
+                    'title' => 'Enable URL-specific files',
+                    'comment' => 'When this feature is enabled on a multi-URL configuration, you can go to the main URL and provide URL-specific versions of any file (in the documents tool). The original file will be replaced by the alternative whenever seeing it from a different URL. This allows you to customize each URL even further, while enjoying the advantage of re-using the same courses many times.'
+                ],
                 [
                     'name' => 'allow_course_theme',
                     'title' => 'Allow course themes',
@@ -1046,6 +1051,16 @@ public static function getExistingSettings(): array
                 ],
             ],
             'platform' => [
+                [
+                    'name' => 'donotlistcampus',
+                    'title' => 'Do not list this campus on chamilo.org',
+                    'comment' => 'By default, Chamilo portals are automatically registered in a public list at chamilo.org, just using the title you gave to this portal (not the URL nor any private data). Check this box to avoid having the title of your portal appear.'
+                ],
+                [
+                    'name' => 'timezone',
+                    'title' => 'Default timezone',
+                    'comment' => 'Select the default timezone for this portal. This will help set the timezone (if the feature is enabled) for each new user or for any user that has not set a specific timezone yet. Timezones help show all time-related information on screen in the specific timezone of each user.'
+                ],
                 [
                     'name' => 'chamilo_database_version',
                     'title' => 'Current version of the database schema used by Chamilo',

src/CoreBundle/EventListener/ExceptionListener.php

@@ -36,14 +36,11 @@ public function __invoke(ExceptionEvent $event): void
 
         if ($exception instanceof NotAllowedException) {
             if (null === $this->tokenStorage->getToken()) {
-                $currentUrl = $request->getUri();
-                $parsedUrl = parse_url($currentUrl);
-                $baseUrl = $parsedUrl['scheme'].'://'.$parsedUrl['host'];
-                $path = rtrim($parsedUrl['path'], '/') ?: '';
-                $query = $parsedUrl['query'] ?? '';
-                $redirectUrl = $baseUrl.$path.($query ? '?'.$query : '');
-
-                $loginUrl = $this->router->generate('login', ['redirect' => $redirectUrl], UrlGeneratorInterface::ABSOLUTE_URL);
+                $loginUrl = $this->router->generate(
+                    'login',
+                    ['redirect' => $request->getRequestUri()],
+                    UrlGeneratorInterface::ABSOLUTE_URL
+                );
                 $event->setResponse(new RedirectResponse($loginUrl));
 
                 return;

src/CoreBundle/Resources/config/settings.yml

@@ -134,11 +134,6 @@ services:
         tags:
             - {name: sylius.settings_schema, alias: chamilo_core.settings.profile, namespace: profile}
 
-    chamilo_core.settings.ppt_to_lp:
-        class: Chamilo\CoreBundle\Settings\PptToLpSettingsSchema
-        tags:
-            - {name: sylius.settings_schema, alias: chamilo_core.settings.ppt_to_lp, namespace: ppt_to_lp}
-
     chamilo_core.settings.registration:
         class: Chamilo\CoreBundle\Settings\RegistrationSettingsSchema
         tags: