19 changed files with 9 additions and 224 deletions
--- a/app/Console/Commands/BackupRun.php
+++ b/app/Console/Commands/BackupRun.php
@ -37,7 +37,7 @@ class BackupRun extends Command
                }
            }

-$this->finalize($job, $exitCode, implode("\n", array_slice($output, -30)), $artifact);
+            $this->finalize($job, $exitCode, implode("\n", array_slice($output, -30)), $artifact);
            $this->cleanTmp($tmpDir);
            return $exitCode === 0 ? self::SUCCESS : self::FAILURE;
        }
--- a/app/Livewire/Ui/System/UpdatePage.php
+++ b/app/Livewire/Ui/System/UpdatePage.php
@ -133,7 +133,6 @@ class UpdatePage extends Component

            if ($this->rc === 0 && !$this->postActionsDone) {
                @shell_exec('nohup php /var/www/mailwolt/artisan optimize:clear >/dev/null 2>&1 &');
-                @shell_exec('nohup php /var/www/mailwolt/artisan config:cache >/dev/null 2>&1 &');
                @shell_exec('nohup php /var/www/mailwolt/artisan health:collect >/dev/null 2>&1 &');
                @shell_exec('nohup php /var/www/mailwolt/artisan settings:sync >/dev/null 2>&1 &');
                $this->postActionsDone = true;
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@ -27,23 +27,14 @@ return Application::configure(basePath: dirname(__DIR__))
                    ->prefix('webmail')
                    ->name('webmail.')
                    ->group(base_path('routes/webmail.php'));
-
-                // UI-Routes nur auf UI-Domain binden, damit webmail.* sie nicht beantwortet
-                $uiHost = config('clubird.domain.ui') && config('clubird.domain.base')
-                    ? config('clubird.domain.ui') . '.' . config('clubird.domain.base')
-                    : parse_url(config('app.url'), PHP_URL_HOST);
-
-                Route::middleware('web')
-                    ->domain($uiHost)
-                    ->group(base_path('routes/web.php'));
            } else {
                Route::middleware('web')
                    ->prefix('webmail')
                    ->name('ui.webmail.')
                    ->group(base_path('routes/webmail.php'));
-
-                Route::middleware('web')->group(base_path('routes/web.php'));
            }
+
+            Route::middleware('web')->group(base_path('routes/web.php'));
        },
    )
    ->withMiddleware(function (Middleware $middleware): void {
--- a/resources/views/errors/400.blade.php
+++ b/resources/views/errors/400.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 400,
-    'type'  => 'client',
-    'title' => 'Ungültige Anfrage',
-    'desc'  => 'Die Anfrage enthält fehlerhafte oder unvollständige Daten.',
-    'icon'  => '<path d="M12 9v4m0 4h.01M10.29 3.86 1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"/>',
-])
--- a/resources/views/errors/401.blade.php
+++ b/resources/views/errors/401.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 401,
-    'type'  => 'client',
-    'title' => 'Nicht angemeldet',
-    'desc'  => 'Bitte melde dich an, um auf diese Seite zuzugreifen.',
-    'icon'  => '<rect x="3" y="11" width="18" height="11" rx="2" ry="2"/><path d="M7 11V7a5 5 0 0 1 10 0v4"/>',
-])
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 403,
-    'type'  => 'client',
-    'title' => 'Kein Zugriff',
-    'desc'  => 'Du hast keine Berechtigung, diese Seite aufzurufen.',
-    'icon'  => '<circle cx="12" cy="12" r="9"/><line x1="4.93" y1="4.93" x2="19.07" y2="19.07"/>',
-])
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 404,
-    'type'  => 'client',
-    'title' => 'Seite nicht gefunden',
-    'desc'  => 'Die aufgerufene Seite existiert nicht oder wurde verschoben.',
-    'icon'  => '<circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/>',
-])
--- a/resources/views/errors/405.blade.php
+++ b/resources/views/errors/405.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 405,
-    'type'  => 'client',
-    'title' => 'Methode nicht erlaubt',
-    'desc'  => 'Diese HTTP-Methode ist für die aufgerufene URL nicht zulässig.',
-    'icon'  => '<circle cx="12" cy="12" r="9"/><line x1="4.93" y1="4.93" x2="19.07" y2="19.07"/>',
-])
--- a/resources/views/errors/419.blade.php
+++ b/resources/views/errors/419.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 419,
-    'type'  => 'client',
-    'title' => 'Sitzung abgelaufen',
-    'desc'  => 'Deine Sitzung ist abgelaufen. Lade die Seite neu und versuche es erneut.',
-    'icon'  => '<circle cx="12" cy="12" r="9"/><polyline points="12 7 12 12 15 15"/>',
-])
--- a/resources/views/errors/422.blade.php
+++ b/resources/views/errors/422.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 422,
-    'type'  => 'client',
-    'title' => 'Ungültige Eingabe',
-    'desc'  => 'Die übermittelten Daten konnten nicht verarbeitet werden.',
-    'icon'  => '<path d="M12 9v4m0 4h.01M10.29 3.86 1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"/>',
-])
--- a/resources/views/errors/429.blade.php
+++ b/resources/views/errors/429.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 429,
-    'type'  => 'client',
-    'title' => 'Zu viele Anfragen',
-    'desc'  => 'Du hast das Anfrage-Limit erreicht. Bitte warte einen Moment.',
-    'icon'  => '<path d="M13 10V3L4 14h7v7l9-11h-7z"/>',
-])
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 500,
-    'type'  => 'server',
-    'title' => 'Serverfehler',
-    'desc'  => 'Ein interner Fehler ist aufgetreten. Wir wurden benachrichtigt.',
-    'icon'  => '<path d="M13 10V3L4 14h7v7l9-11h-7z"/>',
-])
--- a/resources/views/errors/502.blade.php
+++ b/resources/views/errors/502.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 502,
-    'type'  => 'server',
-    'title' => 'Bad Gateway',
-    'desc'  => 'Der Server hat eine ungültige Antwort erhalten. Bitte versuche es gleich erneut.',
-    'icon'  => '<path d="M12 9v4m0 4h.01M10.29 3.86 1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"/>',
-])
--- a/resources/views/errors/504.blade.php
+++ b/resources/views/errors/504.blade.php
@ -1,7 +0,0 @@
-@include('errors._base', [
-    'code'  => 504,
-    'type'  => 'server',
-    'title' => 'Gateway-Timeout',
-    'desc'  => 'Der Server antwortet nicht rechtzeitig. Bitte versuche es in Kürze erneut.',
-    'icon'  => '<circle cx="12" cy="12" r="9"/><polyline points="12 7 12 12 15 15"/>',
-])
--- a/resources/views/errors/_base.blade.php
+++ b/resources/views/errors/_base.blade.php
@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html lang="de">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>{{ $code }} · CluBird</title>
-<style>
-  *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
-  html, body {
-    width: 100%; min-height: 100vh;
-    background: #0f1117; color: #e2e4ea;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-    display: flex; align-items: center; justify-content: center; padding: 16px;
-  }
-  .card {
-    width: 100%; max-width: 480px; padding: 44px 40px;
-    background: #181c24; border: 1px solid #252938;
-    border-radius: 18px; text-align: center;
-    animation: fadein .35s ease;
-  }
-  @keyframes fadein { from { opacity: 0; transform: translateY(8px); } to { opacity: 1; transform: none; } }
-  .logo { display: inline-flex; align-items: center; gap: 14px; margin-bottom: 36px; }
-  .logo-icon {
-    position: relative; width: 42px; height: 42px;
-    background: linear-gradient(135deg, #6366f1, #4338ca);
-    border-radius: 12px; display: flex; align-items: center; justify-content: center;
-    box-shadow: 0 0 22px rgba(99,102,241,.45);
-  }
-  .logo-icon::after {
-    content: ''; position: absolute; inset: -4px; border-radius: 16px;
-    border: 1px solid rgba(99,102,241,.3);
-    animation: glow 2s ease-in-out infinite;
-  }
-  @keyframes glow { 0%, 100% { opacity: .3; } 50% { opacity: 1; } }
-  .logo-text { font-size: 24px; font-weight: 700; letter-spacing: -.3px; }
-  .logo-text span { color: #6366f1; }
-  .err-icon {
-    width: 56px; height: 56px; margin: 0 auto 20px;
-    border-radius: 50%; display: flex; align-items: center; justify-content: center;
-    background: {{ $type === 'server' ? 'rgba(239,68,68,.1)' : 'rgba(99,102,241,.12)' }};
-  }
-  .err-icon svg {
-    width: 26px; height: 26px; fill: none; stroke-width: 1.8;
-    stroke-linecap: round; stroke-linejoin: round;
-    stroke: {{ $type === 'server' ? '#f87171' : '#818cf8' }};
-  }
-  .err-code {
-    font-size: 64px; font-weight: 800; line-height: 1;
-    margin-bottom: 12px; letter-spacing: -2px;
-    color: {{ $type === 'server' ? '#f87171' : '#6366f1' }};
-  }
-  h1 { font-size: 17px; font-weight: 600; color: #e2e4ea; margin-bottom: 8px; letter-spacing: -.2px; }
-  p  { font-size: 13px; color: #4b5563; line-height: 1.65; margin-bottom: 28px; }
-  .divider { border: none; border-top: 1px solid #252938; margin: 0 0 28px; }
-  .btn {
-    display: inline-flex; align-items: center; gap: 6px;
-    padding: 9px 20px; border-radius: 9px;
-    background: #1f2433; border: 1px solid #2d3348;
-    font-size: 13px; font-weight: 500; text-decoration: none; cursor: pointer;
-    transition: background .15s, border-color .15s;
-    color: {{ $type === 'server' ? '#fca5a5' : '#a5b4fc' }};
-  }
-  .btn:hover { background: #252b3d; border-color: #3d4565; }
-  .btn svg { width: 14px; height: 14px; stroke: currentColor; fill: none; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; }
-  .btn-primary {
-    display: inline-flex; align-items: center; gap: 6px;
-    padding: 9px 20px; border-radius: 9px; margin-left: 8px;
-    background: linear-gradient(135deg, #6366f1, #4338ca); border: none;
-    color: #fff; font-size: 13px; font-weight: 500; text-decoration: none;
-    box-shadow: 0 4px 14px rgba(99,102,241,.35); transition: opacity .15s;
-  }
-  .btn-primary:hover { opacity: .88; }
-  .btn-primary svg { width: 14px; height: 14px; stroke: currentColor; fill: none; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; }
-</style>
-</head>
-<body>
-  <div class="card">
-    <div class="logo">
-      <div class="logo-icon">
-        <svg width="22" height="22" viewBox="0 0 28 28" fill="none">
-          <path d="M5 19 C5 19 8 10 15 9 C19 8 23 11 24 15" stroke="white" stroke-width="2.5" stroke-linecap="round"/>
-          <path d="M5 19 C6.5 22 9 23.5 12 23.5 C15 23.5 18 22 19.5 19" stroke="white" stroke-width="2.5" stroke-linecap="round"/>
-          <circle cx="19" cy="8" r="2" fill="white"/>
-        </svg>
-      </div>
-      <div class="logo-text">Clu<span>Bird</span></div>
-    </div>
-
-    <div class="err-icon">
-      <svg viewBox="0 0 24 24">{!! $icon !!}</svg>
-    </div>
-
-    <div class="err-code">{{ $code }}</div>
-    <h1>{{ $title }}</h1>
-    <p>{{ $desc }}</p>
-    <hr class="divider">
-
-    @if($type === 'server')
-      <a class="btn" href="javascript:location.reload()">
-        <svg viewBox="0 0 24 24"><polyline points="23 4 23 10 17 10"/><path d="M20.49 15a9 9 0 1 1-.1-6.87"/></svg>
-        Neu laden
-      </a>
-    @else
-      <a class="btn" href="javascript:history.back()">
-        <svg viewBox="0 0 24 24"><polyline points="15 18 9 12 15 6"/></svg>
-        Zurück
-      </a>
-    @endif
-    <a class="btn-primary" href="/">
-      <svg viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg>
-      Startseite
-    </a>
-  </div>
-</body>
-</html>
--- a/resources/views/layouts/dvx.blade.php
+++ b/resources/views/layouts/dvx.blade.php
@ -226,18 +226,14 @@
@livewireScripts
@livewire('wire-elements-modal')
 <script>
-// 503 (Wartungsmodus) → Reload | 419 (Session abgelaufen) → Login
+// 503 (Wartungsmodus) → sofortiger Page-Reload statt Livewire-Fehlerdialog
 ;(function () {
    var _fetch = window.fetch
    window.fetch = function () {
        return _fetch.apply(this, arguments).then(function (resp) {
            if (resp.status === 503) {
                window.location.reload()
-                return new Promise(function () {})
-            }
-            if (resp.status === 419) {
-                window.location.href = '{{ route('login') }}'
-                return new Promise(function () {})
+                return new Promise(function () {}) // Livewire-Chain abbrechen
            }
            return resp
        })
--- a/routes/webmail.php
+++ b/routes/webmail.php
@ -10,8 +10,8 @@ use Illuminate\Support\Facades\Route;
 // Domain-wrapping and naming are applied in bootstrap/app.php.
 // This file only defines the routes themselves.

-// Root → redirect to webmail login
-Route::get('/',              fn() => redirect()->to(route('ui.webmail.login')))->name('root');
+// Root → redirect to UI admin login; webmail login is at /login
+Route::get('/',              fn() => redirect()->away(config('app.url') . '/login'))->name('root');
 Route::get('/login',         Login::class)->name('login');
 Route::get('/inbox',         Inbox::class)->name('inbox');
 Route::get('/compose',       Compose::class)->name('compose');
--- a/scripts/mailwolt-backup
+++ b/scripts/mailwolt-backup
@ -6,8 +6,8 @@ APP_DIR="/var/www/mailwolt"
 APP_USER="www-data"
 OUT_DIR="${APP_DIR}/storage/app/backups"
 STAMP="$(date +%Y-%m-%d_%H-%M-%S)"
-OUT_FILE="${OUT_DIR}/clubird_${STAMP}.tar.gz"
-TMP_DIR="$(mktemp -d /tmp/clubird_backup_XXXXXX)"
+OUT_FILE="${OUT_DIR}/mailwolt_${STAMP}.tar.gz"
+TMP_DIR="$(mktemp -d /tmp/mailwolt_backup_XXXXXX)"

 cleanup(){ rm -rf "$TMP_DIR"; }
 trap cleanup EXIT
--- a/scripts/update.sh
+++ b/scripts/update.sh
@ -224,15 +224,6 @@ ensure_system(){
    [[ -f "$f" ]] || continue
    _sudoers_add "$f" 'www-data ALL=(root) NOPASSWD: /usr/local/sbin/mailwolt-backup'
  done
-  # RSpamd: Loopback als lokale Adresse eintragen (verhindert 127.0.0.1-Einträge in History)
-  local rspamd_opts="/etc/rspamd/local.d/options.inc"
-  if [[ -d /etc/rspamd/local.d ]] && ! grep -q "127.0.0.1" "${rspamd_opts}" 2>/dev/null; then
-    printf 'local_addrs = [127.0.0.1, ::1, 192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, fd00::/8, 169.254.0.0/16, fe80::/10];\n' \
-      > "${rspamd_opts}"
-    systemctl is-active --quiet rspamd && systemctl reload rspamd || true
-    echo "[✓] RSpamd: local_addrs mit Loopback gesetzt."
-  fi
-
  # Laravel Scheduler cron (schedule:run muss jede Minute laufen)
  local cron_file="/etc/cron.d/mailwolt"
  local cron_line="* * * * * www-data php ${APP_DIR}/artisan schedule:run >> /dev/null 2>&1"