new api with url request

WEBROOT/api/get.php

@@ -1,70 +1,84 @@
 <?php
-include_once '../controller/DatabaseController.php';
-include_once '../controller/DataController.php';
-include_once __DIR__ . '/../modules/Mail.php';
+include_once(__DIR__ . '/../controller/DatabaseController.php');
+include_once(__DIR__ . '/../controller/DataController.php');
+include_once(__DIR__ . '/../modules/Mail.php');
 
 header("Content-Type: application/json");
 header("Access-Control-Allow-Origin: *");
-header("Access-Control-Allow-Headers: Authorization, Function, Content-Type");
-header("Access-Control-Allow-Methods: POST, GET, OPTIONS");
 
-if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
-    http_response_code(200);
-    exit();
-}
+// 1. Daten aus der URL (GET) statt aus dem Header holen
+$token    = $_GET['token'] ?? '';
+$function = $_GET['action'] ?? ''; // Ich habe es 'action' genannt, passend zur URL
 
-$validTokens = [
-    "15a437d128c918633e57dc7d18118a073b807644f21731ed5a7ebcf3eca9e242",
-];
-
-$headers = getallheaders();
-$token = $headers['Authorization'] ?? $headers['authorization'] ?? $_SERVER['HTTP_AUTHORIZATION'] ?? '';
-$function = $headers['Function'] ?? $headers['function'] ?? '';
-
-if (!in_array($token, $validTokens)) {
-    http_response_code(401);
-    $error = json_encode([
-        "error" => "Unauthorized",
-        "debug_received_token" => $token,
-        "debug_all_headers" => $headers
-    ]);
-    errorMail(
-        "API Login failed",
-        $error,
-    );
-    echo $error;
+// Prüfen, ob überhaupt etwas übergeben wurde
+if (empty($token) || empty($function)) {
+    http_response_code(400);
+    echo json_encode(["error" => "Token oder Action fehlt in der URL"]);
     exit;
 }
 
-if (in_array($token, $validTokens)) {
+// 2. Token-Validierung direkt in der Datenbank (Performanter!)
+// Annahme: Deine DatabaseShow kann Filter. Wenn nicht, hier das SQL anpassen.
+$checkToken = DatabaseShow(
+    "API_Credentials",
+    "TOKEN",
+    "TOKEN = ?",
+    $token
+);
+
+if (empty($checkToken)) {
+    http_response_code(401);
+    
+    // Loggen des Fehlversuchs
     DatabaseInsert(
-        "API",
-        "CLIENT_IP, TOKEN, API, FUNKTION",
+        "API_LOGS",
+        "CLIENT_IP, TOKEN, API, FUNKTION, JSON",
         (new getSpecificData())->getClientIP(),
         $token,
         (new getSpecificData())->getRequestURL(),
-        $function
+        $function,
+        json_encode(["error" => "Unauthorized"])
     );
-    
-    if ($function === "IPs") {
-        $data = DatabaseShow(
-            "logs",
-            "CLIENT_IP"
-        );
-    }
 
-    if ($function === "Ueberstunden") {
-        $data = DatabaseShow(
-            "Ueberstunden",
-            "MINUTEN"
-        );
-    }
-    
-    echo json_encode(
-        [
-            "success" => true,
-            "data" => $data,
-        ]
-    );
+    echo json_encode(["error" => "Zugriff verweigert", "hint" => "Token ungültig"]);
     exit;
-}
+}
+
+// 3. Logik-Teil mit switch (sauberer als viele IFs)
+$data = null;
+
+switch ($function) {
+    case "UeberstundenAbbau":
+        $data = DatabaseShow("Ueberstunden", "DATUM, MINUTEN", "GRUND = ?", "Abbau");
+        break;
+
+    case "UeberstundenAktuell":
+        $conn = db_connect();
+        $sql = "SELECT 
+                    (SELECT COALESCE(SUM(OVERTIME), 0) FROM Firmenberichte) AS berichte,
+                    (SELECT COALESCE(SUM(MINUTEN), 0) FROM Ueberstunden WHERE GRUND = 'Abbau') AS abbau,
+                    (SELECT COALESCE(SUM(MINUTEN), 0) FROM Ueberstunden WHERE GRUND = 'Aufbau') AS aufbau";
+        $res = $conn->query($sql);
+        $row = $res->fetch_object();
+        $data = ($row->berichte - $row->abbau + $row->aufbau) / 60;
+        break;
+
+    case "Berichte":
+        $data = DatabaseShowWithFK("Berufsschulberichte", $Berufsschulberichte);
+        break;
+
+    case "Stundenplan":
+        $data = DatabaseShowWithFK("Stundenplan", $Stundenplan, "ZEITEN, MO, DI, MI, DO, FR");
+        break;
+
+    default:
+        http_response_code(404);
+        echo json_encode(["error" => "Funktion '$function' nicht gefunden"]);
+        exit;
+}
+
+// 4. Erfolgreiche Antwort
+echo json_encode([
+    "success" => true,
+    "data" => $data
+]);

WEBROOT/controller/DataController.php

@@ -3,7 +3,7 @@
 class getSpecificData {
 
     public function getWeather() {
-        $url = "https://api.openweathermap.org/data/2.5/weather?q=Berlin,DE&APPID=5bc3e1a438c58fca444c4370ac0517b2&units=metric";
+        $url = "https://api.openweathermap.org/data/2.5/weather?q=Jena,DE&APPID=5bc3e1a438c58fca444c4370ac0517b2&units=metric";
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);

WEBROOT/controller/DatabaseConnect.php

@@ -65,6 +65,7 @@ function db_connect() {
         errorMail(
             "Database Connection failed",
             $e->getMessage(),
+            false,
         );
         redirectToWebsite("https://blackpi.ipv64.net");
         throw $e;

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
+            );
         }
     }
 

WEBROOT/controller/LogController.php

@@ -93,7 +93,8 @@ function logging() {
         } catch (mysqli_sql_exception $e) {
             errorMail(
                 "Logging failed",
-                $e->getMessage()
+                $e->getMessage(),
+                true,
             );
             throw $e;
         }

WEBROOT/modules/Mail.php

@@ -24,7 +24,7 @@ function sendMail($subject, $message, $url, bool $log) {
     }
 }
 
-function errorMail($title, $error) {
+function errorMail($title, $error, bool $log) {
     $headers = "From: bruno.eckhardt07@gmail.com\r\n";
     mail(
         "bruno.eckhardt07@gmail.com",
@@ -32,4 +32,14 @@ function errorMail($title, $error) {
         $error,
         $headers,
     );
+    if ($log == true) {
+        DatabaseInsert(
+            "Mailing",
+            "DATUM, SUBJECT, MESSAGE, URL, CLIENT_IP",
+            (new getSpecificData())->getRequestTime(),
+            "ERROR: $title",
+            $error,
+            (new getSpecificData())->getClientIP(),
+        );
+    }
 }

WEBROOT/services/weather_chart.php

@@ -42,7 +42,7 @@ $conn->close();
                 data: <?php echo json_encode($data); ?>,
                 borderColor: 'rgba(75, 192, 192, 1)',
                 backgroundColor: 'rgba(75, 192, 192, 0.2)',
-                fill: true,
+                fill: false,
                 tension: 0
             }]
         },
@@ -82,7 +82,7 @@ $conn->close();
                     }
                 },
                 y: {
-                    min: 0,
+                    min: -10,
                     max: 40,
                     title: {
                         display: true,

WEBROOT/services/zeiterfassung.php

@@ -1,4 +1,7 @@
 <?php
+include_once __DIR__ . '/../controller/DatabaseController.php';
+include_once __DIR__ . '/../controller/RoutesController.php';
+
 $conn = db_connect();
 $view = $_GET['view'] ?? 'show'; 
 $selectedService = $_GET['service']; 
@@ -8,8 +11,17 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_overtime'])) {
     $datum = $_POST['ot_date'];
     $minuten = intval($_POST['ot_minutes']); 
     $grund = $conn->real_escape_string($_POST['ot_reason']);
-    $insert_sql = "INSERT INTO Ueberstunden (DATUM, MINUTEN, GRUND) VALUES ('$datum', $minuten, '$grund')";
-    $conn->query($insert_sql);
+
+    DatabaseInsert(
+        "Ueberstunden", 
+        "DATUM, MINUTEN, GRUND", 
+        $datum, 
+        $minuten, 
+        $grund
+    );
+
+    redirectToWebsite((new getSpecificData())->getReferer());
+    exit;
 }
 
 // --- Gesamtsumme berechnen ---
@@ -59,6 +71,7 @@ $gesamt_minuten = $minuten_berichte - $minuten_abbau + $minuten_aufbau;
                     <option value="">Bitte wählen</option>
                     <option value="Abbau">Abbau</option>
                     <option value="Aufbau">Aufbau</option>
+                    <option value="Anderes">Anderes</option>
                 </select>
             </div>
             <button type="submit"