@@ -68,7 +68,7 @@ public function hooks() {
68
68
}
69
69
}, 10 , 2 );
70
70
71
- Eventy::addAction ( 'mailbox.settings_before_save ' , function ( $ id , $ request ) {
71
+ Eventy::addAction ( 'mailbox.settings_before_save ' , function ( $ mailbox , $ request ) {
72
72
$ alternativeSignatureCount = $ request ->alternative_signature_count ;
73
73
if ( ! empty ( $ alternativeSignatureCount ) && (int ) $ alternativeSignatureCount > 0 ) {
74
74
for ( $ i = 0 ; $ i < (int ) $ alternativeSignatureCount ; $ i ++ ) {
@@ -81,7 +81,7 @@ public function hooks() {
81
81
$ alternativeSignatureContent = "alternative_signature_content_ $ i " ;
82
82
$ alternativeSignatureContent = $ request ->$ alternativeSignatureContent ;
83
83
84
- if ( $ alternativeSignatureAction === 'DELETE ' || ( empty ( $ alternativeSignatureTitle ) && empty ( $ alternativeSignatureContent ) ) ) {
84
+ if ( $ alternativeSignatureAction === 'DELETE ' ) {
85
85
if ( ! empty ( $ alternativeSignatureId ) && (int ) $ alternativeSignatureId > 0 ) {
86
86
//Delete
87
87
/** @var MailboxCustomSignature|null $customSignature */
@@ -99,15 +99,15 @@ public function hooks() {
99
99
$ customSignature = MailboxCustomSignature::find ( $ alternativeSignatureId );
100
100
if ( $ customSignature !== null ) {
101
101
$ customSignature ->name = $ alternativeSignatureTitle ;
102
- $ customSignature ->content = $ alternativeSignatureContent ;
102
+ $ customSignature ->content = $ alternativeSignatureContent ?? '' ;
103
103
$ customSignature ->save ();
104
104
}
105
105
} else {
106
106
//Create
107
107
$ customSignature = new MailboxCustomSignature ();
108
- $ customSignature ->mailbox_id = $ id ;
108
+ $ customSignature ->mailbox_id = $ mailbox -> id ;
109
109
$ customSignature ->name = $ alternativeSignatureTitle ;
110
- $ customSignature ->content = $ alternativeSignatureContent ;
110
+ $ customSignature ->content = $ alternativeSignatureContent ?? '' ;
111
111
$ customSignature ->save ();
112
112
}
113
113
}
0 commit comments