Merge branch 'main' of https://git.webenpcstudio.nl/NiekRabelink/Fociz into dev

config/config.php

@@ -68,16 +68,26 @@ if (!function_exists('fociz_env')) {
 // MariaDB Verbindingsgegevens (uit .env of .env.example)
 define('DB_HOST', fociz_env('DB_HOST', '192.168.2.33'));
 define('DB_PORT', fociz_env('DB_PORT', '3306'));
+<<<<<<< HEAD
 define('DB_NAME', fociz_env('DB_NAME', 'focizdev'));
 define('DB_USER', fociz_env('DB_USER', 'focizdev_user'));
 define('DB_PASS', fociz_env('DB_PASS', 'F0c1z_Dev_Secure_2026!'));
+=======
+define('DB_NAME', fociz_env('DB_NAME', 'fociz'));
+define('DB_USER', fociz_env('DB_USER', 'focizlive_user'));
+define('DB_PASS', fociz_env('DB_PASS', 'F0c1z_Live_Secure_2026!'));
+>>>>>>> dd738e670b78819c11e329da93db1b472808f195
 define('DB_CHARSET', 'utf8mb4');
 
 // Bepaal de dynamische of geconfigureerde applicatie URL
 if (!function_exists('fociz_detect_app_url')) {
     function fociz_detect_app_url(): string {
         $envUrl = fociz_env('APP_URL');
+<<<<<<< HEAD
         if (!empty($envUrl) && !str_contains($envUrl, 'uw-domein.nl')) {
+=======
+        if (!empty($envUrl) && !str_contains($envUrl, 'www.fociz.nl')) {
+>>>>>>> dd738e670b78819c11e329da93db1b472808f195
             return rtrim($envUrl, '/');
         }