diff --git a/config/config.default.json b/config/config.default.json index 04cec1d810be6920292e01869c895886b249511d..a9d8b09fc47b3fbb8ba4a465cd7bf50228f6f7a6 100644 --- a/config/config.default.json +++ b/config/config.default.json @@ -4,14 +4,16 @@ "timezone": "Europe/Paris", "customLangPathDirectory": "" }, - "database": { - "server": "localhost", - "port": "5432", - "type": "POSTGRESQL", - "name": "maarch", - "user": "maarch", - "password": "maarch" - }, + "databases": [ + { + "server": "localhost", + "port": "5432", + "type": "POSTGRESQL", + "name": "maarch", + "user": "maarch", + "password": "maarch" + } + ], "electronicSignature": { "enable": false, "certPath": "/var/www/html/MaarchParapheur/samples/certs/MP_final_certificate.crt", diff --git a/src/core/models/DatabasePDO.php b/src/core/models/DatabasePDO.php index 97f9320036034b40bd2aabae6ece27692d0f60d4..e2ca167b93e965cef0f9acfbdf5fbd4e34ca1fcb 100755 --- a/src/core/models/DatabasePDO.php +++ b/src/core/models/DatabasePDO.php @@ -37,12 +37,8 @@ class DatabasePDO throw new \Exception('Configuration file can not be read'); } - $databases = array_filter($loaderJson, function($value, $key) { - return strpos($key, 'database') !== false; - }, ARRAY_FILTER_USE_BOTH); - $count = 1; - foreach ($databases as $key => $database) { + foreach ($loaderJson['databases'] as $key => $database) { $server = $database['server']; $port = $database['port']; $name = $database['name']; @@ -84,8 +80,7 @@ class DatabasePDO self::$pdo = new \PDO($dsn, $user, $password, $options); break; } catch (\PDOException $PDOException) { - if (!empty($loaderJson[$key . $count])) { - $count++; + if (!empty($loaderJson['databases'][$key + 1])) { continue; } else { throw new \Exception($PDOException->getMessage());