From 7ed1dab3c52ab665edf8caeb64a61ec2a5c7543f Mon Sep 17 00:00:00 2001
From: Lars Gebhardt-Kusche <lars@kusche.berlin>
Date: Fri, 5 Dec 2025 01:20:55 +0100
Subject: [PATCH] yyxd

---
 config/emailtemplate.conf.php | 22 +++++++++++++++++++---
 config/fileload.php           | 20 +++++++++++++++++++-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/config/emailtemplate.conf.php b/config/emailtemplate.conf.php
index b8be58e..93cbaf8 100644
--- a/config/emailtemplate.conf.php
+++ b/config/emailtemplate.conf.php
@@ -1,9 +1,25 @@
 <?php
 declare(strict_types=1);
 
-$bootstrapConfig = __DIR__ . '/config.php';
-if (is_file($bootstrapConfig)) {
-    require_once $bootstrapConfig;
+$bootstrapTried = false;
+$bootstrapLoaded = false;
+$bootstrapCandidates = [__DIR__ . '/config.php'];
+$envHint = getenv('APP_ENV') ?: (getenv('APP_ENV_FILE') ?: null);
+if ($envHint) {
+    $bootstrapCandidates[] = __DIR__ . '/' . $envHint . '/config.php';
+}
+$bootstrapCandidates[] = __DIR__ . '/staging/config.php';
+$bootstrapCandidates[] = __DIR__ . '/prod/config.php';
+foreach ($bootstrapCandidates as $bootstrapConfig) {
+    if ($bootstrapConfig && is_file($bootstrapConfig)) {
+        $bootstrapTried = true;
+        require_once $bootstrapConfig;
+        $bootstrapLoaded = true;
+        break;
+    }
+}
+if (!$bootstrapLoaded) {
+    throw new RuntimeException('No environment config found in config/ or its subdirectories.');
 }
 
 $overrides = $GLOBALS['EMAILTEMPLATE_OVERRIDES'] ?? [];
diff --git a/config/fileload.php b/config/fileload.php
index 78807df..fb33db0 100644
--- a/config/fileload.php
+++ b/config/fileload.php
@@ -5,7 +5,25 @@
 //    → Diese Datei DEFINIERT die Konstanten wie
 //      APP_COOKIE_PREFIX, APP_COOKIE_DOMAIN, APP_ENV etc.
 // -----------------------------------------------------------
-require_once __DIR__ . "/config.php";
+// Try to load primary environment bootstrap.
+$bootstrapCandidates = [__DIR__ . '/config.php'];
+$envHint = getenv('APP_ENV') ?: (getenv('APP_ENV_FILE') ?: null);
+if ($envHint) {
+    $bootstrapCandidates[] = __DIR__ . '/' . $envHint . '/config.php';
+}
+$bootstrapCandidates[] = __DIR__ . '/staging/config.php';
+$bootstrapCandidates[] = __DIR__ . '/prod/config.php';
+$bootstrapLoaded = false;
+foreach ($bootstrapCandidates as $bootstrap) {
+    if ($bootstrap && is_file($bootstrap)) {
+        require_once $bootstrap;
+        $bootstrapLoaded = true;
+        break;
+    }
+}
+if (!$bootstrapLoaded) {
+    throw new RuntimeException('No environment config found under config/.');
+}
 
 $emailtemplateConfigPath = __DIR__ . '/emailtemplate.conf.php';
 if (is_file($emailtemplateConfigPath)) {