From cdfdcc0756f87540c118e67c20e8974539f8ad29 Mon Sep 17 00:00:00 2001
From: boban <boban.blaskovic@gmail.com>
Date: Sun, 26 Apr 2026 23:40:45 +0200
Subject: [PATCH] =?UTF-8?q?Fix:=20Benachrichtigungs-Defaults=20=E2=80=93?=
 =?UTF-8?q?=20User-Email=20+=20sinnvoller=20Absendername?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Absendername-Default: '{Instanzname} Benachrichtigung'.
Admin-Email-Default: Login-Email des eingeloggten Users (notifyEmail()).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 app/Livewire/Ui/System/SettingsForm.php                   | 8 +++++---
 .../views/livewire/ui/system/settings-form.blade.php      | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Livewire/Ui/System/SettingsForm.php b/app/Livewire/Ui/System/SettingsForm.php
index 8e6f3c7..2faf511 100644
--- a/app/Livewire/Ui/System/SettingsForm.php
+++ b/app/Livewire/Ui/System/SettingsForm.php
@@ -30,7 +30,7 @@ class SettingsForm extends Component
     private const SSL_STATE_DIR = '/var/lib/mailwolt/wizard';
 
     // Benachrichtigungen
-    public string $notify_sender_name  = 'System Alert';
+    public string $notify_sender_name  = '';
     public string $notify_admin_email  = '';
 
     // Sicherheit
@@ -135,8 +135,10 @@ class SettingsForm extends Component
         }
 
         $this->loadSslStatus();
-        $this->notify_sender_name = (string) Setting::get('notify_sender_name', $this->notify_sender_name);
-        $this->notify_admin_email = (string) Setting::get('notify_admin_email', $this->notify_admin_email);
+        $defaultSenderName = ($this->instance_name ?: 'Mailwolt') . ' Benachrichtigung';
+        $defaultAdminEmail = auth()->user()?->notifyEmail() ?? '';
+        $this->notify_sender_name = (string) Setting::get('notify_sender_name', $defaultSenderName);
+        $this->notify_admin_email = (string) Setting::get('notify_admin_email', $defaultAdminEmail);
         $this->rate_limit         = (int)    Setting::get('rate_limit', $this->rate_limit);
         $this->password_min       = (int)    Setting::get('password_min', $this->password_min);
 
diff --git a/resources/views/livewire/ui/system/settings-form.blade.php b/resources/views/livewire/ui/system/settings-form.blade.php
index ae6a3d3..b3990c1 100644
--- a/resources/views/livewire/ui/system/settings-form.blade.php
+++ b/resources/views/livewire/ui/system/settings-form.blade.php
@@ -219,7 +219,7 @@
                         <div class="mw-modal-grid2">
                             <div>
                                 <label class="mw-modal-label">Absendername</label>
-                                <input type="text" wire:model.defer="notify_sender_name" class="mw-modal-input" placeholder="System Alert">
+                                <input type="text" wire:model.defer="notify_sender_name" class="mw-modal-input" placeholder="Mailwolt Benachrichtigung">
                                 <div class="mw-modal-hint">Wird als Absender in System-Mails angezeigt</div>
                             </div>
                             <div>