From 581f1f9cb65d78663e44c7f84b8d7d831dae2a92 Mon Sep 17 00:00:00 2001
From: aydreeihn <adriane@enhancesoft.com>
Date: Wed, 15 May 2019 12:38:12 -0500
Subject: [PATCH] Issue: Ticket Alerts vs Dept Recipients
If an alert is enabled for only the Department Manager and the Department Recipients field is set to No one, the Department Manager still receives a notification.
If the recipients field is set to no one, nobody should receive an alert regardless of what is checked on the New Ticket Alert selections.
To fix this, we can do a count of what the getMembersForAlerts function returns. This function compares what is set for a Department's group_membership in the database to the ALERTS_DISABLED constant to return a query set of members that should receive an alert. If the count is 0, we know that alerts should be disabled.
---
include/class.dept.php | 4 ++++
include/class.ticket.php | 11 +++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/class.dept.php b/include/class.dept.php
index 102e87030..8654e3e75 100644
--- a/include/class.dept.php
+++ b/include/class.dept.php
@@ -326,6 +326,10 @@ implements TemplateVariable, Searchable {
return $rv;
}
+ function getNumMembersForAlerts() {
+ return count($this->getMembersForAlerts());
+ }
+
function getSLAId() {
return $this->sla_id;
}
diff --git a/include/class.ticket.php b/include/class.ticket.php
index a634799bf..09464c1a3 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1505,6 +1505,7 @@ implements RestrictedAccess, Threadable, Searchable {
// Send alert to out sleepy & idle staff.
if ($alertstaff
&& $cfg->alertONNewTicket()
+ && $dept->getNumMembersForAlerts()
&& ($email=$dept->getAlertEmail())
&& ($msg=$tpl->getNewTicketAlertMsgTemplate())
) {
@@ -1784,6 +1785,7 @@ implements RestrictedAccess, Threadable, Searchable {
if (!$alert // Check if alert is enabled
|| !$cfg->alertONNewActivity()
|| !($dept=$this->getDept())
+ || !$dept->getNumMembersForAlerts()
|| !($email=$cfg->getAlertEmail())
|| !($tpl = $dept->getTemplate())
|| !($msg=$tpl->getNoteAlertMsgTemplate())
@@ -1882,12 +1884,11 @@ implements RestrictedAccess, Threadable, Searchable {
$note = $this->logNote($title, $comments, $assigner, false);
}
-
+ $dept = $this->getDept();
// See if we need to send alerts
- if (!$alert || !$cfg->alertONAssignment())
+ if (!$alert || !$cfg->alertONAssignment() || !$dept->getNumMembersForAlerts())
return true; //No alerts!
- $dept = $this->getDept();
if (!$dept
|| !($tpl = $dept->getTemplate())
|| !($email = $dept->getAlertEmail())
@@ -1947,6 +1948,7 @@ implements RestrictedAccess, Threadable, Searchable {
if (!$whine
|| !$cfg->alertONOverdueTicket()
|| !($dept = $this->getDept())
+ || !$dept->getNumMembersForAlerts()
) {
return true;
}
@@ -2328,7 +2330,7 @@ implements RestrictedAccess, Threadable, Searchable {
$this->thread->refer($cdept);
//Send out alerts if enabled AND requested
- if (!$alert || !$cfg->alertONTransfer())
+ if (!$alert || !$cfg->alertONTransfer() || !$dept->getNumMembersForAlerts())
return true; //no alerts!!
if (($email = $dept->getAlertEmail())
@@ -2769,6 +2771,7 @@ implements RestrictedAccess, Threadable, Searchable {
$options = array('thread'=>$message);
// If enabled...send alert to staff (New Message Alert)
if ($cfg->alertONNewMessage()
+ && $dept->getNumMembersForAlerts()
&& ($email = $dept->getAlertEmail())
&& ($tpl = $dept->getTemplate())
&& ($msg = $tpl->getNewMessageAlertMsgTemplate())
--
GitLab