diff --git a/Readme.md b/Readme.md index 46a8a84..8cc7143 100644 --- a/Readme.md +++ b/Readme.md @@ -10,7 +10,7 @@ Entwickelt von **[Loheide.eu](https://loheide.eu)** ![MySQL](https://img.shields.io/badge/MySQL-5.7%2B%20%2F%20MariaDB-4479A1?logo=mysql&logoColor=white) ![UniFi OS](https://img.shields.io/badge/UniFi%20OS-7.0%2B-0559C9?logo=ubiquiti&logoColor=white) ![License](https://img.shields.io/badge/Lizenz-MIT-green) -![Version](https://img.shields.io/badge/Version-2.8.0-blueviolet) +![Version](https://img.shields.io/badge/Version-2.7.0-blueviolet) ![Tests](https://img.shields.io/badge/Tests-PHPUnit%20%2B%20PHPStan-brightgreen) [![Repository](https://img.shields.io/badge/Code-git.loheide.cloud-4b3ec4)](https://git.loheide.cloud/friloo/Unifi-Voucher-Tool) @@ -29,7 +29,6 @@ Entwickelt von **[Loheide.eu](https://loheide.eu)** - 🎟️ **Voucher-Erstellung** mit sofortiger QR-Code-Anzeige, Druckvorlage und E-Mail-Versand - 🖥️ **Display-Seiten (Kiosk)** – öffentliche Seite je Site, an der Gäste sich mit einem Klick selbst einen Zugang holen -- 🎨 **Jede Display-Seite eigenständig gestaltbar** – Logo, Hintergrundbild, Akzentfarbe, helle oder dunkle Karte - 📦 **Bulk-Erstellung** – bis zu 20 Vouchers auf einmal, inkl. Sammeldruck-Layout - 🧩 **Voucher-Profile/Templates** – vordefinierte Laufzeiten & Gerätelimits per Schnellauswahl - 🏢 **Multi-Site-Support** – beliebig viele UniFi-Standorte zentral verwalten @@ -89,12 +88,7 @@ Entwickelt von **[Loheide.eu](https://loheide.eu)**
Display-Seite im Ruhezustand - Display-Seite mit eigenem Bild und Farben -
- -
Ausgegebener Zugangscode auf dem Display - Display-Seite einrichten
@@ -259,23 +253,6 @@ Auf dem Startbildschirm steht zusätzlich ein QR-Code, der auf dieselbe Seite zeigt. Gäste können sie damit **am eigenen Handy** öffnen – praktisch bei Bildschirmen ohne Touch. -### Jede Seite eigenständig gestalten - -Jede Display-Seite bringt ihr eigenes Erscheinungsbild mit – das Hotel am -Empfang sieht anders aus als der Tagungsraum nebenan: - -| Einstellung | Wirkung | -|---|---| -| Logo | eigenes Logo auf der Karte (leer = Logo aus den Einstellungen) | -| Hintergrundbild | formatfüllend hinter der Karte, z. B. ein Foto des Hauses | -| Abdunklung | 0–90 % dunkle Ebene über dem Bild, damit die Karte lesbar bleibt | -| Akzentfarbe | färbt den Knopf dieser Seite (leer = Farbe aus dem Design-Tab) | -| Karte | hell oder dunkel – auf Fotos wirkt die dunkle Karte meist ruhiger | - -Logo und Hintergrund lassen sich direkt hochladen (PNG, JPG, WEBP, GIF, SVG bis -3 MB) oder als URL hinterlegen; beim Löschen einer Display-Seite verschwinden -die hochgeladenen Dateien mit. - Die ausgegebenen Codes erscheinen normal in *Live Vouchers*, im *Reporting* und im *Audit-Log* (Aktion „Voucher am Display geholt"), sodass jederzeit nachvollziehbar bleibt, woher ein Zugang stammt. @@ -683,7 +660,7 @@ dem Git-Hoster.
-**Version 2.8.0** · Autor: **Friederich Loheide** · Lizenz: **MIT** +**Version 2.7.0** · Autor: **Friederich Loheide** · Lizenz: **MIT** Entwickelt von **[Loheide.eu](https://loheide.eu)** diff --git a/VERSION b/VERSION index 834f262..24ba9a3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.8.0 +2.7.0 diff --git a/admin/kiosks.php b/admin/kiosks.php index 50019af..5597422 100644 --- a/admin/kiosks.php +++ b/admin/kiosks.php @@ -16,7 +16,6 @@ require_once __DIR__ . '/../includes/Auth.php'; require_once __DIR__ . '/../includes/I18n.php'; require_once __DIR__ . '/../includes/Ui.php'; require_once __DIR__ . '/../includes/Kiosk.php'; -require_once __DIR__ . '/../includes/Upload.php'; $auth = new Auth(); $auth->requireAdmin(); @@ -41,20 +40,9 @@ function kioskInput(): array 'cooldown_seconds' => max(0, min(3600, (int)($_POST['cooldown_seconds'] ?? Kiosk::DEFAULT_COOLDOWN))), 'display_seconds' => max(10, min(600, (int)($_POST['display_seconds'] ?? Kiosk::DEFAULT_DISPLAY_SECONDS))), 'is_active' => isset($_POST['is_active']) ? 1 : 0, - 'bg_overlay' => max(0, min(90, (int)($_POST['bg_overlay'] ?? 45))), - 'accent_color' => self_accent($_POST['accent_color'] ?? ''), - 'card_style' => ($_POST['card_style'] ?? 'light') === 'dark' ? 'dark' : 'light', ]; } -/** Nur echte Hex-Farben durchlassen – der Wert landet in einem style-Attribut. */ -function self_accent($value): ?string -{ - $value = strtolower(trim((string)$value)); - - return preg_match('/^#[0-9a-f]{6}$/', $value) ? $value : null; -} - if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_kiosk'])) { if (!$auth->validateCsrfToken($_POST['csrf_token'] ?? '')) { $error = __('error_csrf'); @@ -64,18 +52,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_kiosk'])) { if ($in['name'] === '') throw new Exception(__('error_name_req')); if ($in['site_id'] <= 0) throw new Exception(__('error_site_req')); - $logo = Upload::resolveField('logo_url', '', 'image'); - $bg = Upload::resolveField('background_url', '', 'image'); - $db->execute( - "INSERT INTO kiosks (site_id, template_id, name, token, headline, subline, - logo_url, background_url, bg_overlay, accent_color, card_style, - daily_limit, cooldown_seconds, display_seconds, is_active, created_by) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?)", + "INSERT INTO kiosks (site_id, template_id, name, token, headline, subline, daily_limit, cooldown_seconds, display_seconds, is_active, created_by) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 1, ?)", [$in['site_id'], $in['template_id'], $in['name'], Kiosk::newToken(), - $in['headline'], $in['subline'], $logo, $bg, $in['bg_overlay'], - $in['accent_color'], $in['card_style'], $in['daily_limit'], - $in['cooldown_seconds'], $in['display_seconds'], $_SESSION['user_id']] + $in['headline'], $in['subline'], $in['daily_limit'], $in['cooldown_seconds'], + $in['display_seconds'], $_SESSION['user_id']] ); $auth->writeAuditLog($_SESSION['user_id'], 'kiosk_created', 'kiosk', null, $in['name']); $success = __('kiosks_added'); @@ -95,17 +77,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['edit_kiosk'])) { if ($in['name'] === '') throw new Exception(__('error_name_req')); if ($in['site_id'] <= 0) throw new Exception(__('error_site_req')); - $current = $db->fetchOne("SELECT logo_url, background_url FROM kiosks WHERE id = ?", [$id]) ?: []; - $logo = Upload::resolveField('logo_url', (string)($current['logo_url'] ?? ''), 'image'); - $bg = Upload::resolveField('background_url', (string)($current['background_url'] ?? ''), 'image'); - $db->execute( "UPDATE kiosks SET site_id=?, template_id=?, name=?, headline=?, subline=?, - logo_url=?, background_url=?, bg_overlay=?, accent_color=?, card_style=?, daily_limit=?, cooldown_seconds=?, display_seconds=?, is_active=? WHERE id=?", [$in['site_id'], $in['template_id'], $in['name'], $in['headline'], $in['subline'], - $logo, $bg, $in['bg_overlay'], $in['accent_color'], $in['card_style'], $in['daily_limit'], $in['cooldown_seconds'], $in['display_seconds'], $in['is_active'], $id] ); $auth->writeAuditLog($_SESSION['user_id'], 'kiosk_updated', 'kiosk', $id, $in['name']); @@ -130,11 +106,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['renew_token'])) { if (isset($_GET['delete'], $_GET['token'])) { if ($auth->validateCsrfToken($_GET['token'])) { - $old = $db->fetchOne("SELECT logo_url, background_url FROM kiosks WHERE id = ?", [(int)$_GET['delete']]); - if ($old) { - Upload::delete((string)($old['logo_url'] ?? '')); - Upload::delete((string)($old['background_url'] ?? '')); - } $db->execute("DELETE FROM kiosks WHERE id = ?", [(int)$_GET['delete']]); $auth->writeAuditLog($_SESSION['user_id'], 'kiosk_deleted', 'kiosk', (int)$_GET['delete'], ''); $success = __('kiosks_deleted'); @@ -252,9 +223,6 @@ $adminBase = ''; "id" => (int)$k["id"], "site_id" => (int)$k["site_id"], "template_id" => (int)$k["template_id"], "name" => $k["name"], "headline" => $k["headline"], "subline" => $k["subline"], - "logo_url" => $k["logo_url"], "background_url" => $k["background_url"], - "bg_overlay" => (int)$k["bg_overlay"], "accent_color" => $k["accent_color"], - "card_style" => $k["card_style"], "daily_limit" => (int)$k["daily_limit"], "cooldown_seconds" => (int)$k["cooldown_seconds"], "display_seconds" => (int)$k["display_seconds"], @@ -289,7 +257,7 @@ $adminBase = '';
-
+
@@ -337,37 +305,6 @@ $adminBase = '';
-

- - - - -
-
- - -
-
-
- -
- - -
-
-
-
- - -
-
-
- -
-
@@ -427,8 +364,6 @@ function openAddModal() { document.getElementById('kioskModalTitle').textContent = ; document.querySelector('#kioskModal form').reset(); document.getElementById('kiosk_id').value = ''; - setImageField('logo_url', ''); - setImageField('background_url', ''); document.getElementById('submitAdd').style.display = ''; document.getElementById('submitEdit').style.display = 'none'; document.getElementById('activeRow').style.display = 'none'; @@ -443,11 +378,6 @@ function openEditModal(data) { document.getElementById('template_id').value = data.template_id || 0; document.getElementById('headline').value = data.headline || ''; document.getElementById('subline').value = data.subline || ''; - document.getElementById('bg_overlay').value = data.bg_overlay; - document.getElementById('accent_color').value = data.accent_color || ''; - document.getElementById('card_style').value = data.card_style || 'light'; - setImageField('logo_url', data.logo_url || ''); - setImageField('background_url', data.background_url || ''); document.getElementById('daily_limit').value = data.daily_limit; document.getElementById('cooldown_seconds').value = data.cooldown_seconds; document.getElementById('display_seconds').value = data.display_seconds; @@ -460,25 +390,6 @@ function openEditModal(data) { function closeModal() { document.getElementById('kioskModal').classList.remove('active'); } -/** - * Bildfeld im Modal auf den Wert des Kiosks setzen: Vorschau, URL-Feld und - * der Entfernen-Schalter hängen am selben Namen. - */ -function setImageField(name, value) { - const wrapper = document.querySelector('[name="' + name + '"]').closest('.form-group'); - const text = wrapper.querySelector('input[type="text"]'); - const preview = wrapper.querySelector('.image-preview'); - const remove = wrapper.querySelector('input[type="checkbox"]'); - if (text) text.value = value; - if (remove) remove.checked = false; - if (preview) { - const src = value && !/^https?:|^\//.test(value) ? '../' + value : value; - preview.innerHTML = value - ? '' - : ''; - } -} - function showQr(url, name) { var target = document.getElementById('qrTarget'); target.innerHTML = ''; diff --git a/admin/settings.php b/admin/settings.php index d5763aa..1f191b4 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -42,6 +42,33 @@ if (isset($_POST['ajax_smtp_test'])) { $error = ''; $success = ''; +/** + * Liefert den neuen Wert eines Bildfeldes: Upload schlaegt URL, und ein + * gesetzter Entfernen-Schalter loescht die bisherige Datei. + */ +function resolveImageField(string $name, Database $db, string $kind): string +{ + $current = (string)$db->getSetting($name, ''); + + $uploaded = Upload::store($_FILES[$name . '_file'] ?? [], $kind); + if ($uploaded !== '') { + Upload::delete($current); + return $uploaded; + } + + if (!empty($_POST[$name . '_remove'])) { + Upload::delete($current); + return ''; + } + + $value = trim($_POST[$name] ?? ''); + if ($value !== $current && Upload::isLocal($current) && !Upload::isLocal($value)) { + Upload::delete($current); + } + + return $value; +} + // Einstellungen speichern if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['save_settings'])) { if (!$auth->validateCsrfToken($_POST['csrf_token'] ?? '')) { @@ -53,8 +80,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['save_settings'])) { if ($formType === 'general') { $settings['app_title'] = trim($_POST['app_title'] ?? ''); - $settings['logo_url'] = Upload::resolveField('logo_url', (string)$db->getSetting('logo_url', ''), 'image'); - $settings['favicon_url'] = Upload::resolveField('favicon_url', (string)$db->getSetting('favicon_url', ''), 'favicon'); + $settings['logo_url'] = resolveImageField('logo_url', $db, 'image'); + $settings['favicon_url'] = resolveImageField('favicon_url', $db, 'favicon'); $settings['instruction_header'] = trim($_POST['instruction_header'] ?? ''); $settings['instruction_text'] = $_POST['instruction_text'] ?? ''; $settings['public_access'] = isset($_POST['public_access']) ? '1' : '0'; @@ -72,12 +99,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['save_settings'])) { if ($formType === 'login') { $settings['login_panel_enabled'] = isset($_POST['login_panel_enabled']) ? '1' : '0'; $settings['login_brand_name'] = trim($_POST['login_brand_name'] ?? ''); - $settings['login_logo_url'] = Upload::resolveField('login_logo_url', (string)$db->getSetting('login_logo_url', ''), 'image'); + $settings['login_logo_url'] = resolveImageField('login_logo_url', $db, 'image'); $settings['login_claim_title'] = trim($_POST['login_claim_title'] ?? ''); $settings['login_claim_text'] = trim($_POST['login_claim_text'] ?? ''); $settings['login_features'] = trim($_POST['login_features'] ?? ''); $settings['login_footer'] = trim($_POST['login_footer'] ?? ''); - $settings['login_bg_image'] = Upload::resolveField('login_bg_image', (string)$db->getSetting('login_bg_image', ''), 'image'); + $settings['login_bg_image'] = resolveImageField('login_bg_image', $db, 'image'); $settings['login_bg_from'] = trim($_POST['login_bg_from'] ?? ''); $settings['login_bg_to'] = trim($_POST['login_bg_to'] ?? ''); $overlay = (int)($_POST['login_bg_overlay'] ?? 40); @@ -236,6 +263,41 @@ $cs = [ 'last_cron_sync' => $db->getSetting('last_cron_sync', ''), ]; +/** + * Bildfeld: Vorschau, Upload, alternativ URL – plus Entfernen-Schalter. + */ +function imageField(string $name, string $label, ?string $value, string $hint = '', string $accept = 'image/*'): void +{ + $value = (string)$value; + $preview = Ui::mediaUrl($value, '../'); + ?> +
+ +
+
+ + + + + +
+
+ + + + + +
+
+
+
+ @@ -288,8 +350,8 @@ $adminBase = '';
- - + +
@@ -423,7 +485,7 @@ $adminBase = '';
- +
@@ -448,7 +510,7 @@ $adminBase = '';
- +
diff --git a/assets/global.css b/assets/global.css index 9923e3b..4de34b5 100644 --- a/assets/global.css +++ b/assets/global.css @@ -1641,52 +1641,6 @@ input.search-bar, .site-selector .search-bar { min-width: 240px; width: auto; fl box-shadow: var(--shadow-xl); } .kiosk-logo { max-height: 84px; max-width: 320px; margin: 0 auto 26px; display: block; } -.kiosk-logo-sm { max-height: 52px; margin-bottom: 20px; } - -/* Eigenes Hintergrundbild der Display-Seite: Bild formatfüllend, darüber - eine abdunkelnde Ebene, damit die Karte sich abhebt. */ -.kiosk-body.has-background { - --kiosk-overlay: 0.45; - position: relative; - background: var(--kiosk-bg) center / cover no-repeat fixed; -} -.kiosk-body.has-background::before { - content: ''; - position: fixed; - inset: 0; - background: rgba(8, 11, 18, var(--kiosk-overlay)); - pointer-events: none; -} -.kiosk-body.has-background > * { position: relative; z-index: 1; } -.kiosk-body.has-background .kiosk-card { box-shadow: 0 40px 80px -30px rgba(0,0,0,.6); } -.kiosk-body.has-background .kiosk-footer .app-credit, -.kiosk-body.has-background .kiosk-footer .app-credit a { color: rgba(255,255,255,.65); } - -/* Dunkle Karte – wirkt auf Fotos oft ruhiger als eine weiße Fläche. */ -.kiosk-dark .kiosk-card { - background: rgba(12,15,22,.86); - border-color: rgba(255,255,255,.12); - backdrop-filter: blur(6px); - color: #f4f6fb; -} -.kiosk-dark .kiosk-card h1, -.kiosk-dark .kiosk-code { color: #ffffff; } -.kiosk-dark .kiosk-subline, -.kiosk-dark .kiosk-qr-label { color: rgba(255,255,255,.76); } -.kiosk-dark .kiosk-countdown { color: rgba(255,255,255,.5); } -.kiosk-dark .kiosk-meta span { - background: rgba(255,255,255,.10); - border-color: rgba(255,255,255,.16); - color: rgba(255,255,255,.88); -} -.kiosk-dark .kiosk-phone { border-top-color: rgba(255,255,255,.14); color: rgba(255,255,255,.7); } -.kiosk-dark .kiosk-eyebrow { background: rgba(74,222,128,.16); border-color: rgba(74,222,128,.32); color: #86efac; } -.kiosk-dark .btn-secondary { - background: rgba(255,255,255,.10); - border-color: rgba(255,255,255,.18); - color: #f4f6fb; -} -.kiosk-dark .btn-secondary:hover { background: rgba(255,255,255,.18); color: #fff; } .kiosk-mark { width: 62px; height: 62px; margin: 0 auto 26px; font-size: 26px; } .kiosk-headline { font-size: clamp(30px, 4.6vw, 46px); diff --git a/database.sql b/database.sql index 52e6a0b..4d7fcc0 100644 --- a/database.sql +++ b/database.sql @@ -74,11 +74,6 @@ CREATE TABLE IF NOT EXISTS `kiosks` ( `token` VARCHAR(64) NOT NULL, `headline` VARCHAR(255) NULL, `subline` VARCHAR(500) NULL, - `logo_url` VARCHAR(500) NULL, - `background_url` VARCHAR(500) NULL, - `bg_overlay` TINYINT NOT NULL DEFAULT 45, - `accent_color` VARCHAR(7) NULL, - `card_style` ENUM('light','dark') NOT NULL DEFAULT 'light', `is_active` TINYINT(1) NOT NULL DEFAULT 1, `daily_limit` INT NOT NULL DEFAULT 100, `cooldown_seconds` INT NOT NULL DEFAULT 20, diff --git a/docs/screenshots/admin-dashboard-dark.png b/docs/screenshots/admin-dashboard-dark.png index bddf25e..e81cd9e 100644 Binary files a/docs/screenshots/admin-dashboard-dark.png and b/docs/screenshots/admin-dashboard-dark.png differ diff --git a/docs/screenshots/admin-dashboard.png b/docs/screenshots/admin-dashboard.png index d2d2073..b7e1fe6 100644 Binary files a/docs/screenshots/admin-dashboard.png and b/docs/screenshots/admin-dashboard.png differ diff --git a/docs/screenshots/api-keys.png b/docs/screenshots/api-keys.png index e625ae6..0594942 100644 Binary files a/docs/screenshots/api-keys.png and b/docs/screenshots/api-keys.png differ diff --git a/docs/screenshots/integrations.png b/docs/screenshots/integrations.png index 060706d..62c4171 100644 Binary files a/docs/screenshots/integrations.png and b/docs/screenshots/integrations.png differ diff --git a/docs/screenshots/kiosk-branded.png b/docs/screenshots/kiosk-branded.png deleted file mode 100644 index 06cca2a..0000000 Binary files a/docs/screenshots/kiosk-branded.png and /dev/null differ diff --git a/docs/screenshots/kiosk-code.png b/docs/screenshots/kiosk-code.png index 4a6d7a8..f961cfc 100644 Binary files a/docs/screenshots/kiosk-code.png and b/docs/screenshots/kiosk-code.png differ diff --git a/docs/screenshots/kiosk-display.png b/docs/screenshots/kiosk-display.png index 06cca2a..b786146 100644 Binary files a/docs/screenshots/kiosk-display.png and b/docs/screenshots/kiosk-display.png differ diff --git a/docs/screenshots/kiosks-admin.png b/docs/screenshots/kiosks-admin.png index 7cbb1f4..19d8595 100644 Binary files a/docs/screenshots/kiosks-admin.png and b/docs/screenshots/kiosks-admin.png differ diff --git a/docs/screenshots/kiosks-form.png b/docs/screenshots/kiosks-form.png deleted file mode 100644 index 4654091..0000000 Binary files a/docs/screenshots/kiosks-form.png and /dev/null differ diff --git a/docs/screenshots/settings-branding.png b/docs/screenshots/settings-branding.png index c27f6d2..aa99af6 100644 Binary files a/docs/screenshots/settings-branding.png and b/docs/screenshots/settings-branding.png differ diff --git a/docs/screenshots/settings-login.png b/docs/screenshots/settings-login.png index 2004b02..a69a747 100644 Binary files a/docs/screenshots/settings-login.png and b/docs/screenshots/settings-login.png differ diff --git a/docs/screenshots/settings.png b/docs/screenshots/settings.png index 4a468cf..fe7f67f 100644 Binary files a/docs/screenshots/settings.png and b/docs/screenshots/settings.png differ diff --git a/docs/screenshots/two-factor.png b/docs/screenshots/two-factor.png index d743781..0507434 100644 Binary files a/docs/screenshots/two-factor.png and b/docs/screenshots/two-factor.png differ diff --git a/docs/screenshots/vouchers.png b/docs/screenshots/vouchers.png index e878ec8..a81b909 100644 Binary files a/docs/screenshots/vouchers.png and b/docs/screenshots/vouchers.png differ diff --git a/includes/Kiosk.php b/includes/Kiosk.php index ef25a56..847da0d 100644 --- a/includes/Kiosk.php +++ b/includes/Kiosk.php @@ -124,35 +124,6 @@ class Kiosk ]; } - /** - * Gestaltung einer Display-Seite: eigene Werte, sonst die des Systems. - * - * @return array{logo:string,background:string,overlay:float,accent:string,card:string} - */ - public static function appearance($db, array $kiosk): array - { - $accent = strtolower(trim((string)($kiosk['accent_color'] ?? ''))); - if (!preg_match('/^#[0-9a-f]{6}$/', $accent)) { - $accent = ''; - } - - $overlay = (int)($kiosk['bg_overlay'] ?? 45); - $overlay = max(0, min(90, $overlay)); - - $logo = trim((string)($kiosk['logo_url'] ?? '')); - if ($logo === '' && $db) { - $logo = (string)$db->getSetting('logo_url', ''); - } - - return [ - 'logo' => $logo, - 'background' => trim((string)($kiosk['background_url'] ?? '')), - 'overlay' => (float)$overlay / 100, // immer float, auch bei 0 - 'accent' => $accent, - 'card' => ($kiosk['card_style'] ?? 'light') === 'dark' ? 'dark' : 'light', - ]; - } - /** Öffentliche Adresse eines Kiosks. */ public static function publicUrl(string $token, string $baseUrl = ''): string { diff --git a/includes/Ui.php b/includes/Ui.php index b7faa7a..2800034 100644 --- a/includes/Ui.php +++ b/includes/Ui.php @@ -116,46 +116,6 @@ class Ui . ''; } - /** - * Bildfeld mit Vorschau, Upload und URL-Eingabe. - * Wird von den Einstellungen und der Kiosk-Verwaltung genutzt. - */ - public static function imageField( - string $name, - string $label, - ?string $value, - string $hint = '', - string $accept = 'image/*', - string $base = '../' - ): string { - $value = (string)$value; - $preview = self::mediaUrl($value, $base); - $esc = static fn ($text) => htmlspecialchars((string)$text, ENT_QUOTES); - $t = static fn ($key, $fallback) => function_exists('__') ? __($key) : $fallback; - - $thumb = $preview !== '' - ? '' - : ''; - - $remove = $value !== '' - ? '' - : ''; - - return '
' - . '' - . '
' - . '
' . $thumb . '
' - . '
' - . '' - . '' - . $remove - . '
' - . ($hint !== '' ? '
' . $esc($hint) . '
' : '') - . '
'; - } - /** * Version aus der Datei VERSION im Projektstamm. * Damit tragen Oberfläche und Release-Paket dieselbe Nummer. diff --git a/includes/Upload.php b/includes/Upload.php index 2a97b90..39713bf 100644 --- a/includes/Upload.php +++ b/includes/Upload.php @@ -120,39 +120,6 @@ class Upload return 'uploads/' . $name; } - /** - * Neuer Wert eines Bildfeldes aus dem Formular. - * - * Reihenfolge: hochgeladene Datei schlaegt alles, danach der - * Entfernen-Schalter, sonst gilt das URL-Feld. Wird eine zuvor - * hochgeladene Datei ersetzt oder entfernt, verschwindet sie auch - * von der Platte. - * - * @param string $name Feldname (erwartet , _file, _remove) - * @param string $current bisher gespeicherter Wert - * @param string $kind 'image' oder 'favicon' - */ - public static function resolveField(string $name, string $current, string $kind = 'image'): string - { - $uploaded = self::store($_FILES[$name . '_file'] ?? [], $kind); - if ($uploaded !== '') { - self::delete($current); - return $uploaded; - } - - if (!empty($_POST[$name . '_remove'])) { - self::delete($current); - return ''; - } - - $value = trim((string)($_POST[$name] ?? '')); - if ($value !== $current && self::isLocal($current) && !self::isLocal($value)) { - self::delete($current); - } - - return $value; - } - /** * Entfernt aktive Inhalte aus SVG-Dateien (Skripte, Event-Handler, * externe Verweise). Lieber eine Grafik verlieren als eine XSS-Luecke. diff --git a/kiosk.php b/kiosk.php index 9118ce4..665651d 100644 --- a/kiosk.php +++ b/kiosk.php @@ -87,29 +87,9 @@ if (!$notFound && $_SERVER['REQUEST_METHOD'] === 'POST') { $headline = trim((string)($kiosk['headline'] ?? '')) ?: __('kiosk_default_headline'); $subline = trim((string)($kiosk['subline'] ?? '')) ?: __('kiosk_default_subline'); +$logoUrl = $db->getSetting('logo_url', ''); $display = max(10, (int)($kiosk['display_seconds'] ?? Kiosk::DEFAULT_DISPLAY_SECONDS)); $selfUrl = $kiosk ? Kiosk::publicUrl($kiosk['token']) : ''; - -// Gestaltung dieser Display-Seite (eigene Werte, sonst die des Systems) -$look = $kiosk ? Kiosk::appearance($db, $kiosk) : ['logo'=>'','background'=>'','overlay'=>0.45,'accent'=>'','card'=>'light']; -$logoUrl = $look['logo']; -$bodyClass = 'kiosk-body'; -$bodyStyle = ''; -if ($look['background'] !== '') { - $bodyClass .= ' has-background'; - $bodyStyle .= "--kiosk-bg:url('" . htmlspecialchars(Ui::mediaUrl($look['background']), ENT_QUOTES) . "');" - . '--kiosk-overlay:' . $look['overlay'] . ';'; -} -if ($look['card'] === 'dark') { - $bodyClass .= ' kiosk-dark'; -} -if ($look['accent'] !== '') { - // Nur die Akzentfarbe dieser Seite überschreiben – der Rest bleibt Design-System. - $bodyStyle .= '--accent:' . $look['accent'] . ';' - . '--accent-hover:color-mix(in srgb, ' . $look['accent'] . ' 84%, #000);' - . '--accent-soft:color-mix(in srgb, ' . $look['accent'] . ' 14%, #fff);' - . '--accent-border:color-mix(in srgb, ' . $look['accent'] . ' 32%, #fff);'; -} ?> @@ -123,7 +103,7 @@ if ($look['accent'] !== '') { -> +
@@ -138,9 +118,6 @@ if ($look['accent'] !== '') {
- - -

diff --git a/lang/de.php b/lang/de.php index 7b07a87..c83e6a5 100644 --- a/lang/de.php +++ b/lang/de.php @@ -523,20 +523,6 @@ return [ 'audit_action_kiosk_created' => 'Display-Seite angelegt', 'audit_action_kiosk_updated' => 'Display-Seite geändert', 'audit_action_kiosk_deleted' => 'Display-Seite gelöscht', - 'kiosks_appearance' => 'Erscheinungsbild', - 'kiosks_logo' => 'Logo', - 'kiosks_logo_hint' => 'Leer = allgemeines Logo aus den Einstellungen.', - 'kiosks_background' => 'Hintergrundbild', - 'kiosks_background_hint' => 'Formatfüllend hinter der Karte – z.B. ein Foto des Hauses.', - 'kiosks_overlay' => 'Abdunklung des Bildes (%)', - 'kiosks_overlay_hint' => '0–90 %. Höhere Werte machen die Karte auf hellen Bildern lesbarer.', - 'kiosks_accent' => 'Akzentfarbe', - 'kiosks_accent_default' => 'Standardfarbe verwenden', - 'kiosks_accent_hint' => 'Färbt den Knopf auf dieser Seite. Leer = Farbe aus dem Design-Tab.', - 'kiosks_card_style' => 'Karte', - 'kiosks_card_light' => 'Hell', - 'kiosks_card_dark' => 'Dunkel', - 'kiosks_card_hint' => 'Auf Fotos wirkt die dunkle Karte meist ruhiger.', 'settings_tab_general' => 'Allgemein', 'settings_tab_defaults' => 'Voucher-Standards', 'settings_tab_cron' => 'Cron-Sync', diff --git a/lang/en.php b/lang/en.php index b3bf315..11f1eeb 100644 --- a/lang/en.php +++ b/lang/en.php @@ -523,20 +523,6 @@ return [ 'audit_action_kiosk_created' => 'Display page created', 'audit_action_kiosk_updated' => 'Display page updated', 'audit_action_kiosk_deleted' => 'Display page deleted', - 'kiosks_appearance' => 'Appearance', - 'kiosks_logo' => 'Logo', - 'kiosks_logo_hint' => 'Empty = general logo from the settings.', - 'kiosks_background' => 'Background image', - 'kiosks_background_hint' => 'Displayed full-bleed behind the card – e.g. a photo of the building.', - 'kiosks_overlay' => 'Image dimming (%)', - 'kiosks_overlay_hint' => '0–90%. Higher values keep the card readable on bright images.', - 'kiosks_accent' => 'Accent colour', - 'kiosks_accent_default' => 'Use default colour', - 'kiosks_accent_hint' => 'Colours the button on this page. Empty = colour from the Design tab.', - 'kiosks_card_style' => 'Card', - 'kiosks_card_light' => 'Light', - 'kiosks_card_dark' => 'Dark', - 'kiosks_card_hint' => 'On photos the dark card usually looks calmer.', 'settings_tab_general' => 'General', 'settings_tab_defaults' => 'Voucher Defaults', 'settings_tab_cron' => 'Cron Sync', diff --git a/tests/KioskTest.php b/tests/KioskTest.php index 51280a9..bdc19f3 100644 --- a/tests/KioskTest.php +++ b/tests/KioskTest.php @@ -143,56 +143,6 @@ class KioskTest extends TestCase $this->assertSame(0, $settings['qos']['down']); } - public function testAppearanceFallsBackToSystemLogo(): void - { - $db = new FakeKioskDb(['logo_url' => 'uploads/global.png']); - - $look = \Kiosk::appearance($db, $this->kiosk()); - - $this->assertSame('uploads/global.png', $look['logo']); - $this->assertSame('', $look['background']); - $this->assertSame('', $look['accent'], 'Ohne eigene Farbe bleibt das Design-System zuständig'); - $this->assertSame('light', $look['card']); - } - - public function testAppearanceUsesOwnValues(): void - { - $db = new FakeKioskDb(['logo_url' => 'uploads/global.png']); - $kiosk = $this->kiosk([ - 'logo_url' => 'uploads/hotel.svg', - 'background_url' => 'uploads/lobby.jpg', - 'bg_overlay' => 60, - 'accent_color' => '#0F766E', - 'card_style' => 'dark', - ]); - - $look = \Kiosk::appearance($db, $kiosk); - - $this->assertSame('uploads/hotel.svg', $look['logo']); - $this->assertSame('uploads/lobby.jpg', $look['background']); - $this->assertSame(0.6, $look['overlay']); - $this->assertSame('#0f766e', $look['accent']); - $this->assertSame('dark', $look['card']); - } - - public function testAppearanceRejectsUnsafeColour(): void - { - $db = new FakeKioskDb(); - - // Der Wert landet in einem style-Attribut – nur echte Hex-Farben durch. - $look = \Kiosk::appearance($db, $this->kiosk(['accent_color' => 'red;background:url(evil)'])); - - $this->assertSame('', $look['accent']); - } - - public function testAppearanceClampsOverlay(): void - { - $db = new FakeKioskDb(); - - $this->assertSame(0.9, \Kiosk::appearance($db, $this->kiosk(['bg_overlay' => 250]))['overlay']); - $this->assertSame(0.0, \Kiosk::appearance($db, $this->kiosk(['bg_overlay' => -10]))['overlay']); - } - public function testPublicUrl(): void { $token = \Kiosk::newToken(); diff --git a/tools/demo/build.py b/tools/demo/build.py index 27eb2e0..b01afca 100755 --- a/tools/demo/build.py +++ b/tools/demo/build.py @@ -99,11 +99,6 @@ document.addEventListener('DOMContentLoaded', function () { $headline = trim((string)($kiosk['headline'] ?? ''))''') - # Kiosk-Verwaltung: Formular fuer den Screenshot geoeffnet zeigen - patch(os.path.join(target, 'admin', 'kiosks.php'), - '