From 2bd4c2215a0b6b9b1ff5fd1b4b2fc62b609da76d Mon Sep 17 00:00:00 2001
From: Kilian Hofmann <llego03@yahoo.com>
Date: Fri, 31 May 2024 11:01:11 +0200
Subject: [PATCH] Adjust DB connector

---
 base/database.php | 17 +++++++++--------
 configs/db.ini    |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/base/database.php b/base/database.php
index 6619a18..55fef28 100644
--- a/base/database.php
+++ b/base/database.php
@@ -6,22 +6,23 @@ class DB extends PDO
     parent::__construct($dsn, $username, $password, $options);
   }
 
-  static function openConnection()
+  static function openConnection($config = "../configs/db.ini")
   {
     $conn = null;
     try {
-      $dataAccess = parse_ini_file("../configs/db.ini", true);
+      $dataAccess = parse_ini_file($config, true);
 
       $conn = new PDO(
-        "mysql:host=" . $dataAccess["ZEDAT"]["host"] .
-          ";dbname=" . $dataAccess["ZEDAT"]["database"] . ";charset=utf8",
+        "mysql:host={$dataAccess["ZEDAT"]["host"]};dbname={$dataAccess["ZEDAT"]["database"]};charset={$dataAccess["ZEDAT"]["charset"]}",
         $dataAccess["ZEDAT"]["user"],
         $dataAccess["ZEDAT"]["passwd"],
-        array(PDO::ATTR_PERSISTENT => false)
+        [
+          PDO::ATTR_PERSISTENT => false,
+          PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+          PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+          PDO::ATTR_EMULATE_PREPARES   => false,
+        ]
       );
-
-      $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-      $conn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
     } catch (PDOException $exc) {
       echo $exc->getMessage();
     }
diff --git a/configs/db.ini b/configs/db.ini
index 788d249..14c5b7d 100644
--- a/configs/db.ini
+++ b/configs/db.ini
@@ -3,3 +3,4 @@ host      = usersql.zedat.fu-berlin.de
 user      = khofmann-sql
 passwd    = xz8c7m7p
 database  = khofmann-db1
+charset   = utf8