13131

mail/MailService.php

@@ -90,6 +90,11 @@ class MailService
     }
     private static function loadConfig(): array
     {
+        static $cachedConfig = null;
+        if (is_array($cachedConfig)) {
+            return $cachedConfig;
+        }
+
         $configPath = __DIR__ . '/config.php';
         if (!file_exists($configPath)) {
             throw new \RuntimeException('Mail config not found. Copy mail/config.sample.php to mail/config.php and fill in credentials.');
@@ -98,7 +103,9 @@ class MailService
         if (!is_array($cfg)) {
             throw new \RuntimeException('Invalid mail config format: expected array');
         }
-        return $cfg;
+
+        $cachedConfig = $cfg;
+        return $cachedConfig;
     }
 
     // Send a contact message

mail/config.php

@@ -2,34 +2,38 @@
 // Mail configuration sourced from environment variables.
 // No secrets are stored here; the file just maps env -> config array for MailService.
 
-function env_val(string $key, $default = null) {
-    $v = getenv($key);
-    return ($v === false || $v === null || $v === '') ? $default : $v;
+if (!function_exists('env_val')) {
+    function env_val(string $key, $default = null) {
+        $v = getenv($key);
+        return ($v === false || $v === null || $v === '') ? $default : $v;
+    }
 }
 
 // Fallback: if critical vars are missing from process env, try to parse executor/.env
 // This helps in web/Apache contexts where .env is not exported.
 // Supports simple KEY=VALUE lines; ignores quotes and comments.
-function load_dotenv_if_needed(array $keys): void {
-    $missing = array_filter($keys, fn($k) => getenv($k) === false || getenv($k) === '');
-    if (empty($missing)) return;
-    static $loaded = false;
-    if ($loaded) return;
-    $envPath = realpath(__DIR__ . '/../../.env'); // executor/.env
-    if ($envPath && is_readable($envPath)) {
-        $lines = @file($envPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: [];
-        foreach ($lines as $line) {
-            if ($line[0] === '#' || trim($line) === '') continue;
-            if (!str_contains($line, '=')) continue;
-            [$k, $v] = array_map('trim', explode('=', $line, 2));
-            // Strip potential surrounding quotes
-            $v = trim($v, "\"' ");
-            // Do not override existing env
-            if ($k !== '' && (getenv($k) === false || getenv($k) === '')) {
-                putenv("{$k}={$v}");
+if (!function_exists('load_dotenv_if_needed')) {
+    function load_dotenv_if_needed(array $keys): void {
+        $missing = array_filter($keys, fn($k) => getenv($k) === false || getenv($k) === '');
+        if (empty($missing)) return;
+        static $loaded = false;
+        if ($loaded) return;
+        $envPath = realpath(__DIR__ . '/../../.env'); // executor/.env
+        if ($envPath && is_readable($envPath)) {
+            $lines = @file($envPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: [];
+            foreach ($lines as $line) {
+                if ($line[0] === '#' || trim($line) === '') continue;
+                if (!str_contains($line, '=')) continue;
+                [$k, $v] = array_map('trim', explode('=', $line, 2));
+                // Strip potential surrounding quotes
+                $v = trim($v, "\"' " );
+                // Do not override existing env
+                if ($k !== '' && (getenv($k) === false || getenv($k) === '')) {
+                    putenv("{$k}={$v}");
+                }
             }
+            $loaded = true;
         }
-        $loaded = true;
     }
 }