Merge pull request #7330 from christianbeeznest/GH-7224

Install: Fix install redirect when session/DB not ready - refs #7224

Author: NicoDucou

assets/vue/components/installer/Step4.vue

@@ -137,7 +137,13 @@
       severity="warn"
       style="margin-bottom: 8px"
     >
-      <span v-html="t('A database with the same name already exists. It will be deleted.')" />
+      <span
+        v-html="
+          t(
+            'A database with the same name already exists. If it contains tables, they will be deleted; if it is empty, it will be reused.',
+          )
+        "
+      />
     </Message>
 
     <Message

config/services.yaml

@@ -143,6 +143,12 @@ services:
       tags:
         - name: security.voter
 
+    Chamilo\CoreBundle\EventSubscriber\InstallDbGuardSubscriber:
+      arguments:
+        $connection: '@doctrine.dbal.default_connection'
+      tags:
+        - { name: kernel.event_subscriber }
+
     Chamilo\CoreBundle\Helpers\ContainerHelper:
         calls:
             - setAuthorizationChecker: [ '@security.authorization_checker' ]

public/index.php

@@ -8,9 +8,15 @@
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
 return function (array $context) {
-    // Chamilo
-    $isInstalled = $context['APP_INSTALLED'] ?? null;
-    if (1 !== (int) $isInstalled) {
+    // Do NOT rely on $context for custom env vars (Runtime may not include them).
+    $installed = (string) (
+        $_SERVER['APP_INSTALLED']
+        ?? $_ENV['APP_INSTALLED']
+        ?? getenv('APP_INSTALLED')
+        ?? '0'
+    );
+
+    if ($installed !== '1') {
         return new HttpRedirectResponse('./main/install/index.php');
     }