Merge branch 'main' into DEV

WEBROOT/api/get.php

@@ -13,9 +13,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
     exit();
 }
 
-$validTokens = [
-    "15a437d128c918633e57dc7d18118a073b807644f21731ed5a7ebcf3eca9e242",
-];
+// $validTokens = [
+//     "15a437d128c918633e57dc7d18118a073b807644f21731ed5a7ebcf3eca9e242",
+// ];
+$validTokens = DatabaseShow(
+    "API_Credentials",
+    "TOKEN"
+);
+
+$validTokens = array_column($validTokens, 'TOKEN');
 
 $headers = getallheaders();
 $token = $headers['Authorization'] ?? $headers['authorization'] ?? $_SERVER['HTTP_AUTHORIZATION'] ?? '';
@@ -39,7 +45,7 @@ if (!in_array($token, $validTokens)) {
 
 if (in_array($token, $validTokens)) {
     DatabaseInsert(
-        "API",
+        "API_LOGS",
         "CLIENT_IP, TOKEN, API, FUNKTION",
         (new getSpecificData())->getClientIP(),
         $token,
@@ -60,6 +66,13 @@ if (in_array($token, $validTokens)) {
             "MINUTEN"
         );
     }
+
+    if ($function === "Berichte") {
+        $data = DatabaseShowWithFK(
+            "Berufsschulberichte",
+            $Berufsschulberichte,
+        );
+    }
     
     echo json_encode(
         [

WEBROOT/controller/DatabaseController.php

@@ -147,10 +147,37 @@ function DatabaseUpdate($table, $set, $where, ...$values) {
     return true;
 }
 
+function getFKValue($conn, $table, $key, $value, $id, &$cache) {
+    if ($id === null) return null;
+
+    $cacheKey = $table . "_" . $id;
+
+    if (isset($cache[$cacheKey])) {
+        return $cache[$cacheKey];
+    }
+
+    $stmt = $conn->prepare("SELECT `$value` FROM `$table` WHERE `$key` = ? LIMIT 1");
+    if (!$stmt) {
+        die("FK Prepare Fehler: " . $conn->error);
+    }
+
+    $stmt->bind_param("i", $id);
+    $stmt->execute();
+
+    $result = $stmt->get_result()->fetch_assoc();
+    $valueResult = $result[$value] ?? null;
+
+    $cache[$cacheKey] = $valueResult;
+
+    return $valueResult;
+}
+
 function DatabaseShowWithFK($table, $fkMap = [], $columns = "*", $where = "", ...$values) {
     include_once 'DatabaseConnect.php';
     $conn = db_connect();
 
+    $cache = [];
+
     $select = is_array($columns) ? implode(", ", $columns) : $columns;
 
     $sql = "SELECT $select FROM `$table`";
@@ -161,33 +188,32 @@ function DatabaseShowWithFK($table, $fkMap = [], $columns = "*", $where = "", ..
     $stmt = $conn->prepare($sql);
     if (!$stmt) die("Fehler beim Prepare: " . $conn->error);
 
-    if (!$stmt->execute($values)) die("Fehler beim Execute: " . $stmt->error);
+    if (!empty($values)) {
+        $stmt->execute($values);
+    } else {
+        $stmt->execute();
+    }
 
     $result = $stmt->get_result();
-    if (!$result) die("Fehler beim get_result: " . $stmt->error);
-
-    $columnsResult = [];
-    while ($fieldinfo = $result->fetch_field()) {
-        $columnsResult[] = $fieldinfo->name;
-    }
+    if (!$result) die("Fehler beim get_result: " . $conn->error);
 
     $rows = $result->fetch_all(MYSQLI_ASSOC);
 
     foreach ($rows as &$row) {
         foreach ($fkMap as $fkColumn => $fkInfo) {
-            if (isset($row[$fkColumn]) && $row[$fkColumn] !== null) {
-                $fkStmt = $conn->prepare(
-                    "SELECT {$fkInfo['value']} FROM `{$fkInfo['table']}` WHERE {$fkInfo['key']} = ?"
-                );
-                if (!$fkStmt) die("Fehler beim Prepare FK: " . $conn->error);
 
-                $fkStmt->bind_param("i", $row[$fkColumn]);
-                $fkStmt->execute();
-                $fkResult = $fkStmt->get_result();
-                $fkRow = $fkResult->fetch_assoc();
-
-                $row[$fkColumn] = $fkRow ? $fkRow[$fkInfo['value']] : null;
+            if (!isset($row[$fkColumn]) || $row[$fkColumn] === null) {
+                continue;
             }
+
+            $row[$fkColumn] = getFKValue(
+                $conn,
+                $fkInfo['table'],
+                $fkInfo['key'],
+                $fkInfo['value'],
+                $row[$fkColumn],
+                $cache
+            );
         }
     }