Settings: fix MultiURL locked overrides + reset access_url_locked

christianbeeznest · christianbeeznest · commit 0453a4901898 · 2025-12-13T18:17:11.000-05:00
diff --git a/public/main/inc/lib/urlmanager.lib.php b/public/main/inc/lib/urlmanager.lib.php
@@ -7,6 +7,7 @@
 use Chamilo\CoreBundle\Entity\AccessUrlRelSession;
 use Chamilo\CoreBundle\Entity\AccessUrlRelUser;
 use Chamilo\CoreBundle\Entity\AccessUrlRelUserGroup;
+use Chamilo\CoreBundle\Entity\SettingsCurrent;
 use Chamilo\CoreBundle\Entity\UserAuthSource;
 use Chamilo\CoreBundle\Framework\Container;
 use Doctrine\ORM\NonUniqueResultException;
@@ -98,12 +99,13 @@ public static function delete($id)
 
         /*
          * $tableCourseCategory = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
-        $sql = "DELETE FROM $tableCourseCategory WHERE access_url_id = ".$id;
-        Database::query($sql);
-        */
+         * $sql = "DELETE FROM $tableCourseCategory WHERE access_url_id = ".$id;
+         * Database::query($sql);
+         */
         $em = Container::getEntityManager();
 
         $relEntities = [
+            SettingsCurrent::class,
             AccessUrlRelCourse::class,
             AccessUrlRelSession::class,
             AccessUrlRelUserGroup::class,
diff --git a/src/CoreBundle/Controller/Admin/SettingsController.php b/src/CoreBundle/Controller/Admin/SettingsController.php
@@ -7,6 +7,7 @@
 namespace Chamilo\CoreBundle\Controller\Admin;
 
 use Chamilo\CoreBundle\Controller\BaseController;
+use Chamilo\CoreBundle\Entity\AccessUrl;
 use Chamilo\CoreBundle\Entity\SearchEngineField;
 use Chamilo\CoreBundle\Entity\SettingsCurrent;
 use Chamilo\CoreBundle\Entity\SettingsValueTemplate;
@@ -62,9 +63,14 @@ public function toggleChangeable(Request $request, AccessUrlHelper $accessUrlHel
         }
 
         $currentUrl = $accessUrlHelper->getCurrent();
-        $currentUrlId = $currentUrl->getId();
+        if (!$currentUrl) {
+            return $this->json([
+                'error' => 'Access URL not resolved.',
+            ], 500);
+        }
+
+        $currentUrlId = (int) $currentUrl->getId();
 
-        // Only main URL (ID = 1) can toggle the flag.
         if (1 !== $currentUrlId) {
             return $this->json([
                 'error' => 'Only the main URL (ID 1) can toggle this setting.',
@@ -79,8 +85,15 @@ public function toggleChangeable(Request $request, AccessUrlHelper $accessUrlHel
             ], 400);
         }
 
-        $variable = (string) $payload['variable'];
+        $variable = trim((string) $payload['variable']);
         $status = (int) $payload['status'];
+        $status = $status === 1 ? 1 : 0;
+
+        if ('' === $variable) {
+            return $this->json([
+                'error' => 'Invalid variable.',
+            ], 400);
+        }
 
         $repo = $this->entityManager->getRepository(SettingsCurrent::class);
 
@@ -143,9 +156,22 @@ public function searchSetting(Request $request, AccessUrlHelper $accessUrlHelper
 
         // Template map for current URL (existing behavior – JSON helper)
         $settingsRepo = $this->entityManager->getRepository(SettingsCurrent::class);
-        $settingsWithTemplate = $settingsRepo->findBy(['url' => $url]);
 
-        foreach ($settingsWithTemplate as $s) {
+        // Build template map: current URL overrides main URL when missing.
+        $currentUrlId = (int) $url->getId();
+        $mainUrl = $this->entityManager->getRepository(AccessUrl::class)->find(1);
+
+        if ($mainUrl instanceof AccessUrl && 1 !== $currentUrlId) {
+            $mainRows = $settingsRepo->findBy(['url' => $mainUrl]);
+            foreach ($mainRows as $s) {
+                if ($s->getValueTemplate()) {
+                    $templateMap[$s->getVariable()] = $s->getValueTemplate()->getId();
+                }
+            }
+        }
+
+        $currentRows = $settingsRepo->findBy(['url' => $url]);
+        foreach ($currentRows as $s) {
             if ($s->getValueTemplate()) {
                 $templateMap[$s->getVariable()] = $s->getValueTemplate()->getId();
             }
@@ -166,7 +192,6 @@ public function searchSetting(Request $request, AccessUrlHelper $accessUrlHelper
             }
         }
 
-        $currentUrlId = $url->getId();
         // Only platform admins on the main URL can toggle the MultiURL flag.
         $canToggleMultiUrlSetting = $this->isGranted('ROLE_ADMIN') && 1 === $currentUrlId;
 
@@ -187,14 +212,6 @@ public function searchSetting(Request $request, AccessUrlHelper $accessUrlHelper
             ]);
         }
 
-        $settingsRepo = $this->entityManager->getRepository(SettingsCurrent::class);
-        $settingsWithTemplate = $settingsRepo->findBy(['url' => $url]);
-        foreach ($settingsWithTemplate as $s) {
-            if ($s->getValueTemplate()) {
-                $templateMap[$s->getVariable()] = $s->getValueTemplate()->getId();
-            }
-        }
-
         $settingsFromKeyword = $manager->getParametersFromKeywordOrderedByCategory($keyword);
         if (!empty($settingsFromKeyword)) {
             foreach ($settingsFromKeyword as $category => $parameterList) {
@@ -331,9 +348,20 @@ public function updateSetting(Request $request, AccessUrlHelper $accessUrlHelper
         $templateMap = [];
         $settingsRepo = $this->entityManager->getRepository(SettingsCurrent::class);
 
-        // Template map for current URL (existing behavior – JSON helper)
-        $settingsWithTemplate = $settingsRepo->findBy(['url' => $url]);
+        $currentUrlId = (int) $url->getId();
+        $mainUrl = $this->entityManager->getRepository(AccessUrl::class)->find(1);
 
+        // Build template map: fallback to main URL templates when sub-URL has no row for a locked setting.
+        if ($mainUrl instanceof AccessUrl && 1 !== $currentUrlId) {
+            $mainRows = $settingsRepo->findBy(['url' => $mainUrl]);
+            foreach ($mainRows as $s) {
+                if ($s->getValueTemplate()) {
+                    $templateMap[$s->getVariable()] = $s->getValueTemplate()->getId();
+                }
+            }
+        }
+
+        $settingsWithTemplate = $settingsRepo->findBy(['url' => $url]);
         foreach ($settingsWithTemplate as $s) {
             if ($s->getValueTemplate()) {
                 $templateMap[$s->getVariable()] = $s->getValueTemplate()->getId();
@@ -359,7 +387,6 @@ public function updateSetting(Request $request, AccessUrlHelper $accessUrlHelper
             'server_type' => (string) $manager->getSetting('platform.server_type', true),
         ];
 
-        $currentUrlId = $url->getId();
         // Only platform admins on the main URL can toggle the MultiURL flag.
         $canToggleMultiUrlSetting = $this->isGranted('ROLE_ADMIN') && 1 === $currentUrlId;
 
@@ -494,12 +521,6 @@ private function computeOrderedNamespacesByTranslatedLabel(array $schemas, Reque
 
     /**
      * Build environment diagnostics for the "search" settings page.
-     *
-     * This replicates the legacy Chamilo 1 behaviour:
-     * - Check Xapian PHP extension
-     * - Check the index directory and permissions
-     * - Check custom search fields
-     * - Check external converters (pdftotext, ps2pdf, ...)
      */
     private function buildSearchDiagnostics(SettingsManager $manager): array
     {
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20251213154100.php b/src/CoreBundle/Migrations/Schema/V200/Version20251213154100.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+final class Version20251213154100 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return 'Set settings.access_url_locked to 0 for all rows (MultiURL default unlock).';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('UPDATE settings SET access_url_locked = 0 WHERE access_url_locked IS NULL OR access_url_locked = 1');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // Revert to previous "locked everywhere" behavior (not recommended, but reversible).
+        $this->addSql('UPDATE settings SET access_url_locked = 1 WHERE access_url_locked = 0');
+    }
+}
diff --git a/src/CoreBundle/Resources/views/Admin/Settings/default.html.twig b/src/CoreBundle/Resources/views/Admin/Settings/default.html.twig
@@ -20,11 +20,11 @@
                 <hr class="my-6 border-gray-25" />
 
                 <div class="row">
-                    <div class="col-md-12">
+                    <div class="col-md-12 w-full max-w-none">
                         <div class="box box-primary">
-                            <div class="box-body">
-                                {% if namespace == 'ai_helpers' %}
-                                    <div class="mb-6 p-5 rounded-lg border border-gray-50 shadow-sm bg-white hover:shadow transition">
+                            <div class="box-body w-full max-w-none">
+                            {% if namespace == 'ai_helpers' %}
+                                    <div class="mb-6 p-5 rounded-lg border border-gray-50 shadow-sm bg-white hover:shadow transition" style="width:100%;max-width:none;">
                                         <div class="flex justify-between items-start mb-3 border-l-4 border-primary pl-4">
                                             <h3 class="text-gray-90 text-body-1 font-semibold">
                                                 {{ "EU AI Act – Transparency & risk notice"|trans }}
@@ -52,7 +52,7 @@
                                 {% endif %}
                                 {{ form_errors(form) }}
                                 <form
-                                        class="form-horizontal"
+                                        class="form-horizontal !w-full !max-w-none"
                                         action="{{ path('chamilo_platform_settings', { 'namespace': namespace, 'keyword': keyword } ) }}"
                                         method="post"
                                         novalidate
@@ -73,7 +73,7 @@
                                         {% if isHidden %}
                                             {{ form_widget(field) }}
                                         {% else %}
-                                            <div class="mb-6 p-5 rounded-lg border border-gray-50 shadow-sm bg-white hover:shadow transition">
+                                            <div class="mb-6 p-5 rounded-lg border border-gray-50 shadow-sm bg-white hover:shadow transition" style="width:100%;max-width:none;">
                                                 <div class="flex justify-between items-start mb-3 border-l-4 border-primary pl-4">
                                                     <h3 class="text-gray-90 text-body-1 font-semibold">
                                                         {{ field.vars.label|trans }}
@@ -372,6 +372,14 @@ sudo systemctl restart apache2
 
     <script>
       document.addEventListener('DOMContentLoaded', () => {
+        const overlay = document.getElementById('jsonTemplateOverlay');
+        const modal = document.getElementById('jsonTemplateModal');
+
+        function closeJsonTemplateModal() {
+          overlay?.classList.add('hidden');
+          modal?.classList.add('hidden');
+        }
+
         document.querySelectorAll('.show-template').forEach(link => {
           link.addEventListener('click', (e) => {
             e.preventDefault();
@@ -390,19 +398,17 @@ sudo systemctl restart apache2
                     document.getElementById('jsonTemplateContent').innerText = data.json_example;
                   }
 
-                  document.getElementById('jsonTemplateOverlay').classList.remove('hidden');
-                  document.getElementById('jsonTemplateModal').classList.remove('hidden');
+                  overlay?.classList.remove('hidden');
+                  modal?.classList.remove('hidden');
                 } else {
                   alert('{{ "Template not found."|trans }}');
                 }
               });
           });
         });
 
-        document.getElementById('closeJsonTemplateModal').addEventListener('click', () => {
-          document.getElementById('jsonTemplateOverlay').classList.add('hidden');
-          document.getElementById('jsonTemplateModal').classList.add('hidden');
-        });
+        document.getElementById('closeJsonTemplateModal')?.addEventListener('click', closeJsonTemplateModal);
+        overlay?.addEventListener('click', closeJsonTemplateModal);
 
         // Xapian help modal
         const openXapianHelp = document.getElementById('openXapianHelp');
@@ -465,6 +471,7 @@ sudo systemctl restart apache2
           });
       });
     </script>
+
 {% endblock %}
 {% block javascripts %}
     {% set ns = app.request.get('namespace')|default('') %}
diff --git a/src/CoreBundle/Resources/views/Admin/Settings/search.html.twig b/src/CoreBundle/Resources/views/Admin/Settings/search.html.twig
diff --git a/src/CoreBundle/Settings/SettingsManager.php b/src/CoreBundle/Settings/SettingsManager.php
