From 70d68db6e3bb0958368d69dd4ba96ed4c61afb01 Mon Sep 17 00:00:00 2001 From: deepseth Date: Mon, 18 Dec 2017 15:03:33 +0000 Subject: [PATCH] refactor: Stop sending emails to "NOC" for default_email target (#7917) --- includes/alerts.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/alerts.inc.php b/includes/alerts.inc.php index d5ffd9a854..f59e139cdc 100644 --- a/includes/alerts.inc.php +++ b/includes/alerts.inc.php @@ -238,7 +238,7 @@ function GetContacts($results) return array(); } if ($config['alert']['default_only'] === true || $config['alerts']['email']['default_only'] === true) { - return array(''.($config['alert']['default_mail'] ? $config['alert']['default_mail'] : $config['alerts']['email']['default']) => 'NOC'); + return array(''.($config['alert']['default_mail'] ? $config['alert']['default_mail'] : $config['alerts']['email']['default']) => ''); } $users = Auth::get()->getUserlist(); $contacts = array(); @@ -265,7 +265,7 @@ function GetContacts($results) $tmpa = dbFetchCell("SELECT sysContact FROM devices WHERE device_id = ?", array($result["device_id"])); } if (!empty($tmpa)) { - $contacts[$tmpa] = "NOC"; + $contacts[$tmpa] = ''; } } $tmpa = dbFetchRows("SELECT user_id FROM devices_perms WHERE access_level >= 0 AND device_id = ?", array($result["device_id"])); @@ -319,7 +319,7 @@ function GetContacts($results) # Send email to default contact if no other contact found if ((count($tmp_contacts) == 0) && ($config['alert']['default_if_none']) && (!empty($config['alert']['default_mail']))) { - $tmp_contacts[$config['alert']['default_mail']] = 'NOC'; + $tmp_contacts[$config['alert']['default_mail']] = ''; } return $tmp_contacts;