tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Supervisor added blacklist to avoid mail twice

Browse Source 
Former-commit-id: e2f03306076d90f9abe312694ea1fa2298ee7c62
This commit is contained in:
fbsanchez 2019-02-07 18:29:20 +01:00
parent 42b0afb884
commit e90d4b7256
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -356,6 +356,7 @@ class ConsoleSupervisor
bool $update=false bool $update=false
) { ) {
$notification_id = $notification['id_mensaje']; $notification_id = $notification['id_mensaje'];
$blacklist = [];
if (is_array($this->targetUsers) === true if (is_array($this->targetUsers) === true
&& count($this->targetUsers) > 0 && count($this->targetUsers) > 0
@ -382,6 +383,7 @@ class ConsoleSupervisor
io_safe_output($notification['subject']), io_safe_output($notification['subject']),
] ]
); );
array_push($blacklist, $user['id_user']);
} }
} }
} }
@ -407,13 +409,14 @@ class ConsoleSupervisor
if ($update === false) { if ($update === false) {
// Send mail. // Send mail.
if (isset($group['also_mail']) && $group['also_mail'] == 1) { if (isset($group['also_mail']) && $group['also_mail'] == 1) {
$this->warn('Mailing group: '.$group['id_group']."\n");
enterprise_hook( enterprise_hook(
'send_email_group', 'send_email_group',
[ [
$group['id_group'], $group['id_group'],
io_safe_output($notification['mensaje']).'<br><hl><br>'.$notification['url'], io_safe_output($notification['mensaje']).'<br><hl><br>'.$notification['url'],
io_safe_output($notification['subject']), io_safe_output($notification['subject']),
null,
$blacklist,
] ]
); );
} }