From 6fcba2973c7addd21502224766ea10d8af682367 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Sun, 13 Apr 2025 10:05:24 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20the=20old=20query=20fun?=
 =?UTF-8?q?ctions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel/init.php     | 11 +++++++----
 kernel/lib.php      | 34 ----------------------------------
 kernel/renderer.php |  4 ++--
 3 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/kernel/init.php b/kernel/init.php
index 45167e1..828317b 100644
--- a/kernel/init.php
+++ b/kernel/init.php
@@ -47,13 +47,16 @@ require(PATH_KERNEL . 'database.php');
 require(PATH_REPOSITORIES . 'base.php');
 require(PATH_REPOSITORIES . 'control.php');
 require(PATH_REPOSITORIES . 'users.php');
+require(PATH_REPOSITORIES . 'items.php');
+require(PATH_REPOSITORIES . 'spells.php');
+require(PATH_REPOSITORIES . 'monsters.php');
 
 
 $starttime = getmicrotime();
-$numqueries = 0;
-
-$link = opendb();
 
 // Repositories
 $controlRepositories = new ControlRepository();
-$userRepository = new UserRepository();
\ No newline at end of file
+$userRepository = new UserRepository();
+$itemRepository = new ItemRepository();
+$spellRepository = new SpellRepository();
+$monsterRepository = new MonsterRepository();
\ No newline at end of file
diff --git a/kernel/lib.php b/kernel/lib.php
index 32f35c0..3bcaa06 100644
--- a/kernel/lib.php
+++ b/kernel/lib.php
@@ -39,40 +39,6 @@ function html_deep($value) {
    
 }
 
-function opendb() { // Open database connection.
-    include(PATH_ROOT.'config.php');
-    extract($dbsettings);
-
-    // Créer une connexion à la base de données
-    $link = mysqli_connect($server, $user, $pass, $name);
-
-    // Vérifier la connexion
-    if (!$link) {
-        die("Connection failed: " . mysqli_connect_error());
-    }
-
-    return $link;
-}
-
-function doquery($query, $table) { // Something of a tiny little database abstraction layer.
-    include(PATH_ROOT.'/config.php');
-    global $numqueries;
-
-    // Remplacer {{table}} par le préfixe de la table
-    $query = str_replace("{{table}}", $dbsettings["prefix"] . "_" . $table, $query);
-
-    // Exécuter la requête
-    $sqlquery = mysqli_query(opendb(), $query);
-
-    // Vérifier les erreurs de requête
-    if (!$sqlquery) {
-        die("Query failed: " . mysqli_error(opendb()));
-    }
-
-    $numqueries++;
-    return $sqlquery;
-}
-
 function gettemplate($templatename) { // SQL query for the template.
 
     $filename = "templates/" . $templatename . ".php";
diff --git a/kernel/renderer.php b/kernel/renderer.php
index 298d8fe..b5fee82 100644
--- a/kernel/renderer.php
+++ b/kernel/renderer.php
@@ -36,14 +36,14 @@ class Renderer {
 
     private function render($template) {
         global $controlrow;
-        global $numqueries;
+        global $db;
         global $starttime;
         global $messages;
 
         $this->prepare("STYLE_FOLDER", '/theme/default/');
         $this->prepare("dkgamename", $controlrow["gamename"]);
         $this->prepare("totaltime", round(getmicrotime() - $starttime, 4));
-        $this->prepare("numqueries", $numqueries);
+        $this->prepare("numqueries", $db->getNumQueries());
         $this->prepare("version", DRAGONFORK_VERSION);
         $this->prepare("build", DRAGONFORK_BUILD);
         $this->prepare("messages", $messages->messageList());