diff --git a/include/class.dept.php b/include/class.dept.php index 102e87030e48f0debdbb40e311f29a45938768c4..8654e3e75f8203ba9af68d213c54de0a25d46e2c 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 a634799bfafc37787625e3089791ffc311417d09..09464c1a3d25447c2104a1ecb6c988852e398c6e 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())