From 55ad42b095932f9e704fd67e96677c7040416c6c Mon Sep 17 00:00:00 2001
From: Florian Pesth <fpesth@gmx.de>
Date: Mon, 5 Feb 2024 06:04:12 +0100
Subject: [PATCH] Fix GetDienste

---
 html/AdminDienste.php | 4 ++--
 html/SQL.php          | 5 +++--
 html/testPDO.php      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/html/AdminDienste.php b/html/AdminDienste.php
index f78b906..3050edc 100644
--- a/html/AdminDienste.php
+++ b/html/AdminDienste.php
@@ -131,7 +131,7 @@ if (isset($_POST['DienstSearch'])) {
 <?php
 
 
-$db_erg = GetDienste($db_link);
+$zeilen = GetDienste($db_link);
 
 $Was = "";
 $Wo = "";
@@ -140,7 +140,7 @@ $Leiter = "";
 $Gruppe = "";
 $HelferLevel = "";
 
-while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
+while ($zeilen as $zeile){
     if ($zeile['DienstID'] != $DienstID) {
         echo "<option value='" . $zeile['DienstID'] . "'>" . $zeile['Was'] . "</option>";
     } else {
diff --git a/html/SQL.php b/html/SQL.php
index 443b829..85fcde3 100644
--- a/html/SQL.php
+++ b/html/SQL.php
@@ -58,7 +58,7 @@ class DB {
     }
     public function fetchAll($method, $variant = '')
     {
-        return self::$stmts[$method . "::" . $variant]->fetchAll();
+        return self::$stmts[$method . "::" . $variant]->fetchAll(PDO::FETCH_ASSOC);
     }
     public function pdoErrorCode()
     {
@@ -536,7 +536,8 @@ function GetDienste()
     $db->prepare(__METHOD__,"SELECT DienstID, Was, Wo, Info, Leiter, ElternDienstID, HelferLevel FROM Dienst order By Was");
     $db_erg = $db->execute(__METHOD__);
     $db->onErrorDie(__METHOD__);
-    return $db_erg;
+    $dienste = $db->fetchAll(__METHOD__);
+    return $dienste;
 }
 
 function GetDiensteChilds($DienstID)
diff --git a/html/testPDO.php b/html/testPDO.php
index c662b08..f18d7c4 100644
--- a/html/testPDO.php
+++ b/html/testPDO.php
@@ -508,5 +508,5 @@ TestHelferdaten();
 TestHelferdatenAendern();
 TestNewDienst();
 TestGetDienste();
-TestDeleteDienst();
+#TestDeleteDienst();
 ?>