holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tracker/Notifications: send mail after response to user and push errors

Browse Source
This commit is contained in:
Ralf Becker 2020-08-01 15:10:07 +02:00
parent 421bda29c4
commit a14a21fa49
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/src/Storage/Tracking.php
View File

@ -846,10 +846,25 @@ abstract class Tracking
{
$notification->set_attachments($attachments);
}
$notification->send();
// run immediatly during async service, as sending mail with Horde fails, if PHP is already in shutdown
// (json requests take care of that by calling Egw::__desctruct() explicit before it's regular triggered)
$run = isset($GLOBALS['egw_info']['flags']['async-service']) ? 'call_user_func_array' : Api\Egw::class.'::on_shutdown';
$run(static function($notification, $sender, $receiver, $subject)
{
$notification->send();
// Notification can (partially) succeed and still generate errors
$this->errors += $notification->errors();
// Notification can (partially) succeed and still generate errors
foreach($notification->errors(true) as $error)
{
error_log(__METHOD__."() Error notifying $receiver from $sender: $subject: $error");
// send notification errors via push to current user (not session, as alarms send via async job have none!)
(new Api\Json\Push($GLOBALS['egw_info']['user']['account_id']))->message(
lang('Error notifying %1', !is_numeric($receiver) ? $receiver :
Api\Accounts::id2name($receiver, 'account_fullname').' <'.Api\Accounts::id2name($receiver, 'account_email').'>').
"\n".$subject."\n".$error, 'error');
}
}, [$notification, $sender, $receiver, $subject]);
}
catch (Exception $exception)
{