update calendar

2026-07-22 18:36:08 +02:00
parent c48a6ba116
commit 49d4ec7c35
6 changed files with 136 additions and 80 deletions
@@ -1,52 +1,59 @@
 <?php
+// includes/db.php
+
+if (file_exists(__DIR__ . '/config.php')) {
+    require_once __DIR__ . '/config.php';
+}
+
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
+
 if (session_status() === PHP_SESSION_NONE) {
    session_start();
 }

-$host = getenv('DB_HOST') ?: 'househub-db';
-$user = getenv('DB_USER') ?: 'househub';
-$pass = getenv('DB_PASS') ?: 'changeme';
-$db   = $_SESSION['family_db'] ?? null;
+$envHost = getenv('DB_HOST');

-if (!$db) {
-    $current = basename($_SERVER['PHP_SELF'] ?? '');
-    if (!in_array($current, ['login.php', 'register.php'])) {
-        header('Location: /login.php');
-        exit;
-    }
-    return;
+// 1. Détection stricte de l'environnement
+if ($envHost === 'househub-db') {
+    // Docker
+    $host = 'househub-db';
+    $user = getenv('DB_USER') ?: 'househub';
+    $pass = getenv('DB_PASS') ?: 'changeme';
+} else {
+    // XAMPP
+    $host = '127.0.0.1'; // Plus stable que 'localhost' sous XAMPP
+    $user = 'root';
+    $pass = '';
 }

+// 2. Multi-tenant strict : cibler la DB de la famille courante
+$db = 'househub_meta'; // Fallback par défaut
+if (!empty($_SESSION['user']['family_id'])) {
+    $db = 'househub_f' . (int)$_SESSION['user']['family_id'];
+}
+
+$charset = 'utf8mb4';
+$dsn = "mysql:host=$host;dbname=$db;charset=$charset";
+
+$options = [
+    PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
+    PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+    PDO::ATTR_EMULATE_PREPARES   => false,
+    PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8mb4 COLLATE utf8mb4_general_ci",
+    PDO::ATTR_TIMEOUT            => 30,
+];
+
 try {
-    $pdo = new PDO(
-        "mysql:host=$host;dbname=$db;charset=utf8mb4",
-        $user, $pass,
-        [
-            PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
-            PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-            PDO::ATTR_EMULATE_PREPARES   => false,
-            PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8mb4 COLLATE utf8mb4_general_ci",
-            PDO::ATTR_TIMEOUT            => 30,
-        ]
-    );
-    $pdo->exec("SET collation_connection = utf8mb4_general_ci");
+    $pdo = new PDO($dsn, $user, $pass, $options);

-    try {
-        $foyer = $pdo->query("SELECT currency, zone_scolaire FROM pf_foyer_settings WHERE id = 1")->fetch();
-        if (!defined('CURRENCY')) {
-            define('CURRENCY', $foyer['currency'] ?? '€');
-        }
-        if (!defined('ZONE_SCOLAIRE')) {
-            define('ZONE_SCOLAIRE', $foyer['zone_scolaire'] ?? 'C');
-        }
-    } catch (\PDOException $e) {
-        if (!defined('CURRENCY')) define('CURRENCY', '€');
-        if (!defined('ZONE_SCOLAIRE')) define('ZONE_SCOLAIRE', 'C');
-    }
-    // ------------------------------------------------
+    // Forcer la collation
+    $pdo->exec("SET collation_connection = utf8mb4_general_ci");
+    $pdo->exec("SET collation_database = utf8mb4_general_ci");
+    $pdo->exec("SET collation_server = utf8mb4_general_ci");

 } catch (\PDOException $e) {
-    if (!headers_sent()) { header('Content-Type: application/json'); http_response_code(500); }
-    die(json_encode(['ok' => false, 'error' => 'Erreur BDD : ' . $e->getMessage()]));
+    die("Erreur de connexion BDD (Host: $host, DB: $db) : " . $e->getMessage());
 }
 ?>