diff --git a/Readme.md b/Readme.md
index 3602191..293e5f3 100644
--- a/Readme.md
+++ b/Readme.md
@@ -10,7 +10,7 @@ Entwickelt von **[Loheide.eu](https://loheide.eu)**



-
+

[](https://git.loheide.cloud/friloo/Unifi-Voucher-Tool)
@@ -248,6 +248,10 @@ Personal am Tresen.
| Überschrift / Text | was auf dem Bildschirm steht |
| Codes pro Tag | Obergrenze je Kalendertag (0 = unbegrenzt) |
| Wartezeit | Abstand zwischen zwei Codes an diesem Display |
+| Wartezeit je Gerät | zusätzliche Sperre pro Browser (Cookie) – gegen das Leerziehen durch eine Person |
+| Servicezeiten | z. B. 06:00–23:00; außerhalb erscheint ein Hinweis statt des Knopfes. Fenster über Mitternacht möglich |
+| PIN | optionale Eingabe, sinnvoll bei frei zugänglichen Bildschirmen |
+| Sprache | feste Sprache des Displays oder automatisch nach Browsersprache |
| Anzeigedauer | danach springt der Bildschirm automatisch zurück |
Jede Seite hat einen **eigenen, geheimen Link** (`kiosk.php?k=…`). Er lässt sich
@@ -276,9 +280,14 @@ 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.
+Die ausgegebenen Codes erscheinen normal in *Live Vouchers*, im *Reporting* –
+dort gibt es eine eigene Auswertung **„Pro Display-Seite"** – und im *Audit-Log*
+(Aktion „Voucher am Display geholt"), sodass jederzeit nachvollziehbar bleibt,
+woher ein Zugang stammt.
+
+In der Verwaltung zeigt **„Vorschau"** die Seite direkt im Admin-Bereich, ohne
+den Tab zu wechseln. Gäste können die Sprache unten auf dem Display selbst
+umschalten.
> Display-Seiten funktionieren unabhängig vom globalen öffentlichen Modus – der
> geheime Link ist der Zugang. Webhook-Benachrichtigungen werden für diese Codes
@@ -702,7 +711,7 @@ dem Git-Hoster.
-**Version 2.8.0** · Autor: **Friederich Loheide** · Lizenz: **MIT**
+**Version 2.9.0** · Autor: **Friederich Loheide** · Lizenz: **MIT**
Entwickelt von **[Loheide.eu](https://loheide.eu)**
diff --git a/VERSION b/VERSION
index 834f262..c8e38b6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.8.0
+2.9.0
diff --git a/admin/backup.php b/admin/backup.php
index e2bf628..5908cf4 100644
--- a/admin/backup.php
+++ b/admin/backup.php
@@ -37,7 +37,8 @@ if (isset($_GET['export']) && isset($_GET['token']) && $auth->validateCsrfToken(
'kiosks' => $db->fetchAll(
"SELECT k.name, k.token, k.headline, k.subline, k.logo_url, k.background_url,
k.bg_overlay, k.accent_color, k.card_style, k.daily_limit,
- k.cooldown_seconds, k.display_seconds, k.is_active,
+ k.cooldown_seconds, k.display_seconds, k.active_from, k.active_to,
+ k.device_cooldown_seconds, k.pin, k.language, k.is_active,
s.name AS site_name, t.name AS template_name
FROM kiosks k
INNER JOIN sites s ON s.id = k.site_id
@@ -126,22 +127,28 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['import'])) {
$k['logo_url'] ?? null, $k['background_url'] ?? null, (int)($k['bg_overlay'] ?? 45),
$k['accent_color'] ?? null, ($k['card_style'] ?? 'light') === 'dark' ? 'dark' : 'light',
(int)($k['daily_limit'] ?? 100), (int)($k['cooldown_seconds'] ?? 20),
- (int)($k['display_seconds'] ?? 90), (int)($k['is_active'] ?? 1),
+ (int)($k['display_seconds'] ?? 90),
+ $k['active_from'] ?? null, $k['active_to'] ?? null,
+ (int)($k['device_cooldown_seconds'] ?? 0),
+ $k['pin'] ?? null, $k['language'] ?? null,
+ (int)($k['is_active'] ?? 1),
];
if ($exists) {
$db->query(
"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=?",
+ cooldown_seconds=?, display_seconds=?, active_from=?, active_to=?,
+ device_cooldown_seconds=?, pin=?, language=?, is_active=? WHERE id=?",
array_merge($values, [(int)$exists['id']])
);
} else {
$db->query(
"INSERT INTO kiosks (site_id, template_id, name, headline, subline, logo_url, background_url,
bg_overlay, accent_color, card_style, daily_limit, cooldown_seconds, display_seconds,
+ active_from, active_to, device_cooldown_seconds, pin, language,
is_active, token, created_by)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
array_merge($values, [$k['token'] ?? Kiosk::newToken(), $_SESSION['user_id'] ?? null])
);
}
diff --git a/admin/kiosks.php b/admin/kiosks.php
index 769ba4c..c300451 100644
--- a/admin/kiosks.php
+++ b/admin/kiosks.php
@@ -44,9 +44,22 @@ function kioskInput(): array
'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',
+ 'active_from' => self_time($_POST['active_from'] ?? ''),
+ 'active_to' => self_time($_POST['active_to'] ?? ''),
+ 'device_cooldown_seconds' => max(0, min(86400, (int)($_POST['device_cooldown_seconds'] ?? 0))),
+ 'pin' => preg_replace('/[^0-9A-Za-z]/', '', (string)($_POST['pin'] ?? '')) ?: null,
+ 'language' => in_array($_POST['language'] ?? '', ['de', 'en'], true) ? $_POST['language'] : null,
];
}
+/** Uhrzeit im Format HH:MM oder nichts. */
+function self_time($value): ?string
+{
+ $value = trim((string)$value);
+
+ return preg_match('/^([01]\d|2[0-3]):[0-5]\d$/', $value) ? $value : null;
+}
+
/** Nur echte Hex-Farben durchlassen – der Wert landet in einem style-Attribut. */
function self_accent($value): ?string
{
@@ -70,12 +83,16 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['add_kiosk'])) {
$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, ?)",
+ daily_limit, cooldown_seconds, display_seconds,
+ active_from, active_to, device_cooldown_seconds, pin, language,
+ 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['cooldown_seconds'], $in['display_seconds'],
+ $in['active_from'], $in['active_to'], $in['device_cooldown_seconds'],
+ $in['pin'], $in['language'], $_SESSION['user_id']]
);
$auth->writeAuditLog($_SESSION['user_id'], 'kiosk_created', 'kiosk', null, $in['name']);
$success = __('kiosks_added');
@@ -102,11 +119,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['edit_kiosk'])) {
$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=?
+ daily_limit=?, cooldown_seconds=?, display_seconds=?,
+ active_from=?, active_to=?, device_cooldown_seconds=?, pin=?, language=?,
+ 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]
+ $in['daily_limit'], $in['cooldown_seconds'], $in['display_seconds'],
+ $in['active_from'], $in['active_to'], $in['device_cooldown_seconds'],
+ $in['pin'], $in['language'], $in['is_active'], $id]
);
$auth->writeAuditLog($_SESSION['user_id'], 'kiosk_updated', 'kiosk', $id, $in['name']);
$success = __('kiosks_updated');
@@ -227,6 +248,18 @@ $adminBase = '';
= (int)$k['total_vouchers'] ?> = __('kiosks_total') ?>
+
+
+
+ = htmlspecialchars(substr((string)$k['active_from'], 0, 5)) ?>–= htmlspecialchars(substr((string)$k['active_to'], 0, 5)) ?>
+
+
+
+
+
+ = __('kiosks_pin') ?>: = htmlspecialchars($k['pin']) ?>
+
+
= __('kiosks_link') ?>
@@ -248,6 +281,10 @@ $adminBase = '';
onclick="showQr('= htmlspecialchars($url, ENT_QUOTES) ?>', '= htmlspecialchars($k['name'], ENT_QUOTES) ?>')">
= __('kiosks_qr') ?>
+
+ = __('kiosks_preview') ?>
+
$k["logo_url"], "background_url" => $k["background_url"],
"bg_overlay" => (int)$k["bg_overlay"], "accent_color" => $k["accent_color"],
"card_style" => $k["card_style"],
+ "active_from" => $k["active_from"] ? substr((string)$k["active_from"], 0, 5) : "",
+ "active_to" => $k["active_to"] ? substr((string)$k["active_to"], 0, 5) : "",
+ "device_cooldown_seconds" => (int)$k["device_cooldown_seconds"],
+ "pin" => $k["pin"], "language" => $k["language"],
"daily_limit" => (int)$k["daily_limit"],
"cooldown_seconds" => (int)$k["cooldown_seconds"],
"display_seconds" => (int)$k["display_seconds"],
@@ -384,6 +425,41 @@ $adminBase = '';
+
+
+
+
= __('kiosks_active') ?>
@@ -402,6 +478,20 @@ $adminBase = '';
+
+
+
+
+
+
+
= __('kiosks_preview_hint') ?>
+
+
+
+
@@ -441,6 +531,11 @@ 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('active_from').value = data.active_from || '';
+ document.getElementById('active_to').value = data.active_to || '';
+ document.getElementById('device_cooldown_seconds').value = data.device_cooldown_seconds;
+ document.getElementById('pin').value = data.pin || '';
+ document.getElementById('language').value = data.language || '';
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';
@@ -487,6 +582,18 @@ function showQr(url, name) {
function closeQr() { document.getElementById('qrModal').classList.remove('active'); }
+function showPreview(url, name) {
+ document.getElementById('previewTitle').textContent = name;
+ // cache-buster, damit Änderungen sofort sichtbar sind
+ document.getElementById('previewFrame').src = url + '&preview=' + Date.now();
+ document.getElementById('previewModal').classList.add('active');
+}
+
+function closePreview() {
+ document.getElementById('previewModal').classList.remove('active');
+ document.getElementById('previewFrame').src = 'about:blank';
+}
+
document.addEventListener('keydown', function (e) {
if (e.key === 'Escape') { closeModal(); closeQr(); }
});
diff --git a/admin/reports.php b/admin/reports.php
index 7b2aebf..4c340d7 100644
--- a/admin/reports.php
+++ b/admin/reports.php
@@ -88,6 +88,24 @@ $chartLabels = array_map(fn($r) => date('d.m', strtotime($r['d'])), $daily);
$chartData = array_map(fn($r) => (int)$r['c'], $daily);
$csrf = $auth->getCsrfToken();
+// Auswertung der Display-Seiten: woher kommen die Codes?
+try {
+ $perKiosk = $db->fetchAll(
+ "SELECT k.name, s.name AS site_name,
+ COUNT(v.id) AS total,
+ SUM(CASE WHEN v.created_at >= DATE_SUB(NOW(), INTERVAL ? DAY) THEN 1 ELSE 0 END) AS in_period
+ FROM kiosks k
+ INNER JOIN sites s ON s.id = k.site_id
+ LEFT JOIN vouchers v ON v.kiosk_id = k.id
+ GROUP BY k.id, k.name, s.name
+ HAVING total > 0
+ ORDER BY in_period DESC, total DESC",
+ [$days]
+ );
+} catch (Exception $e) {
+ $perKiosk = []; // Tabelle fehlt auf alten Installationen
+}
+
$currentPage = 'reports';
$adminBase = '';
?>
@@ -142,6 +160,19 @@ $adminBase = '';
+
+
= __('rep_per_kiosk') ?>
+
+
= __('rep_kiosk_none') ?>
+
+
= __('kiosks_name') ?> = __('label_site') ?> = str_replace('{days}', (string)$days, __('rep_in_period')) ?> = __('label_total') ?>
+
+ = htmlspecialchars($r['name']) ?> = htmlspecialchars($r['site_name']) ?> = (int)$r['in_period'] ?> = (int)$r['total'] ?>
+
+
+
+
+
= __('rep_top_users') ?>
= __('label_user') ?> = __('rep_col_created') ?>
diff --git a/assets/global.css b/assets/global.css
index 9923e3b..bef64c9 100644
--- a/assets/global.css
+++ b/assets/global.css
@@ -1768,6 +1768,34 @@ input.search-bar, .site-selector .search-bar { min-width: 240px; width: auto; fl
.kiosk-qr-label { margin-top: 14px; font-size: 15px; color: var(--text-secondary); }
.kiosk-countdown { margin: 18px 0 22px; font-size: 13.5px; color: var(--text-muted); }
.kiosk-footer { padding: 0 24px 22px; text-align: center; }
+.kiosk-pin { margin-top: 26px; text-align: left; }
+.kiosk-pin label { font-size: 14px; }
+.kiosk-langs { display: flex; justify-content: center; gap: 6px; margin-bottom: 12px; }
+.kiosk-lang {
+ padding: 5px 12px;
+ border: 1px solid var(--border-color);
+ border-radius: var(--r-pill);
+ background: var(--bg-card);
+ color: var(--text-secondary);
+ font-size: 12px; font-weight: 650; letter-spacing: .03em;
+ text-decoration: none;
+}
+.kiosk-lang.active { background: var(--accent); border-color: var(--accent); color: #fff; }
+.kiosk-body.has-background .kiosk-lang {
+ background: rgba(255,255,255,.14);
+ border-color: rgba(255,255,255,.22);
+ color: rgba(255,255,255,.9);
+}
+.kiosk-body.has-background .kiosk-lang.active { background: var(--accent); border-color: var(--accent); }
+
+/* Vorschau der Display-Seite in der Verwaltung */
+.kiosk-preview-frame {
+ width: 100%;
+ aspect-ratio: 16 / 10;
+ border: 1px solid var(--border-color);
+ border-radius: var(--r-md);
+ background: var(--bg-subtle);
+}
/* Link-Zeile in der Kiosk-Verwaltung */
.kiosk-link-row { display: flex; gap: 8px; align-items: center; }
diff --git a/database.sql b/database.sql
index 52e6a0b..054c1bf 100644
--- a/database.sql
+++ b/database.sql
@@ -83,6 +83,11 @@ CREATE TABLE IF NOT EXISTS `kiosks` (
`daily_limit` INT NOT NULL DEFAULT 100,
`cooldown_seconds` INT NOT NULL DEFAULT 20,
`display_seconds` INT NOT NULL DEFAULT 90,
+ `active_from` TIME NULL,
+ `active_to` TIME NULL,
+ `device_cooldown_seconds` INT NOT NULL DEFAULT 0,
+ `pin` VARCHAR(12) NULL,
+ `language` VARCHAR(5) NULL,
`last_used_at` TIMESTAMP NULL,
`created_by` INT NULL,
`created_at` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
diff --git a/docs/screenshots/admin-dashboard-dark.png b/docs/screenshots/admin-dashboard-dark.png
index a6d5491..effa5ff 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 82d09b8..1c06c88 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 2603b9e..2053175 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 688aec1..78d18b8 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
index 06cca2a..4fd41bc 100644
Binary files a/docs/screenshots/kiosk-branded.png and b/docs/screenshots/kiosk-branded.png differ
diff --git a/docs/screenshots/kiosk-display.png b/docs/screenshots/kiosk-display.png
index 06cca2a..2b984ca 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 f36783c..1d793e3 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
index 6ce7a0d..2121081 100644
Binary files a/docs/screenshots/kiosks-form.png and b/docs/screenshots/kiosks-form.png differ
diff --git a/docs/screenshots/settings-branding.png b/docs/screenshots/settings-branding.png
index faa7bca..0bdd9a3 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 6ed55e6..af8de26 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 853ec54..04299ec 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 de4b1cb..0754713 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 9bd5852..6f8204c 100644
Binary files a/docs/screenshots/vouchers.png and b/docs/screenshots/vouchers.png differ
diff --git a/includes/I18n.php b/includes/I18n.php
index 7d4e444..7629db0 100644
--- a/includes/I18n.php
+++ b/includes/I18n.php
@@ -16,7 +16,9 @@ class I18n {
$_SESSION['language'] = $_GET['set_lang'];
}
- self::$language = $_SESSION['language'] ?? 'de';
+ // Ohne Auswahl die Sprache des Browsers verwenden – am Display stehen
+ // oft Gäste, die kein Deutsch lesen.
+ self::$language = $_SESSION['language'] ?? self::browserLanguage();
$langFile = __DIR__ . '/../lang/' . self::$language . '.php';
if (file_exists($langFile)) {
@@ -31,6 +33,20 @@ class I18n {
self::$initialized = true;
}
+ /** Erste unterstützte Sprache aus dem Accept-Language-Header. */
+ private static function browserLanguage(): string
+ {
+ $header = strtolower((string)($_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? ''));
+ foreach (explode(',', $header) as $part) {
+ $code = substr(trim(explode(';', $part)[0]), 0, 2);
+ if (in_array($code, ['de', 'en'], true)) {
+ return $code;
+ }
+ }
+
+ return 'de';
+ }
+
public static function t(string $key, array $replace = []): string {
// Fehlt eine Übersetzung, lieber den deutschen Text zeigen als den
// technischen Schlüssel – erst wenn auch der fehlt, den Schlüssel.
diff --git a/includes/Kiosk.php b/includes/Kiosk.php
index ef25a56..fa1c435 100644
--- a/includes/Kiosk.php
+++ b/includes/Kiosk.php
@@ -67,14 +67,87 @@ class Kiosk
return (int)($row['c'] ?? 0);
}
+ /**
+ * Liegt der aktuelle Zeitpunkt im Betriebsfenster der Display-Seite?
+ * Ohne gesetzte Zeiten gilt: immer offen. Ein Fenster über Mitternacht
+ * (z. B. 18:00–02:00) wird unterstützt.
+ */
+ public static function withinSchedule(array $kiosk, ?int $now = null): bool
+ {
+ $from = trim((string)($kiosk['active_from'] ?? ''));
+ $to = trim((string)($kiosk['active_to'] ?? ''));
+ if ($from === '' || $to === '') {
+ return true;
+ }
+
+ $now = $now ?? time();
+ $minutes = (int)date('G', $now) * 60 + (int)date('i', $now);
+ $start = self::toMinutes($from);
+ $end = self::toMinutes($to);
+
+ if ($start === $end) {
+ return true; // 24 Stunden
+ }
+ if ($start < $end) {
+ return $minutes >= $start && $minutes < $end;
+ }
+
+ return $minutes >= $start || $minutes < $end; // über Mitternacht
+ }
+
+ private static function toMinutes(string $time): int
+ {
+ $parts = explode(':', $time);
+
+ return ((int)($parts[0] ?? 0)) * 60 + ((int)($parts[1] ?? 0));
+ }
+
+ /**
+ * Wartezeit dieses Geräts: das Display merkt sich den letzten Bezug in
+ * einem Cookie. Verhindert, dass eine Person am Handy im Takt der
+ * globalen Wartezeit das Tageskontingent leerzieht.
+ *
+ * @param int|null $lastSeen Zeitstempel aus dem Cookie
+ * @return int verbleibende Sekunden (0 = frei)
+ */
+ public static function deviceCooldownLeft(array $kiosk, ?int $lastSeen, ?int $now = null): int
+ {
+ $cooldown = max(0, (int)($kiosk['device_cooldown_seconds'] ?? 0));
+ if ($cooldown === 0 || !$lastSeen) {
+ return 0;
+ }
+
+ $elapsed = ($now ?? time()) - $lastSeen;
+ if ($elapsed < 0 || $elapsed >= $cooldown) {
+ return 0;
+ }
+
+ return $cooldown - $elapsed;
+ }
+
+ /** Stimmt die eingegebene PIN? Ohne hinterlegte PIN entfällt die Prüfung. */
+ public static function pinMatches(array $kiosk, ?string $input): bool
+ {
+ $pin = trim((string)($kiosk['pin'] ?? ''));
+ if ($pin === '') {
+ return true;
+ }
+
+ return hash_equals($pin, trim((string)$input));
+ }
+
/**
* Darf gerade ein Code geholt werden?
*
* @return array{allowed:bool,reason:string,wait:int}
- * reason: '' | 'cooldown' | 'daily_limit'
+ * reason: '' | 'closed' | 'cooldown' | 'daily_limit'
*/
public static function checkLimits($db, array $kiosk): array
{
+ if (!self::withinSchedule($kiosk)) {
+ return ['allowed' => false, 'reason' => 'closed', 'wait' => 0];
+ }
+
$cooldown = max(0, (int)$kiosk['cooldown_seconds']);
if ($cooldown > 0 && !empty($kiosk['last_used_at'])) {
$elapsed = time() - strtotime((string)$kiosk['last_used_at']);
diff --git a/kiosk.php b/kiosk.php
index 9118ce4..5e5e0aa 100644
--- a/kiosk.php
+++ b/kiosk.php
@@ -20,8 +20,6 @@ require_once __DIR__ . '/includes/Ui.php';
require_once __DIR__ . '/includes/Kiosk.php';
require_once __DIR__ . '/includes/VoucherService.php';
-I18n::init();
-
try {
$db = Database::getInstance();
$auth = new Auth();
@@ -30,9 +28,22 @@ try {
die('Datenbankfehler');
}
+$token = Kiosk::sanitizeToken($_GET['k'] ?? '');
+
+// Sprache bestimmen, bevor Texte gebraucht werden: Auswahl des Gastes,
+// sonst die Vorgabe der Display-Seite, sonst die Browsersprache.
+if (!isset($_SESSION)) {
+ if (session_status() === PHP_SESSION_NONE) { @session_start(); }
+}
+$kioskRow = $token !== '' ? Kiosk::findByToken($db, $token) : null;
+if (!isset($_GET['set_lang']) && $kioskRow && !empty($kioskRow['language'])) {
+ $_SESSION['language'] = in_array($kioskRow['language'], ['de', 'en'], true) ? $kioskRow['language'] : 'de';
+}
+
+I18n::init();
+
$appTitle = $db->getSetting('app_title', 'UniFi Voucher System');
-$token = Kiosk::sanitizeToken($_GET['k'] ?? '');
-$kiosk = $token !== '' ? Kiosk::findByToken($db, $token) : null;
+$kiosk = $kioskRow;
if (!$kiosk) {
http_response_code(404);
@@ -46,15 +57,28 @@ $error = '';
$waitSecs = 0;
if (!$notFound && $_SERVER['REQUEST_METHOD'] === 'POST') {
+ $cookieName = 'kiosk_' . (int)$kiosk['id'];
+ $deviceLast = isset($_COOKIE[$cookieName]) ? (int)$_COOKIE[$cookieName] : null;
+ $deviceWait = Kiosk::deviceCooldownLeft($kiosk, $deviceLast);
+
if (!$auth->validateCsrfToken($_POST['csrf_token'] ?? '')) {
$error = __('error_csrf');
+ } elseif (!Kiosk::pinMatches($kiosk, $_POST['pin'] ?? '')) {
+ $error = __('kiosk_error_pin');
+ } elseif ($deviceWait > 0) {
+ $waitSecs = $deviceWait;
+ $error = str_replace('{seconds}', (string)$deviceWait, __('kiosk_error_device'));
} else {
$limits = Kiosk::checkLimits($db, $kiosk);
if (!$limits['allowed']) {
$waitSecs = (int)$limits['wait'];
- $error = $limits['reason'] === 'cooldown'
- ? str_replace('{seconds}', (string)$waitSecs, __('kiosk_error_cooldown'))
- : __('kiosk_error_limit');
+ if ($limits['reason'] === 'cooldown') {
+ $error = str_replace('{seconds}', (string)$waitSecs, __('kiosk_error_cooldown'));
+ } elseif ($limits['reason'] === 'closed') {
+ $error = __('kiosk_error_closed');
+ } else {
+ $error = __('kiosk_error_limit');
+ }
} else {
try {
$site = $db->fetchOne("SELECT * FROM sites WHERE id = ? AND is_active = 1", [(int)$kiosk['site_id']]);
@@ -75,6 +99,14 @@ if (!$notFound && $_SERVER['REQUEST_METHOD'] === 'POST') {
);
Kiosk::markUsed($db, (int)$kiosk['id']);
+ if ((int)($kiosk['device_cooldown_seconds'] ?? 0) > 0 && !headers_sent()) {
+ setcookie($cookieName, (string)time(), [
+ 'expires' => time() + (int)$kiosk['device_cooldown_seconds'],
+ 'path' => '/',
+ 'httponly' => true,
+ 'samesite' => 'Lax',
+ ]);
+ }
$auth->writeAuditLog(null, 'voucher_kiosk', 'kiosk', (int)$kiosk['id'],
$kiosk['name'] . ' · ' . $voucher['code']);
} catch (Exception $e) {
@@ -176,6 +208,13 @@ if ($look['accent'] !== '') {