E-Mails und Druckvorlage im neuen Design
E-Mail:
- Nachrichten werden in ein markentreues HTML-Gerüst gelegt (Tabellen +
Inline-Styles, damit Outlook & Co. es zuverlässig darstellen); die
Kopfleiste nutzt den eingestellten Markenverlauf
- neuer Platzhalter {VOUCHER_CARD} rendert den Code als hervorgehobene
Karte; bestehende Vorlagen mit {VOUCHER_CODE} funktionieren unverändert
weiter, sie werden lediglich eingerahmt
- Zeilenumbrüche der Vorlage werden vor dem Einsetzen der Platzhalter
umgewandelt, Markup aus dem WYSIWYG-Editor bleibt unangetastet
Druck:
- neue Standardvorlage als Ticket mit QR-Code, Code, Gültigkeit und
Anleitung; zentral in Ui::defaultPrintTemplate()
- neuer Platzhalter {QR_CODE}; der QR-Code wird lokal im Browser erzeugt
(qrcodejs aus assets/vendor), auch bei Bulk-Erstellung für jede Karte
- die Druckvorlage ist am Bildschirm ausgeblendet und erscheint nur im
Ausdruck
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
parent
7f1d93debd
commit
e28527ed91
8 changed files with 401 additions and 290 deletions
|
|
@ -239,26 +239,10 @@ $cs = [
|
||||||
'smtp_from_name' => $db->getSetting('smtp_from_name', ''),
|
'smtp_from_name' => $db->getSetting('smtp_from_name', ''),
|
||||||
'system_url' => $db->getSetting('system_url', $autoDetectedUrl),
|
'system_url' => $db->getSetting('system_url', $autoDetectedUrl),
|
||||||
'email_voucher_subject' => $db->getSetting('email_voucher_subject', '{APP_TITLE} - Ihr WLAN-Zugang'),
|
'email_voucher_subject' => $db->getSetting('email_voucher_subject', '{APP_TITLE} - Ihr WLAN-Zugang'),
|
||||||
'email_voucher_body' => $db->getSetting('email_voucher_body', "Hallo,\n\nIhr Code: {VOUCHER_CODE}\n\nGültigkeit: 8h\nGeräte: {MAX_USES}\nSite: {SITE_NAME}"),
|
'email_voucher_body' => $db->getSetting('email_voucher_body', "Hallo,\n\nhier ist Ihr WLAN-Zugangscode:\n{VOUCHER_CARD}\n<strong>Maximale Geräte:</strong> {MAX_USES}<br>\n<strong>Standort:</strong> {SITE_NAME}\n\n{INSTRUCTIONS}\n\nViele Grüße\n{APP_TITLE}"),
|
||||||
'email_user_notification_subject' => $db->getSetting('email_user_notification_subject', '{APP_TITLE} - Berechtigungen geändert'),
|
'email_user_notification_subject' => $db->getSetting('email_user_notification_subject', '{APP_TITLE} - Berechtigungen geändert'),
|
||||||
'email_user_notification_body' => $db->getSetting('email_user_notification_body', "Hallo {USER_NAME},\n\n{CHANGES}"),
|
'email_user_notification_body' => $db->getSetting('email_user_notification_body', "Hallo {USER_NAME},\n\n{CHANGES}"),
|
||||||
'print_template' => $db->getSetting('print_template', '<div style="text-align:center;padding:40px"><h1>{APP_TITLE}</h1><h2>WLAN Code</h2><div style="font-size:48px;font-weight:bold;margin:30px 0;font-family:monospace">{VOUCHER_CODE}</div><p><strong>Gültig bis:</strong> {EXPIRY_DATE} {EXPIRY_TIME}</p><p><strong>Site:</strong> {SITE_NAME}</p><p><strong>Geräte:</strong> {MAX_USES}</p><hr style="margin:30px 0"><div>{INSTRUCTIONS}</div></div>'),
|
'print_template' => $db->getSetting('print_template', Ui::defaultPrintTemplate()),
|
||||||
'brand_accent' => $db->getSetting('brand_accent', '') ?: Ui::DEFAULT_ACCENT,
|
|
||||||
'brand_accent_dark' => $db->getSetting('brand_accent_dark', '') ?: Ui::DEFAULT_ACCENT_DARK,
|
|
||||||
'brand_gradient_from' => $db->getSetting('brand_gradient_from', '') ?: Ui::DEFAULT_GRADIENT_FROM,
|
|
||||||
'brand_gradient_to' => $db->getSetting('brand_gradient_to', '') ?: Ui::DEFAULT_GRADIENT_TO,
|
|
||||||
'brand_radius' => $db->getSetting('brand_radius', (string)Ui::DEFAULT_RADIUS),
|
|
||||||
'login_panel_enabled' => $db->getSetting('login_panel_enabled', '1'),
|
|
||||||
'login_brand_name' => $db->getSetting('login_brand_name', ''),
|
|
||||||
'login_logo_url' => $db->getSetting('login_logo_url', ''),
|
|
||||||
'login_claim_title' => $db->getSetting('login_claim_title', ''),
|
|
||||||
'login_claim_text' => $db->getSetting('login_claim_text', ''),
|
|
||||||
'login_features' => $db->getSetting('login_features', ''),
|
|
||||||
'login_footer' => $db->getSetting('login_footer', ''),
|
|
||||||
'login_bg_image' => $db->getSetting('login_bg_image', ''),
|
|
||||||
'login_bg_from' => $db->getSetting('login_bg_from', '#3b2f8f'),
|
|
||||||
'login_bg_to' => $db->getSetting('login_bg_to', '#6d5ce7'),
|
|
||||||
'login_bg_overlay' => $db->getSetting('login_bg_overlay', '40'),
|
|
||||||
'cron_token' => $db->getSetting('cron_token', ''),
|
'cron_token' => $db->getSetting('cron_token', ''),
|
||||||
'last_cron_sync' => $db->getSetting('last_cron_sync', ''),
|
'last_cron_sync' => $db->getSetting('last_cron_sync', ''),
|
||||||
];
|
];
|
||||||
|
|
@ -644,12 +628,12 @@ $adminBase = '';
|
||||||
<div class="form-group"><label>System-URL</label><input type="url" name="system_url" value="<?= htmlspecialchars($cs['system_url']) ?>"><div class="help-text">Auto: <code><?= $autoDetectedUrl ?></code></div></div>
|
<div class="form-group"><label>System-URL</label><input type="url" name="system_url" value="<?= htmlspecialchars($cs['system_url']) ?>"><div class="help-text">Auto: <code><?= $autoDetectedUrl ?></code></div></div>
|
||||||
<hr class="section-divider">
|
<hr class="section-divider">
|
||||||
<h3 style="margin-bottom:15px; color: var(--text-primary);"><?= __('settings_tpl_voucher_mail') ?></h3>
|
<h3 style="margin-bottom:15px; color: var(--text-primary);"><?= __('settings_tpl_voucher_mail') ?></h3>
|
||||||
<div class="placeholder-info"><h4>Platzhalter:</h4><div class="placeholder-list"><code>{VOUCHER_CODE}</code><code>{SITE_NAME}</code><code>{MAX_USES}</code><code>{APP_TITLE}</code><code>{INSTRUCTIONS}</code></div></div>
|
<div class="placeholder-info"><h4><?= __('settings_placeholders') ?></h4><div class="placeholder-list"><code>{VOUCHER_CARD}</code><code>{VOUCHER_CODE}</code><code>{SITE_NAME}</code><code>{MAX_USES}</code><code>{APP_TITLE}</code><code>{INSTRUCTIONS}</code></div><p class="help-text"><?= __('settings_card_hint') ?></p></div>
|
||||||
<div class="form-group"><label>Betreff</label><input type="text" name="email_voucher_subject" value="<?= htmlspecialchars($cs['email_voucher_subject']) ?>"></div>
|
<div class="form-group"><label>Betreff</label><input type="text" name="email_voucher_subject" value="<?= htmlspecialchars($cs['email_voucher_subject']) ?>"></div>
|
||||||
<div class="form-group"><label>E-Mail Text</label><textarea name="email_voucher_body" class="tinymce-editor"><?= htmlspecialchars($cs['email_voucher_body']) ?></textarea></div>
|
<div class="form-group"><label>E-Mail Text</label><textarea name="email_voucher_body" class="tinymce-editor"><?= htmlspecialchars($cs['email_voucher_body']) ?></textarea></div>
|
||||||
<hr class="section-divider">
|
<hr class="section-divider">
|
||||||
<h3 style="margin-bottom:15px; color: var(--text-primary);"><?= __('settings_tpl_user_notify') ?></h3>
|
<h3 style="margin-bottom:15px; color: var(--text-primary);"><?= __('settings_tpl_user_notify') ?></h3>
|
||||||
<div class="placeholder-info"><h4>Platzhalter:</h4><div class="placeholder-list"><code>{USER_NAME}</code><code>{CHANGES}</code><code>{APP_TITLE}</code><code>{SYSTEM_URL}</code></div></div>
|
<div class="placeholder-info"><h4><?= __('settings_placeholders') ?></h4><div class="placeholder-list"><code>{USER_NAME}</code><code>{CHANGES}</code><code>{APP_TITLE}</code><code>{SYSTEM_URL}</code></div></div>
|
||||||
<div class="form-group"><label>Betreff</label><input type="text" name="email_user_notification_subject" value="<?= htmlspecialchars($cs['email_user_notification_subject']) ?>"></div>
|
<div class="form-group"><label>Betreff</label><input type="text" name="email_user_notification_subject" value="<?= htmlspecialchars($cs['email_user_notification_subject']) ?>"></div>
|
||||||
<div class="form-group"><label>E-Mail Text</label><textarea name="email_user_notification_body" class="tinymce-editor"><?= htmlspecialchars($cs['email_user_notification_body']) ?></textarea></div>
|
<div class="form-group"><label>E-Mail Text</label><textarea name="email_user_notification_body" class="tinymce-editor"><?= htmlspecialchars($cs['email_user_notification_body']) ?></textarea></div>
|
||||||
<button type="submit" name="save_settings" class="btn btn-primary"><i class="fas fa-save" aria-hidden="true"></i> <?= __('btn_save') ?></button>
|
<button type="submit" name="save_settings" class="btn btn-primary"><i class="fas fa-save" aria-hidden="true"></i> <?= __('btn_save') ?></button>
|
||||||
|
|
@ -669,7 +653,7 @@ $adminBase = '';
|
||||||
|
|
||||||
<hr class="section-divider">
|
<hr class="section-divider">
|
||||||
<h3 style="margin-bottom:15px; color: var(--text-primary);">Druck-Template</h3>
|
<h3 style="margin-bottom:15px; color: var(--text-primary);">Druck-Template</h3>
|
||||||
<div class="placeholder-info"><h4>Platzhalter:</h4><div class="placeholder-list"><code>{VOUCHER_CODE}</code><code>{EXPIRY_DATE}</code><code>{EXPIRY_TIME}</code><code>{SITE_NAME}</code><code>{MAX_USES}</code><code>{APP_TITLE}</code><code>{INSTRUCTIONS}</code></div></div>
|
<div class="placeholder-info"><h4><?= __('settings_placeholders') ?></h4><div class="placeholder-list"><code>{QR_CODE}</code><code>{VOUCHER_CODE}</code><code>{EXPIRY_DATE}</code><code>{EXPIRY_TIME}</code><code>{SITE_NAME}</code><code>{MAX_USES}</code><code>{APP_TITLE}</code><code>{INSTRUCTIONS}</code></div><p class="help-text"><?= __('settings_qr_hint') ?></p></div>
|
||||||
<div class="form-group"><label><?= __('settings_print_template') ?></label><textarea name="print_template" class="tinymce-editor" style="min-height:250px;"><?= htmlspecialchars($cs['print_template']) ?></textarea></div>
|
<div class="form-group"><label><?= __('settings_print_template') ?></label><textarea name="print_template" class="tinymce-editor" style="min-height:250px;"><?= htmlspecialchars($cs['print_template']) ?></textarea></div>
|
||||||
<button type="submit" name="save_settings" class="btn btn-primary"><i class="fas fa-save" aria-hidden="true"></i> <?= __('btn_save') ?></button>
|
<button type="submit" name="save_settings" class="btn btn-primary"><i class="fas fa-save" aria-hidden="true"></i> <?= __('btn_save') ?></button>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
|
|
@ -1531,6 +1531,10 @@ input.search-bar, .site-selector .search-bar { min-width: 240px; width: auto; fl
|
||||||
.row3 { display: grid; grid-template-columns: repeat(3, 1fr); gap: 14px; }
|
.row3 { display: grid; grid-template-columns: repeat(3, 1fr); gap: 14px; }
|
||||||
@media (max-width: 720px) { .row, .row3 { grid-template-columns: 1fr; } }
|
@media (max-width: 720px) { .row, .row3 { grid-template-columns: 1fr; } }
|
||||||
|
|
||||||
|
/* QR-Code auf der Druckkarte */
|
||||||
|
.print-qr { display: flex; justify-content: center; line-height: 0; }
|
||||||
|
.print-qr img, .print-qr canvas { display: block; }
|
||||||
|
|
||||||
/* Sprungmarke zum Inhalt (nur bei Tastaturfokus sichtbar) */
|
/* Sprungmarke zum Inhalt (nur bei Tastaturfokus sichtbar) */
|
||||||
.skip-link {
|
.skip-link {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
|
||||||
|
|
@ -172,6 +172,56 @@ class Mailer {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Vordefinierte E-Mail-Templates
|
// Vordefinierte E-Mail-Templates
|
||||||
|
/**
|
||||||
|
* Legt den Nachrichtentext in ein schlichtes, markentreues HTML-Gerüst.
|
||||||
|
* Bewusst Tabellen + Inline-Styles: nur so rendern Outlook & Co. zuverlässig.
|
||||||
|
*/
|
||||||
|
private function brandedHtml(string $title, string $contentHtml, string $footerNote = ''): string
|
||||||
|
{
|
||||||
|
$accent = $this->db->getSetting('brand_gradient_from', '') ?: '#5b5bd6';
|
||||||
|
$accent2 = $this->db->getSetting('brand_gradient_to', '') ?: '#8b5cf6';
|
||||||
|
if (!preg_match('/^#[0-9a-fA-F]{6}$/', $accent)) { $accent = '#5b5bd6'; }
|
||||||
|
if (!preg_match('/^#[0-9a-fA-F]{6}$/', $accent2)) { $accent2 = '#8b5cf6'; }
|
||||||
|
|
||||||
|
$safeTitle = htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
|
||||||
|
$year = date('Y');
|
||||||
|
$footer = $footerNote !== '' ? '<div style="margin-top:8px;">' . htmlspecialchars($footerNote, ENT_QUOTES, 'UTF-8') . '</div>' : '';
|
||||||
|
|
||||||
|
return '<!DOCTYPE html><html><head><meta charset="UTF-8">'
|
||||||
|
. '<meta name="viewport" content="width=device-width, initial-scale=1.0">'
|
||||||
|
. '<title>' . $safeTitle . '</title></head>'
|
||||||
|
. '<body style="margin:0;padding:0;background:#f6f7f9;">'
|
||||||
|
. '<table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background:#f6f7f9;padding:28px 12px;">'
|
||||||
|
. '<tr><td align="center">'
|
||||||
|
. '<table role="presentation" width="600" cellpadding="0" cellspacing="0" style="max-width:600px;width:100%;background:#ffffff;border:1px solid #e5e8ee;border-radius:14px;overflow:hidden;font-family:-apple-system,BlinkMacSystemFont,\'Segoe UI\',Roboto,Helvetica,Arial,sans-serif;">'
|
||||||
|
. '<tr><td style="background:' . $accent . ';background-image:linear-gradient(135deg,' . $accent . ' 0%,' . $accent2 . ' 100%);padding:22px 26px;">'
|
||||||
|
. '<div style="color:#ffffff;font-size:16px;font-weight:600;letter-spacing:-0.01em;">' . $safeTitle . '</div>'
|
||||||
|
. '</td></tr>'
|
||||||
|
. '<tr><td style="padding:26px;color:#101625;font-size:15px;line-height:1.6;">' . $contentHtml . '</td></tr>'
|
||||||
|
. '<tr><td style="padding:16px 26px;background:#f8f9fb;border-top:1px solid #e5e8ee;color:#6b7280;font-size:12px;">'
|
||||||
|
. '© ' . $year . ' ' . $safeTitle . $footer
|
||||||
|
. '</td></tr>'
|
||||||
|
. '</table></td></tr></table></body></html>';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Voucher-Code als hervorgehobene Karte für die E-Mail.
|
||||||
|
*/
|
||||||
|
private function voucherCardHtml(string $code, string $siteName, $maxUses): string
|
||||||
|
{
|
||||||
|
return '<table role="presentation" width="100%" cellpadding="0" cellspacing="0" '
|
||||||
|
. 'style="margin:18px 0;background:#f8f9fb;border:1px solid #e5e8ee;border-radius:12px;">'
|
||||||
|
. '<tr><td align="center" style="padding:22px;">'
|
||||||
|
. '<div style="font-size:12px;letter-spacing:.08em;text-transform:uppercase;color:#6b7280;">'
|
||||||
|
. htmlspecialchars($siteName, ENT_QUOTES, 'UTF-8') . '</div>'
|
||||||
|
. '<div style="margin:10px 0;font-family:Consolas,Menlo,monospace;font-size:28px;font-weight:700;letter-spacing:.12em;color:#101625;">'
|
||||||
|
. htmlspecialchars($code, ENT_QUOTES, 'UTF-8') . '</div>'
|
||||||
|
. '<div style="font-size:13px;color:#525c6e;">'
|
||||||
|
. htmlspecialchars((string)$maxUses, ENT_QUOTES, 'UTF-8') . ' '
|
||||||
|
. htmlspecialchars(function_exists('__') ? __('label_devices') : 'Geräte', ENT_QUOTES, 'UTF-8') . '</div>'
|
||||||
|
. '</td></tr></table>';
|
||||||
|
}
|
||||||
|
|
||||||
public function sendVoucherEmail($to, $voucherCode, $siteName, $maxUses) {
|
public function sendVoucherEmail($to, $voucherCode, $siteName, $maxUses) {
|
||||||
$appTitle = $this->db->getSetting('app_title', 'UniFi Voucher System');
|
$appTitle = $this->db->getSetting('app_title', 'UniFi Voucher System');
|
||||||
$instructionHeader = $this->db->getSetting('instruction_header', '');
|
$instructionHeader = $this->db->getSetting('instruction_header', '');
|
||||||
|
|
@ -189,7 +239,7 @@ class Mailer {
|
||||||
|
|
||||||
// Template aus Datenbank laden
|
// Template aus Datenbank laden
|
||||||
$subjectTemplate = $this->db->getSetting('email_voucher_subject', '{APP_TITLE} - Ihr WLAN-Zugang');
|
$subjectTemplate = $this->db->getSetting('email_voucher_subject', '{APP_TITLE} - Ihr WLAN-Zugang');
|
||||||
$bodyTemplate = $this->db->getSetting('email_voucher_body', "Hallo,\n\nIhr WLAN-Zugangscode lautet:\n\n<strong>{VOUCHER_CODE}</strong>\n\nGültigkeit: 8 Stunden ab Erstellung\nMaximale Geräte: {MAX_USES}\nStandort: {SITE_NAME}\n\n{INSTRUCTIONS}\n\nMit freundlichen Grüßen\n{APP_TITLE}");
|
$bodyTemplate = $this->db->getSetting('email_voucher_body', "Hallo,\n\nhier ist Ihr WLAN-Zugangscode:\n{VOUCHER_CARD}\n<strong>Maximale Geräte:</strong> {MAX_USES}<br>\n<strong>Standort:</strong> {SITE_NAME}\n\n{INSTRUCTIONS}\n\nViele Grüße\n{APP_TITLE}");
|
||||||
|
|
||||||
// Anleitung formatieren
|
// Anleitung formatieren
|
||||||
$instructions = '';
|
$instructions = '';
|
||||||
|
|
@ -199,6 +249,7 @@ class Mailer {
|
||||||
|
|
||||||
// Platzhalter ersetzen
|
// Platzhalter ersetzen
|
||||||
$placeholders = [
|
$placeholders = [
|
||||||
|
'{VOUCHER_CARD}' => $this->voucherCardHtml($voucherCode, (string)$siteName, $maxUses),
|
||||||
'{VOUCHER_CODE}' => $voucherCode,
|
'{VOUCHER_CODE}' => $voucherCode,
|
||||||
'{SITE_NAME}' => $siteName,
|
'{SITE_NAME}' => $siteName,
|
||||||
'{MAX_USES}' => $maxUses,
|
'{MAX_USES}' => $maxUses,
|
||||||
|
|
@ -208,10 +259,16 @@ class Mailer {
|
||||||
];
|
];
|
||||||
|
|
||||||
$subject = str_replace(array_keys($placeholders), array_values($placeholders), $subjectTemplate);
|
$subject = str_replace(array_keys($placeholders), array_values($placeholders), $subjectTemplate);
|
||||||
$body = str_replace(array_keys($placeholders), array_values($placeholders), $bodyTemplate);
|
|
||||||
|
|
||||||
// HTML oder Plain Text prüfen
|
// Umbrueche der Vorlage vor dem Einsetzen der Platzhalter umwandeln,
|
||||||
$isHtml = strip_tags($body) !== $body;
|
// sonst wuerde das Markup der Voucher-Karte die Erkennung stoeren.
|
||||||
|
$isHtml = strip_tags($bodyTemplate) !== $bodyTemplate || strpos($bodyTemplate, '{VOUCHER_CARD}') !== false;
|
||||||
|
$template = $isHtml ? $this->textToHtml($bodyTemplate) : $bodyTemplate;
|
||||||
|
$body = str_replace(array_keys($placeholders), array_values($placeholders), $template);
|
||||||
|
|
||||||
|
if ($isHtml) {
|
||||||
|
$body = $this->brandedHtml($appTitle, $body);
|
||||||
|
}
|
||||||
|
|
||||||
return $this->send($to, $subject, $body, $isHtml);
|
return $this->send($to, $subject, $body, $isHtml);
|
||||||
}
|
}
|
||||||
|
|
@ -255,11 +312,28 @@ class Mailer {
|
||||||
];
|
];
|
||||||
|
|
||||||
$subject = str_replace(array_keys($placeholders), array_values($placeholders), $subjectTemplate);
|
$subject = str_replace(array_keys($placeholders), array_values($placeholders), $subjectTemplate);
|
||||||
$body = str_replace(array_keys($placeholders), array_values($placeholders), $bodyTemplate);
|
|
||||||
|
|
||||||
// HTML oder Plain Text prüfen
|
$isHtml = strip_tags($bodyTemplate) !== $bodyTemplate;
|
||||||
$isHtml = strip_tags($body) !== $body;
|
$template = $isHtml ? $this->textToHtml($bodyTemplate) : $bodyTemplate;
|
||||||
|
$body = str_replace(array_keys($placeholders), array_values($placeholders), $template);
|
||||||
|
|
||||||
|
if ($isHtml) {
|
||||||
|
$body = $this->brandedHtml($appTitle, $body);
|
||||||
|
}
|
||||||
|
|
||||||
return $this->send($to, $subject, $body, $isHtml);
|
return $this->send($to, $subject, $body, $isHtml);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Zeilenumbrüche aus dem Vorlagentext in HTML übernehmen, ohne bereits
|
||||||
|
* vorhandenes Markup (z. B. aus dem WYSIWYG-Editor) zu zerstören.
|
||||||
|
*/
|
||||||
|
private function textToHtml(string $body): string
|
||||||
|
{
|
||||||
|
if (preg_match('#<(p|div|ul|ol|h[1-6])[\s>]#i', $body)) {
|
||||||
|
return $body;
|
||||||
|
}
|
||||||
|
|
||||||
|
return nl2br($body, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -116,6 +116,26 @@ class Ui
|
||||||
. '</style>';
|
. '</style>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Standard-Druckvorlage (wird nur verwendet, solange keine eigene
|
||||||
|
* Vorlage gespeichert ist). {QR_CODE} fuellt der Browser.
|
||||||
|
*/
|
||||||
|
public static function defaultPrintTemplate(): string
|
||||||
|
{
|
||||||
|
$validUntil = function_exists('__') ? __('print_valid_until') : 'Gültig bis';
|
||||||
|
$devices = function_exists('__') ? __('print_devices') : 'Geräte';
|
||||||
|
|
||||||
|
return '<div style="font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica,Arial,sans-serif;'
|
||||||
|
. 'max-width:420px;margin:0 auto;padding:26px;border:1px dashed #9aa1ae;border-radius:14px;text-align:center;">'
|
||||||
|
. '<div style="font-size:13px;letter-spacing:.08em;text-transform:uppercase;color:#6b7280;">{APP_TITLE}</div>'
|
||||||
|
. '<div style="margin:6px 0 18px;font-size:15px;color:#101625;">{SITE_NAME}</div>'
|
||||||
|
. '{QR_CODE}'
|
||||||
|
. '<div style="margin:18px 0 6px;font-family:Consolas,Menlo,monospace;font-size:30px;font-weight:700;letter-spacing:.14em;color:#101625;">{VOUCHER_CODE}</div>'
|
||||||
|
. '<div style="font-size:13px;color:#525c6e;">' . $validUntil . ' {EXPIRY_DATE} {EXPIRY_TIME} · {MAX_USES} ' . $devices . '</div>'
|
||||||
|
. '<div style="margin-top:16px;padding-top:14px;border-top:1px solid #e5e8ee;font-size:12px;color:#525c6e;text-align:left;">{INSTRUCTIONS}</div>'
|
||||||
|
. '</div>';
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* URL eines Bildes aus den Einstellungen.
|
* URL eines Bildes aus den Einstellungen.
|
||||||
* Hochgeladene Dateien liegen relativ zur Projektwurzel (uploads/…),
|
* Hochgeladene Dateien liegen relativ zur Projektwurzel (uploads/…),
|
||||||
|
|
|
||||||
28
index.php
28
index.php
|
|
@ -75,7 +75,7 @@ $instructionHeader = $db->getSetting('instruction_header', '');
|
||||||
$instructionText = $db->getSetting('instruction_text', '');
|
$instructionText = $db->getSetting('instruction_text', '');
|
||||||
$publicAccess = $db->getSetting('public_access', 0);
|
$publicAccess = $db->getSetting('public_access', 0);
|
||||||
$smtpEnabled = $db->getSetting('smtp_enabled', '0') === '1';
|
$smtpEnabled = $db->getSetting('smtp_enabled', '0') === '1';
|
||||||
$printTemplate = $db->getSetting('print_template', '<div style="text-align:center;padding:40px;font-family:sans-serif;"><h1>{APP_TITLE}</h1><h2>WLAN Zugangscode</h2><div style="font-size:48px;font-weight:bold;margin:30px 0;font-family:monospace;letter-spacing:4px;">{VOUCHER_CODE}</div><p><strong>Gültig bis:</strong> {EXPIRY_DATE} {EXPIRY_TIME}</p><p><strong>Standort:</strong> {SITE_NAME}</p><p><strong>Maximale Geräte:</strong> {MAX_USES}</p><hr style="margin:30px 0;"><div style="font-size:14px;text-align:left;">{INSTRUCTIONS}</div></div>');
|
$printTemplate = $db->getSetting('print_template', Ui::defaultPrintTemplate());
|
||||||
$defaultExpire = max(1, (int)$db->getSetting('default_expire_minutes', 480));
|
$defaultExpire = max(1, (int)$db->getSetting('default_expire_minutes', 480));
|
||||||
$defaultMaxUses = max(1, (int)$db->getSetting('default_max_uses', 1));
|
$defaultMaxUses = max(1, (int)$db->getSetting('default_max_uses', 1));
|
||||||
$maxUsesLimit = max(1, (int)$db->getSetting('max_uses_limit', 10));
|
$maxUsesLimit = max(1, (int)$db->getSetting('max_uses_limit', 10));
|
||||||
|
|
@ -272,9 +272,12 @@ function buildPrintCard($template, $data, $instructionHeader, $instructionText,
|
||||||
$instructions = $instructionHeader || $instructionText
|
$instructions = $instructionHeader || $instructionText
|
||||||
? htmlspecialchars($instructionHeader) . "\n" . $instructionText
|
? htmlspecialchars($instructionHeader) . "\n" . $instructionText
|
||||||
: '';
|
: '';
|
||||||
|
// {QR_CODE} wird erst im Browser gefuellt (siehe renderPrintQr()).
|
||||||
|
$qr = '<div class="print-qr" data-code="' . htmlspecialchars(str_replace('-', '', (string)$data['code']), ENT_QUOTES) . '"></div>';
|
||||||
|
|
||||||
return str_replace(
|
return str_replace(
|
||||||
['{VOUCHER_CODE}', '{SITE_NAME}', '{MAX_USES}', '{APP_TITLE}', '{INSTRUCTIONS}', '{EXPIRY_DATE}', '{EXPIRY_TIME}'],
|
['{QR_CODE}', '{VOUCHER_CODE}', '{SITE_NAME}', '{MAX_USES}', '{APP_TITLE}', '{INSTRUCTIONS}', '{EXPIRY_DATE}', '{EXPIRY_TIME}'],
|
||||||
[$data['code'], htmlspecialchars($data['site_name']), $data['max_uses'], htmlspecialchars($appTitle), $instructions, $data['expiry_date'], $data['expiry_time']],
|
[$qr, $data['code'], htmlspecialchars($data['site_name']), $data['max_uses'], htmlspecialchars($appTitle), $instructions, $data['expiry_date'], $data['expiry_time']],
|
||||||
$template
|
$template
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -289,7 +292,7 @@ function buildPrintCard($template, $data, $instructionHeader, $instructionText,
|
||||||
<?php if ($captchaMode === 'hcaptcha' && $hcaptchaSiteKey !== ''): ?>
|
<?php if ($captchaMode === 'hcaptcha' && $hcaptchaSiteKey !== ''): ?>
|
||||||
<script src="https://js.hcaptcha.com/1/api.js" async defer></script>
|
<script src="https://js.hcaptcha.com/1/api.js" async defer></script>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<?php if ($voucherCreated): ?>
|
<?php if ($voucherCreated || $bulkCreated): ?>
|
||||||
<?= Ui::script('assets/vendor/qrcodejs/qrcode.min.js') ?>
|
<?= Ui::script('assets/vendor/qrcodejs/qrcode.min.js') ?>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<style>
|
<style>
|
||||||
|
|
@ -635,6 +638,23 @@ function buildPrintCard($template, $data, $instructionHeader, $instructionText,
|
||||||
<div id="toast-container" role="status" aria-live="polite"></div>
|
<div id="toast-container" role="status" aria-live="polite"></div>
|
||||||
<script src="assets/global.js"></script>
|
<script src="assets/global.js"></script>
|
||||||
<script>
|
<script>
|
||||||
|
<?php if ($voucherCreated || $bulkCreated): ?>
|
||||||
|
// QR-Codes der Druckkarten erzeugen (im Browser, ohne externen Dienst)
|
||||||
|
function renderPrintQr() {
|
||||||
|
document.querySelectorAll('.print-qr').forEach(function (el) {
|
||||||
|
if (el.dataset.done) return;
|
||||||
|
el.dataset.done = '1';
|
||||||
|
new QRCode(el, {
|
||||||
|
text: el.dataset.code || '',
|
||||||
|
width: 132, height: 132,
|
||||||
|
colorDark: '#101625', colorLight: '#ffffff',
|
||||||
|
correctLevel: QRCode.CorrectLevel.M
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
document.addEventListener('DOMContentLoaded', renderPrintQr);
|
||||||
|
<?php endif; ?>
|
||||||
|
|
||||||
<?php if ($voucherCreated): ?>
|
<?php if ($voucherCreated): ?>
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
new QRCode(document.getElementById('qrcode'), {
|
new QRCode(document.getElementById('qrcode'), {
|
||||||
|
|
|
||||||
|
|
@ -464,6 +464,11 @@ return [
|
||||||
'vouchers_resend' => 'Per E-Mail senden',
|
'vouchers_resend' => 'Per E-Mail senden',
|
||||||
'label_minutes_short' => 'Min.',
|
'label_minutes_short' => 'Min.',
|
||||||
'js_copy' => 'Kopieren',
|
'js_copy' => 'Kopieren',
|
||||||
|
'settings_placeholders' => 'Platzhalter:',
|
||||||
|
'settings_card_hint' => '{VOUCHER_CARD} rendert den Code als hervorgehobene Karte im Marken-Layout.',
|
||||||
|
'settings_qr_hint' => '{QR_CODE} fügt einen QR-Code mit dem Voucher-Code ein.',
|
||||||
|
'print_valid_until' => 'Gültig bis',
|
||||||
|
'print_devices' => 'Geräte',
|
||||||
'settings_tab_general' => 'Allgemein',
|
'settings_tab_general' => 'Allgemein',
|
||||||
'settings_tab_defaults' => 'Voucher-Standards',
|
'settings_tab_defaults' => 'Voucher-Standards',
|
||||||
'settings_tab_cron' => 'Cron-Sync',
|
'settings_tab_cron' => 'Cron-Sync',
|
||||||
|
|
|
||||||
|
|
@ -464,6 +464,11 @@ return [
|
||||||
'vouchers_resend' => 'Send by email',
|
'vouchers_resend' => 'Send by email',
|
||||||
'label_minutes_short' => 'min',
|
'label_minutes_short' => 'min',
|
||||||
'js_copy' => 'Copy',
|
'js_copy' => 'Copy',
|
||||||
|
'settings_placeholders' => 'Placeholders:',
|
||||||
|
'settings_card_hint' => '{VOUCHER_CARD} renders the code as a highlighted card in the branded layout.',
|
||||||
|
'settings_qr_hint' => '{QR_CODE} inserts a QR code containing the voucher code.',
|
||||||
|
'print_valid_until' => 'Valid until',
|
||||||
|
'print_devices' => 'devices',
|
||||||
'settings_tab_general' => 'General',
|
'settings_tab_general' => 'General',
|
||||||
'settings_tab_defaults' => 'Voucher Defaults',
|
'settings_tab_defaults' => 'Voucher Defaults',
|
||||||
'settings_tab_cron' => 'Cron Sync',
|
'settings_tab_cron' => 'Cron Sync',
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ class Database {
|
||||||
'trusted_proxy' => '10.0.0.1, 172.18.0.1',
|
'trusted_proxy' => '10.0.0.1, 172.18.0.1',
|
||||||
'cleanup_expired_days' => '90', 'cleanup_audit_days' => '365', 'cleanup_login_days' => '30',
|
'cleanup_expired_days' => '90', 'cleanup_audit_days' => '365', 'cleanup_login_days' => '30',
|
||||||
'last_cleanup' => '2026-09-22 03:00:00',
|
'last_cleanup' => '2026-09-22 03:00:00',
|
||||||
'print_template' => '<div style="padding:20px;border:1px dashed #999;"><h2>{APP_TITLE}</h2><p>{SITE_NAME}</p><h1>{VOUCHER_CODE}</h1></div>',
|
|
||||||
];
|
];
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue