Skip to content

Commit 191c7d2

Browse files
committed
Fixed creating new signature
1 parent 9f05081 commit 191c7d2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

LJPcAlternativeSignaturesModule/Providers/LJPcAlternativeSignaturesModuleServiceProvider.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function hooks() {
6868
}
6969
}, 10, 2 );
7070

71-
Eventy::addAction( 'mailbox.settings_before_save', function ( $id, $request ) {
71+
Eventy::addAction( 'mailbox.settings_before_save', function ( $mailbox, $request ) {
7272
$alternativeSignatureCount = $request->alternative_signature_count;
7373
if ( ! empty( $alternativeSignatureCount ) && (int) $alternativeSignatureCount > 0 ) {
7474
for ( $i = 0; $i < (int) $alternativeSignatureCount; $i ++ ) {
@@ -81,7 +81,7 @@ public function hooks() {
8181
$alternativeSignatureContent = "alternative_signature_content_$i";
8282
$alternativeSignatureContent = $request->$alternativeSignatureContent;
8383

84-
if ( $alternativeSignatureAction === 'DELETE' || ( empty( $alternativeSignatureTitle ) && empty( $alternativeSignatureContent ) ) ) {
84+
if ( $alternativeSignatureAction === 'DELETE' ) {
8585
if ( ! empty( $alternativeSignatureId ) && (int) $alternativeSignatureId > 0 ) {
8686
//Delete
8787
/** @var MailboxCustomSignature|null $customSignature */
@@ -99,15 +99,15 @@ public function hooks() {
9999
$customSignature = MailboxCustomSignature::find( $alternativeSignatureId );
100100
if ( $customSignature !== null ) {
101101
$customSignature->name = $alternativeSignatureTitle;
102-
$customSignature->content = $alternativeSignatureContent;
102+
$customSignature->content = $alternativeSignatureContent ?? '';
103103
$customSignature->save();
104104
}
105105
} else {
106106
//Create
107107
$customSignature = new MailboxCustomSignature();
108-
$customSignature->mailbox_id = $id;
108+
$customSignature->mailbox_id = $mailbox->id;
109109
$customSignature->name = $alternativeSignatureTitle;
110-
$customSignature->content = $alternativeSignatureContent;
110+
$customSignature->content = $alternativeSignatureContent ?? '';
111111
$customSignature->save();
112112
}
113113
}

LJPcAlternativeSignaturesModule/module.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "LJPc alternative signatures module",
33
"alias": "ljpcalternativesignaturesmodule",
44
"description": "This module adds the option to add alternative signatures to Freescout mailboxes",
5-
"version": "1.0.4",
5+
"version": "1.0.5",
66
"detailsUrl": "",
77
"author": "LJPc solutions",
88
"authorUrl": "https://ljpc.solutions",

0 commit comments

Comments
 (0)