JcDenis/testMail
1
0
Fork 0
Code Issues Pull Requests Releases 4 Activity

use new Mail Helper

Browse Source
This commit is contained in:
Jean-Christian Paul Denis 2023-03-21 21:20:31 +01:00
parent 7e6fac2990
commit 684e3b38e4
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Manage.php
View File

@ -27,9 +27,9 @@ use Dotclear\Helper\Html\Form\{
Submit, Submit,
Textarea Textarea
}; };
use Dotclear\Helper\Network\Mail\Mail;
use Exception; use Exception;
use http; use http;
use mail;
use text; use text;
class Manage extends dcNsProcess class Manage extends dcNsProcess
@ -62,12 +62,12 @@ class Manage extends dcNsProcess
throw new Exception(__('You must provide a content.')); throw new Exception(__('You must provide a content.'));
} }
$mail_subject = mail::B64Header($mail_subject); $mail_subject = Mail::B64Header($mail_subject);
if ($active_headers) { if ($active_headers) {
mail::sendMail($mail_to, $mail_subject, $mail_content, self::getHeaders()); Mail::sendMail($mail_to, $mail_subject, $mail_content, self::getHeaders());
} else { } else {
mail::sendMail($mail_to, $mail_subject, $mail_content); Mail::sendMail($mail_to, $mail_subject, $mail_content);
} }
dcPage::addSuccessNotice(__('Mail successuffly sent.')); dcPage::addSuccessNotice(__('Mail successuffly sent.'));
dcCore::app()->adminurl->redirect('admin.plugin.' . My::id()); dcCore::app()->adminurl->redirect('admin.plugin.' . My::id());
@ -127,14 +127,14 @@ class Manage extends dcNsProcess
private static function getHeaders(): array private static function getHeaders(): array
{ {
return [ return [
'From: ' . mail::B64Header(dcCore::app()->blog->name) . 'From: ' . Mail::B64Header(dcCore::app()->blog->name) .
'<no-reply@' . str_replace('http://', '', http::getHost()) . ' >', '<no-reply@' . str_replace('http://', '', http::getHost()) . ' >',
'Content-Type: text/HTML; charset=UTF-8;' . 'Content-Type: text/HTML; charset=UTF-8;' .
'X-Originating-IP: ' . http::realIP(), 'X-Originating-IP: ' . http::realIP(),
'X-Mailer: ' . My::X_MAILER, 'X-Mailer: ' . My::X_MAILER,
'X-Blog-Id: ' . mail::B64Header(dcCore::app()->blog->id), 'X-Blog-Id: ' . Mail::B64Header(dcCore::app()->blog->id),
'X-Blog-Name: ' . mail::B64Header(dcCore::app()->blog->name), 'X-Blog-Name: ' . Mail::B64Header(dcCore::app()->blog->name),
'X-Blog-Url: ' . mail::B64Header(dcCore::app()->blog->url), 'X-Blog-Url: ' . Mail::B64Header(dcCore::app()->blog->url),
]; ];
} }
} }