From 8abc400ef63f9032d5c9265d47f7d6bd46e7f099 Mon Sep 17 00:00:00 2001
From: Florian Pesth <fpesth@gmx.de>
Date: Fri, 22 Mar 2024 16:43:57 +0100
Subject: [PATCH] Remove remaining mysqli statements

---
 html/AdminAlleSchichten.php          |  1 -
 html/AdminDienste.php                |  3 --
 html/AdminUserdaten.php              |  2 +-
 html/Ausdrucke-alles.php             |  8 ----
 html/CreateHelfer.php                |  7 ---
 html/DetailsSchichten.php            | 11 -----
 html/MeineSchichten.php              |  2 +-
 html/ReadLog.php                     |  2 -
 html/SQL.php                         | 72 ----------------------------
 html/TeilnehmerSchichtenAusdruck.php |  6 ---
 10 files changed, 2 insertions(+), 112 deletions(-)

diff --git a/html/AdminAlleSchichten.php b/html/AdminAlleSchichten.php
index 82d7138..4648b1c 100644
--- a/html/AdminAlleSchichten.php
+++ b/html/AdminAlleSchichten.php
@@ -3,7 +3,6 @@
 require_once 'konfiguration.php';
 SESSION_START();
 require 'SQL.php';
-$db_link = ConnectDB();
 require '_login.php';
 
 if ($AdminStatus != 1) {
diff --git a/html/AdminDienste.php b/html/AdminDienste.php
index 66a3562..2e18f13 100644
--- a/html/AdminDienste.php
+++ b/html/AdminDienste.php
@@ -372,9 +372,6 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
 <?php
 
 
-mysqli_free_result($db_erg);
-
-
 $_SESSION["DienstID"] = $DienstID;
 $_SESSION["SchichtID"] = $SchichtID;
 
diff --git a/html/AdminUserdaten.php b/html/AdminUserdaten.php
index 7dca845..74de366 100644
--- a/html/AdminUserdaten.php
+++ b/html/AdminUserdaten.php
@@ -113,7 +113,7 @@ if (isset($_POST['del'])) {
 $db_erg = Helferdaten($AliasHelferID);
 
 
-foreach ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
+foreach ($zeilen as $zeile) {
     $HelferName = $zeile['Name'];
     $HelferEmail = $zeile['Email'];
     $HelferHandy = $zeile['Handy'];
diff --git a/html/Ausdrucke-alles.php b/html/Ausdrucke-alles.php
index 024bf56..40b7f13 100644
--- a/html/Ausdrucke-alles.php
+++ b/html/Ausdrucke-alles.php
@@ -125,13 +125,5 @@ echo "</table>";
 
 ?>
   
-
-
-<?php
-
-mysqli_free_result($db_erg);
-?>
-
-
 </body>
 </html>
diff --git a/html/CreateHelfer.php b/html/CreateHelfer.php
index 0de5de2..3113758 100644
--- a/html/CreateHelfer.php
+++ b/html/CreateHelfer.php
@@ -158,12 +158,5 @@ foreach ($db_erg as $zeile) {
   
 </form>
 
-
-  
-<?php
-
-mysqli_free_result($db_erg);
-?>
-  
  </body>
 </html>
diff --git a/html/DetailsSchichten.php b/html/DetailsSchichten.php
index 6a5910b..c049e16 100644
--- a/html/DetailsSchichten.php
+++ b/html/DetailsSchichten.php
@@ -136,17 +136,6 @@ while ($x < $arrayLength) {
 
     echo "</table>";
 
-
-
-
-
-
-
-
-
-mysqli_free_result($db_erg);
-
-
 ?>
  
  </form> 
diff --git a/html/MeineSchichten.php b/html/MeineSchichten.php
index dab0f8b..146ba44 100644
--- a/html/MeineSchichten.php
+++ b/html/MeineSchichten.php
@@ -255,7 +255,7 @@ if (isset($_POST['sent'])) {
 
 $schichten = AlleSchichtenEinesHelfers($HelferID);
 
-  $iSQLCount = mysqli_num_rows($schichten);
+  $iSQLCount = count($schichten);
   //$iSQLCount = 3;
 
 echo '<table class="commontable">';
diff --git a/html/ReadLog.php b/html/ReadLog.php
index 6ed3df2..4bdb3f1 100644
--- a/html/ReadLog.php
+++ b/html/ReadLog.php
@@ -28,8 +28,6 @@ require '_login.php';
   //check for admin status
   $HelferID = $_SESSION["HelferID"];
   $AdminID = $_SESSION["AdminID"];
-  $db_link = mysqli_connect(MYSQL_HOST, MYSQL_BENUTZER, MYSQL_KENNWORT, MYSQL_DATENBANK);
-  DatenbankAufDeutsch();
 
   $zeilen = Helferdaten($HelferID);
 foreach ($zeilen as $zeile)) {
diff --git a/html/SQL.php b/html/SQL.php
index 8283e93..6e9f49d 100644
--- a/html/SQL.php
+++ b/html/SQL.php
@@ -820,75 +820,3 @@ function HelferLevel()
     $zeilen = $db->fetchAll(__METHOD__);
     return $zeilen;
 }
-// TODO: als Array zurueckgeben (CreateHelfer anpassen)
-// TODO:
-//function HelferLevel($db_link){
-//    $sql = "SELECT HelferLevel, HelferLevelBeschreibung FROM HelferLevel";
-//    $db_erg = mysqli_query($db_link, $sql);
-//    if (!$db_erg) {
-//        echo "Konnte HelferLevel nicht abfragen";
-//        die('Ungueltige Abfrage: ' . mysqli_error($db_link));
-//    }
-//
-//    $results = array();
-//    while ($row = mysqli_fetch_assoc($db_erg)) {
-//        $results[] = $row;
-//    }
-//
-//    mysqli_free_result($db_erg); // Freigabe des Ergebnisobjekts
-//
-//    return $results;
-//}
-
-//FIXME (not in use for production code anyway)
-function DebugAusgabeDbErgebnis($db_erg)
-{
-    // Ausgabe auf Browser Console
-
-    // if(mysqli_num_rows($db_erg) > 0) {
-    // $fields = mysqli_fetch_fields($db_erg);
-    // $field_names = [];
-    // foreach($fields as $field) {
-    // $field_names[] = $field->name;
-    // }
-    // $rows = array();
-    // while($row = mysqli_fetch_row($db_erg)) {
-    // $rows[] = $row;
-    // }
-    //
-    // $js_code = "console.log('Query results:');";
-    // $js_code .= "console.log('" . implode('\t', $field_names) . "');";
-    // foreach($rows as $row) {
-    // $js_code .= "console.log('" . implode('\t', $row) . "');";
-    // }
-    // echo "<script>" . $js_code . "</script>";
-    // } else {
-    // echo "Keine Ergebnisse gefunden.";
-    // }
-    //
-
-
-    // direkte ausgabe in Seite
-    echo "<table>";
-    if (mysqli_num_rows($db_erg) > 0) {
-        // Tabellenkopf ausgeben
-        echo "<tr>";
-        $fields = mysqli_fetch_fields($db_erg);
-        foreach ($fields as $field) {
-            echo "<th>" . $field->name . "</th>";
-        }
-        echo "</tr>";
-
-        // Tabelleninhalt ausgeben
-        while ($row = mysqli_fetch_row($db_erg)) {
-            echo "<tr>";
-            foreach ($row as $value) {
-                echo "<td>" . $value . "</td>";
-            }
-            echo "</tr>";
-        }
-    } else {
-        echo "<tr><td>Keine Ergebnisse gefunden.</td></tr>";
-    }
-    echo "</table>";
-}
diff --git a/html/TeilnehmerSchichtenAusdruck.php b/html/TeilnehmerSchichtenAusdruck.php
index fd975e9..28bad3c 100644
--- a/html/TeilnehmerSchichtenAusdruck.php
+++ b/html/TeilnehmerSchichtenAusdruck.php
@@ -251,12 +251,6 @@ while ($db_link as $zeile) {
 }
 echo "</table>\n";
 
-
-// old table, remove later
-
-mysqli_free_result($db_erg);
-
-
 ?>
 
  <!--/form-->