iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

catch mail exceptions, execute the action, inform the user about the error and create a log entry

This commit is contained in:
msquare 2019-04-28 14:54:32 +02:00
parent 184c36baab
commit ef2d917c59
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
includes/helper/email_helper.php
View File

@ -13,26 +13,33 @@ use Engelsystem\Models\User\User;
function engelsystem_email_to_user($recipientUser, $title, $message, $notIfItsMe = false) function engelsystem_email_to_user($recipientUser, $title, $message, $notIfItsMe = false)
{ {
if ($notIfItsMe && auth()->user()->id == $recipientUser->id) { if ($notIfItsMe && auth()->user()->id == $recipientUser->id) {
return true; #return true;
} }
/** @var \Engelsystem\Helpers\Translator $translator */ /** @var \Engelsystem\Helpers\Translator $translator */
$translator = app()->get('translator'); $translator = app()->get('translator');
$locale = $translator->getLocale(); $locale = $translator->getLocale();
/** @var EngelsystemMailer $mailer */
$mailer = app('mailer'); try {
/** @var EngelsystemMailer $mailer */
$mailer = app('mailer');
$translator->setLocale($recipientUser->settings->language);
$status = $mailer->sendView(
$recipientUser->contact->email ? $recipientUser->contact->email : $recipientUser->email,
$title,
'emails/mail',
['username' => $recipientUser->name, 'message' => $message]
);
} catch(Exception $e) {
$status = 0;
}
$translator->setLocale($recipientUser->settings->language);
$status = $mailer->sendView(
$recipientUser->contact->email ? $recipientUser->contact->email : $recipientUser->email,
$title,
'emails/mail',
['username' => $recipientUser->name, 'message' => $message]
);
$translator->setLocale($locale); $translator->setLocale($locale);
if (!$status) { if (!$status) {
engelsystem_error('Unable to send email.'); error(sprintf(__('User %s could not be notified by email due to an error.'), User_Nick_render($recipientUser)));
engelsystem_log(sprintf('User %s could not be notified by email due to an error.', $recipientUser->name));
} }
return (bool)$status; return (bool)$status;