perco/HouseHub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: corrige include paths et get_family_pdo() dans api.php Liste
Deploy HouseHub / deploy (push) Successful in 2s
Details

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
perco
2026-05-19 17:13:49 +02:00
co-authored by Claude Sonnet 4.6
parent 987ce43e52
commit 3516225e56
1 changed files with 91 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/liste/api.php
+91 -107
View File
@@ -1,26 +1,35 @@
<?php <?php
require_once __DIR__ . '/../../includes/auth.php'; ob_start();
require_once dirname(__DIR__, 2) . '/includes/auth.php';
require_login(); require_login();
header('Content-Type: application/json; charset=utf-8');
$pdo = get_family_pdo(); header('Content-Type: application/json');
$action = $_GET['action'] ?? $_POST['action'] ?? '';
$method = $_SERVER['REQUEST_METHOD'];
// Auto-create tables if missing set_exception_handler(function (\Throwable $e) {
if (!headers_sent()) {
header('Content-Type: application/json');
http_response_code(500);
}
echo json_encode(['ok' => false, 'error' => $e->getMessage()]);
exit;
});
require_once dirname(__DIR__, 2) . '/includes/db.php';
// Auto-create tables
$pdo->exec("CREATE TABLE IF NOT EXISTS pf_lists ( $pdo->exec("CREATE TABLE IF NOT EXISTS pf_lists (
id INT AUTO_INCREMENT PRIMARY KEY, id INT AUTO_INCREMENT PRIMARY KEY,
name VARCHAR(255) NOT NULL DEFAULT 'Ma liste', name VARCHAR(255) NOT NULL DEFAULT 'Ma liste',
position INT NOT NULL DEFAULT 0, position INT NOT NULL DEFAULT 0,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP created_at DATETIME DEFAULT CURRENT_TIMESTAMP
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4"); ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
$pdo->exec("CREATE TABLE IF NOT EXISTS pf_grocery_items ( $pdo->exec("CREATE TABLE IF NOT EXISTS pf_grocery_items (
id INT AUTO_INCREMENT PRIMARY KEY, id INT AUTO_INCREMENT PRIMARY KEY,
list_id INT NOT NULL DEFAULT 1, list_id INT NOT NULL DEFAULT 1,
label VARCHAR(500) NOT NULL, label VARCHAR(500) NOT NULL,
in_cart TINYINT(1) NOT NULL DEFAULT 0, in_cart TINYINT(1) NOT NULL DEFAULT 0,
position INT NOT NULL DEFAULT 0, position INT NOT NULL DEFAULT 0,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP, created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
KEY idx_items_list (list_id) KEY idx_items_list (list_id)
@@ -35,27 +44,35 @@ $pdo->exec("CREATE TABLE IF NOT EXISTS pf_grocery_history (
KEY idx_hist_last (last_used_at) KEY idx_hist_last (last_used_at)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4"); ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
// Add list_id column if missing (migration) // Add list_id column if missing (migration from old groceries table)
try { try { $pdo->exec("ALTER TABLE pf_grocery_items ADD COLUMN list_id INT NOT NULL DEFAULT 1 AFTER id"); } catch (\Exception $e) {}
$pdo->exec("ALTER TABLE pf_grocery_items ADD COLUMN list_id INT NOT NULL DEFAULT 1 AFTER id"); try { $pdo->exec("ALTER TABLE pf_grocery_items ADD KEY idx_items_list (list_id)"); } catch (\Exception $e) {}
$pdo->exec("ALTER TABLE pf_grocery_items ADD KEY idx_items_list (list_id)");
} catch (Exception $e) { /* already exists */ }
// ── Helpers ────────────────────────────────────────────────────────────────── $action = $_GET['action'] ?? $_POST['action'] ?? '';
$method = $_SERVER['REQUEST_METHOD'];
function normalize(string $s): string { $body = [];
if ($method === 'PUT' || $method === 'POST') {
$raw = file_get_contents('php://input');
if ($raw) $body = json_decode($raw, true) ?? [];
foreach ($_POST as $k => $v) if (!isset($body[$k])) $body[$k] = $v;
}
// ── Helpers ───────────────────────────────────────────────────────────────────
function liste_normalize(string $s): string {
return mb_strtolower(trim(mb_substr($s, 0, 500))); return mb_strtolower(trim(mb_substr($s, 0, 500)));
} }
function touch_history(PDO $pdo, string $label): void { function liste_touch_history(PDO $pdo, string $label): void {
$hash = hash('sha256', normalize($label)); $hash = hash('sha256', liste_normalize($label));
$pdo->prepare("INSERT INTO pf_grocery_history (label_hash, label_display) $pdo->prepare("INSERT INTO pf_grocery_history (label_hash, label_display)
VALUES (?, ?) VALUES (?, ?)
ON DUPLICATE KEY UPDATE label_display=VALUES(label_display), last_used_at=NOW()") ON DUPLICATE KEY UPDATE label_display=VALUES(label_display), last_used_at=NOW()")
->execute([$hash, trim($label)]); ->execute([$hash, trim($label)]);
} }
function ensure_default_list(PDO $pdo): int { function liste_ensure_default(PDO $pdo): int {
$count = (int) $pdo->query("SELECT COUNT(*) FROM pf_lists")->fetchColumn(); $count = (int) $pdo->query("SELECT COUNT(*) FROM pf_lists")->fetchColumn();
if ($count === 0) { if ($count === 0) {
$pdo->exec("INSERT INTO pf_lists (name, position) VALUES ('Ma liste', 0)"); $pdo->exec("INSERT INTO pf_lists (name, position) VALUES ('Ma liste', 0)");
@@ -64,67 +81,38 @@ function ensure_default_list(PDO $pdo): int {
return (int) $pdo->query("SELECT id FROM pf_lists ORDER BY position, id LIMIT 1")->fetchColumn(); return (int) $pdo->query("SELECT id FROM pf_lists ORDER BY position, id LIMIT 1")->fetchColumn();
} }
function valid_list_id(PDO $pdo, int $id): bool { // ── LISTS ─────────────────────────────────────────────────────────────────────
return (bool) $pdo->prepare("SELECT 1 FROM pf_lists WHERE id=?")
->execute([$id]) &&
(bool) $pdo->prepare("SELECT 1 FROM pf_lists WHERE id=?")->execute([$id]) &&
(int) $pdo->prepare("SELECT COUNT(*) FROM pf_lists WHERE id=?")->execute([$id]) &&
(int) ($r = $pdo->prepare("SELECT COUNT(*) FROM pf_lists WHERE id=?")) &&
$r->execute([$id]) && (int)$r->fetchColumn() > 0;
}
function list_exists(PDO $pdo, int $id): bool {
$s = $pdo->prepare("SELECT COUNT(*) FROM pf_lists WHERE id=?");
$s->execute([$id]);
return (int)$s->fetchColumn() > 0;
}
// ── Body JSON ────────────────────────────────────────────────────────────────
$body = [];
if ($method === 'PUT' || $method === 'POST') {
$raw = file_get_contents('php://input');
if ($raw) $body = json_decode($raw, true) ?? [];
foreach ($_POST as $k => $v) if (!isset($body[$k])) $body[$k] = $v;
}
// ── Router ────────────────────────────────────────────────────────────────────
// LISTS -----------------------------------------------------------------------
if ($action === 'lists') { if ($action === 'lists') {
if ($method === 'GET') { if ($method === 'GET') {
$firstId = ensure_default_list($pdo); $firstId = liste_ensure_default($pdo);
$rows = $pdo->query("SELECT id, name, position FROM pf_lists ORDER BY position, id")->fetchAll(PDO::FETCH_ASSOC); $rows = $pdo->query("SELECT id, name, position FROM pf_lists ORDER BY position, id")->fetchAll(PDO::FETCH_ASSOC);
echo json_encode(['lists' => $rows, 'default_id' => $firstId]); echo json_encode(['lists' => $rows, 'default_id' => $firstId]);
exit; exit;
} }
if ($method === 'POST') { if ($method === 'POST') {
$name = trim($body['name'] ?? ''); $name = trim($body['name'] ?? '');
if ($name === '') { http_response_code(400); echo json_encode(['error'=>'name required']); exit; } if ($name === '') { http_response_code(400); echo json_encode(['error' => 'name required']); exit; }
$name = mb_substr($name, 0, 100); $name = mb_substr($name, 0, 100);
$pos = (int) $pdo->query("SELECT COALESCE(MAX(position),0)+1 FROM pf_lists")->fetchColumn(); $s = $pdo->query("SELECT COALESCE(MAX(position),0)+1 FROM pf_lists");
$s = $pdo->prepare("INSERT INTO pf_lists (name, position) VALUES (?, ?)"); $pos = (int) $s->fetchColumn();
$s->execute([$name, $pos]); $pdo->prepare("INSERT INTO pf_lists (name, position) VALUES (?, ?)")->execute([$name, $pos]);
$id = (int) $pdo->lastInsertId(); $id = (int) $pdo->lastInsertId();
echo json_encode(['id' => $id, 'name' => $name, 'position' => $pos]); echo json_encode(['id' => $id, 'name' => $name, 'position' => $pos]);
exit; exit;
} }
if ($method === 'PUT') { if ($method === 'PUT') {
$id = (int) ($_GET['id'] ?? 0); $id = (int) ($_GET['id'] ?? 0);
$name = trim($body['name'] ?? ''); $name = trim($body['name'] ?? '');
if (!$id || $name === '') { http_response_code(400); echo json_encode(['error'=>'invalid']); exit; } if (!$id || $name === '') { http_response_code(400); echo json_encode(['error' => 'invalid']); exit; }
$name = mb_substr($name, 0, 100); $pdo->prepare("UPDATE pf_lists SET name=? WHERE id=?")->execute([mb_substr($name,0,100), $id]);
$pdo->prepare("UPDATE pf_lists SET name=? WHERE id=?")->execute([$name, $id]);
echo json_encode(['ok' => true]); echo json_encode(['ok' => true]);
exit; exit;
} }
if ($method === 'DELETE') { if ($method === 'DELETE') {
$id = (int) ($_GET['id'] ?? 0); $id = (int) ($_GET['id'] ?? 0);
$count = (int) $pdo->query("SELECT COUNT(*) FROM pf_lists")->fetchColumn(); $count = (int) $pdo->query("SELECT COUNT(*) FROM pf_lists")->fetchColumn();
if ($count <= 1) { http_response_code(400); echo json_encode(['error'=>'cannot delete last list']); exit; } if ($count <= 1) { http_response_code(400); echo json_encode(['error' => 'cannot delete last list']); exit; }
$pdo->prepare("DELETE FROM pf_grocery_items WHERE list_id=?")->execute([$id]); $pdo->prepare("DELETE FROM pf_grocery_items WHERE list_id=?")->execute([$id]);
$pdo->prepare("DELETE FROM pf_lists WHERE id=?")->execute([$id]); $pdo->prepare("DELETE FROM pf_lists WHERE id=?")->execute([$id]);
echo json_encode(['ok' => true]); echo json_encode(['ok' => true]);
@@ -132,95 +120,91 @@ if ($action === 'lists') {
} }
} }
// ITEMS ----------------------------------------------------------------------- // ── ITEMS ─────────────────────────────────────────────────────────────────────
if ($action === 'items') { if ($action === 'items') {
$list_id = (int) ($_GET['list_id'] ?? $body['list_id'] ?? 0); $list_id = (int) ($_GET['list_id'] ?? $body['list_id'] ?? 0);
if ($method === 'GET') { if ($method === 'GET') {
if (!$list_id) { http_response_code(400); echo json_encode(['error'=>'list_id required']); exit; } if (!$list_id) { http_response_code(400); echo json_encode(['error' => 'list_id required']); exit; }
$s = $pdo->prepare("SELECT id, list_id, label, in_cart, position FROM pf_grocery_items WHERE list_id=? ORDER BY in_cart, position, id"); $s = $pdo->prepare("SELECT id, list_id, label, in_cart, position FROM pf_grocery_items WHERE list_id=? ORDER BY in_cart, position, id");
$s->execute([$list_id]); $s->execute([$list_id]);
echo json_encode(['items' => $s->fetchAll(PDO::FETCH_ASSOC)]); echo json_encode(['items' => $s->fetchAll(PDO::FETCH_ASSOC)]);
exit; exit;
} }
if ($method === 'POST') { if ($method === 'POST') {
$label = trim($body['label'] ?? ''); $label = trim($body['label'] ?? '');
if (!$list_id || $label === '') { http_response_code(400); echo json_encode(['error'=>'missing fields']); exit; } if (!$list_id || $label === '') { http_response_code(400); echo json_encode(['error' => 'missing fields']); exit; }
// Check duplicate $norm = liste_normalize($label);
$norm = normalize($label); $dup = $pdo->prepare("SELECT COUNT(*) FROM pf_grocery_items WHERE list_id=? AND LOWER(TRIM(label))=?");
$s = $pdo->prepare("SELECT COUNT(*) FROM pf_grocery_items WHERE list_id=? AND LOWER(TRIM(label))=?"); $dup->execute([$list_id, $norm]);
$s->execute([$list_id, $norm]); if ((int)$dup->fetchColumn() > 0) { echo json_encode(['duplicate' => true]); exit; }
if ((int)$s->fetchColumn() > 0) { echo json_encode(['duplicate' => true]); exit; } $q = $pdo->prepare("SELECT COALESCE(MAX(position),0)+1 FROM pf_grocery_items WHERE list_id=?");
$pos = (int) $pdo->prepare("SELECT COALESCE(MAX(position),0)+1 FROM pf_grocery_items WHERE list_id=?")->execute([$list_id]) && $q->execute([$list_id]);
($q = $pdo->prepare("SELECT COALESCE(MAX(position),0)+1 FROM pf_grocery_items WHERE list_id=?")) && $pos = (int) $q->fetchColumn();
$q->execute([$list_id]) ? (int)$q->fetchColumn() : 0; $pdo->prepare("INSERT INTO pf_grocery_items (list_id, label, in_cart, position) VALUES (?,?,0,?)")->execute([$list_id, $label, $pos]);
$ins = $pdo->prepare("INSERT INTO pf_grocery_items (list_id, label, in_cart, position) VALUES (?, ?, 0, ?)");
$ins->execute([$list_id, trim($label), $pos]);
$id = (int) $pdo->lastInsertId(); $id = (int) $pdo->lastInsertId();
touch_history($pdo, $label); liste_touch_history($pdo, $label);
echo json_encode(['id' => $id, 'list_id' => $list_id, 'label' => trim($label), 'in_cart' => 0, 'position' => $pos]); echo json_encode(['id' => $id, 'list_id' => $list_id, 'label' => $label, 'in_cart' => 0, 'position' => $pos]);
exit; exit;
} }
if ($method === 'PUT') { if ($method === 'PUT') {
$id = (int) ($_GET['id'] ?? 0); $id = (int) ($_GET['id'] ?? 0);
if (!$id) { http_response_code(400); echo json_encode(['error'=>'id required']); exit; } if (!$id) { http_response_code(400); echo json_encode(['error' => 'id required']); exit; }
if (isset($body['in_cart'])) { if (isset($body['in_cart'])) {
$pdo->prepare("UPDATE pf_grocery_items SET in_cart=? WHERE id=?")->execute([(int)$body['in_cart'], $id]); $pdo->prepare("UPDATE pf_grocery_items SET in_cart=? WHERE id=?")->execute([(int)$body['in_cart'], $id]);
} }
if (isset($body['label'])) { if (isset($body['label'])) {
$label = trim($body['label']); $label = trim($body['label']);
if ($label !== '') { if ($label !== '') { $pdo->prepare("UPDATE pf_grocery_items SET label=? WHERE id=?")->execute([$label, $id]); liste_touch_history($pdo, $label); }
$pdo->prepare("UPDATE pf_grocery_items SET label=? WHERE id=?")->execute([$label, $id]);
touch_history($pdo, $label);
}
} }
echo json_encode(['ok' => true]); echo json_encode(['ok' => true]);
exit; exit;
} }
if ($method === 'DELETE') { if ($method === 'DELETE') {
$id = (int) ($_GET['id'] ?? 0); $id = (int) ($_GET['id'] ?? 0);
if (!$id) { http_response_code(400); echo json_encode(['error'=>'id required']); exit; } if (!$id) { http_response_code(400); echo json_encode(['error' => 'id required']); exit; }
$row = $pdo->prepare("SELECT label FROM pf_grocery_items WHERE id=?"); $r = $pdo->prepare("SELECT label FROM pf_grocery_items WHERE id=?");
$row->execute([$id]); $r->execute([$id]);
if ($r = $row->fetch()) touch_history($pdo, $r['label']); if ($row = $r->fetch()) liste_touch_history($pdo, $row['label']);
$pdo->prepare("DELETE FROM pf_grocery_items WHERE id=?")->execute([$id]); $pdo->prepare("DELETE FROM pf_grocery_items WHERE id=?")->execute([$id]);
echo json_encode(['ok' => true]); echo json_encode(['ok' => true]);
exit; exit;
} }
} }
// BULK ACTIONS ---------------------------------------------------------------- // ── BULK ──────────────────────────────────────────────────────────────────────
if ($action === 'uncheck_all' && $method === 'POST') { if ($action === 'uncheck_all' && $method === 'POST') {
$list_id = (int) ($body['list_id'] ?? 0); $list_id = (int)($body['list_id'] ?? 0);
if (!$list_id) { http_response_code(400); echo json_encode(['error'=>'list_id required']); exit; } if ($list_id) $pdo->prepare("UPDATE pf_grocery_items SET in_cart=0 WHERE list_id=?")->execute([$list_id]);
$pdo->prepare("UPDATE pf_grocery_items SET in_cart=0 WHERE list_id=?")->execute([$list_id]);
echo json_encode(['ok' => true]); exit; echo json_encode(['ok' => true]); exit;
} }
if ($action === 'delete_picked' && $method === 'POST') { if ($action === 'delete_picked' && $method === 'POST') {
$list_id = (int) ($body['list_id'] ?? 0); $list_id = (int)($body['list_id'] ?? 0);
if (!$list_id) { http_response_code(400); echo json_encode(['error'=>'list_id required']); exit; } if ($list_id) {
$rows = $pdo->prepare("SELECT label FROM pf_grocery_items WHERE list_id=? AND in_cart=1"); $rows = $pdo->prepare("SELECT label FROM pf_grocery_items WHERE list_id=? AND in_cart=1");
$rows->execute([$list_id]); $rows->execute([$list_id]);
foreach ($rows->fetchAll() as $r) touch_history($pdo, $r['label']); foreach ($rows->fetchAll() as $r) liste_touch_history($pdo, $r['label']);
$pdo->prepare("DELETE FROM pf_grocery_items WHERE list_id=? AND in_cart=1")->execute([$list_id]); $pdo->prepare("DELETE FROM pf_grocery_items WHERE list_id=? AND in_cart=1")->execute([$list_id]);
}
echo json_encode(['ok' => true]); exit; echo json_encode(['ok' => true]); exit;
} }
if ($action === 'clear_all' && $method === 'POST') { if ($action === 'clear_all' && $method === 'POST') {
$list_id = (int) ($body['list_id'] ?? 0); $list_id = (int)($body['list_id'] ?? 0);
if (!$list_id) { http_response_code(400); echo json_encode(['error'=>'list_id required']); exit; } if ($list_id) {
$rows = $pdo->prepare("SELECT label FROM pf_grocery_items WHERE list_id=?"); $rows = $pdo->prepare("SELECT label FROM pf_grocery_items WHERE list_id=?");
$rows->execute([$list_id]); $rows->execute([$list_id]);
foreach ($rows->fetchAll() as $r) touch_history($pdo, $r['label']); foreach ($rows->fetchAll() as $r) liste_touch_history($pdo, $r['label']);
$pdo->prepare("DELETE FROM pf_grocery_items WHERE list_id=?")->execute([$list_id]); $pdo->prepare("DELETE FROM pf_grocery_items WHERE list_id=?")->execute([$list_id]);
}
echo json_encode(['ok' => true]); exit; echo json_encode(['ok' => true]); exit;
} }
// HISTORY --------------------------------------------------------------------- // ── HISTORY ───────────────────────────────────────────────────────────────────
if ($action === 'history' && $method === 'GET') { if ($action === 'history' && $method === 'GET') {
$max = 20; $max = 20;
$note = $pdo->prepare("SELECT content FROM pf_notes WHERE note_type='setting' AND reference_id='liste_history_max'"); $note = $pdo->prepare("SELECT content FROM pf_notes WHERE note_type='setting' AND reference_id='liste_history_max'");
@@ -231,4 +215,4 @@ if ($action === 'history' && $method === 'GET') {
} }
http_response_code(400); http_response_code(400);
echo json_encode(['error' => 'unknown action']); echo json_encode(['error' => 'unknown action: ' . $action]);