maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix plaintext-mail content, thx to AlexL

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2025-01-31 00:03:54 +01:00
parent a2925af73a
commit 2f2d72851b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Api/Commands/Customers.php
View File

@@ -839,7 +839,7 @@ class Customers extends ApiCommand implements ResourceEntity
try { try {
$this->mailer()->Subject = $mail_subject; $this->mailer()->Subject = $mail_subject;
$this->mailer()->AltBody = $mail_body; $this->mailer()->AltBody = $mail_body;
$this->mailer()->msgHTML(str_replace("\n", "<br />", $mail_body)); $this->mailer()->Body = str_replace("\n", "<br />", $mail_body);
$this->mailer()->addAddress($email, User::getCorrectUserSalutation([ $this->mailer()->addAddress($email, User::getCorrectUserSalutation([
'firstname' => $firstname, 'firstname' => $firstname,
'name' => $name, 'name' => $name,

2
lib/Froxlor/Api/Commands/EmailAccounts.php
View File

@@ -265,7 +265,7 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
$this->mailer()->addReplyTo($admin['email'], User::getCorrectUserSalutation($admin)); $this->mailer()->addReplyTo($admin['email'], User::getCorrectUserSalutation($admin));
$this->mailer()->Subject = $mail_subject; $this->mailer()->Subject = $mail_subject;
$this->mailer()->AltBody = $mail_body; $this->mailer()->AltBody = $mail_body;
$this->mailer()->msgHTML(str_replace("\n", "<br />", $mail_body)); $this->mailer()->Body = str_replace("\n", "<br />", $mail_body);
$this->mailer()->addAddress($email_full); $this->mailer()->addAddress($email_full);
$this->mailer()->send(); $this->mailer()->send();
} catch (\PHPMailer\PHPMailer\Exception $e) { } catch (\PHPMailer\PHPMailer\Exception $e) {

2
lib/Froxlor/Api/Commands/Ftps.php
View File

@@ -288,7 +288,7 @@ class Ftps extends ApiCommand implements ResourceEntity
try { try {
$this->mailer()->Subject = $mail_subject; $this->mailer()->Subject = $mail_subject;
$this->mailer()->AltBody = $mail_body; $this->mailer()->AltBody = $mail_body;
$this->mailer()->msgHTML(str_replace("\n", "<br />", $mail_body)); $this->mailer()->Body = str_replace("\n", "<br />", $mail_body);
$this->mailer()->addAddress($customer['email'], User::getCorrectUserSalutation($customer)); $this->mailer()->addAddress($customer['email'], User::getCorrectUserSalutation($customer));
$this->mailer()->send(); $this->mailer()->send();
} catch (\PHPMailer\PHPMailer\Exception $e) { } catch (\PHPMailer\PHPMailer\Exception $e) {

2
lib/Froxlor/Api/Commands/Mysqls.php
View File

@@ -184,7 +184,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
try { try {
$this->mailer()->Subject = $mail_subject; $this->mailer()->Subject = $mail_subject;
$this->mailer()->AltBody = $mail_body; $this->mailer()->AltBody = $mail_body;
$this->mailer()->msgHTML(str_replace("\n", "<br />", $mail_body)); $this->mailer()->Body = str_replace("\n", "<br />", $mail_body);
$this->mailer()->addAddress($userinfo['email'], User::getCorrectUserSalutation($userinfo)); $this->mailer()->addAddress($userinfo['email'], User::getCorrectUserSalutation($userinfo));
$this->mailer()->send(); $this->mailer()->send();
} catch (\PHPMailer\PHPMailer\Exception $e) { } catch (\PHPMailer\PHPMailer\Exception $e) {