From 17caeb3fe039d3413edf9ace2c3a699a027dd6fc Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Mon, 12 May 2014 22:17:40 +0000
Subject: [PATCH] bug: Respect "No Alerts" setting for teams
---
include/class.team.php | 4 ++++
include/class.ticket.php | 13 +++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/include/class.team.php b/include/class.team.php
index 8d1c22bb0..7b5c5c362 100644
--- a/include/class.team.php
+++ b/include/class.team.php
@@ -122,6 +122,10 @@ class Team {
return $this->isEnabled();
}
+ function alertsEnabled() {
+ return !$this->ht['noalerts'];
+ }
+
function update($vars, &$errors) {
//reset team lead if they're being deleted
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 7de7e2480..f076d1068 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1135,18 +1135,19 @@ class Ticket {
//recipients
$recipients=array();
- if(!strcasecmp(get_class($assignee), 'Staff')) {
- if($cfg->alertStaffONAssignment())
+ if ($assignee instanceof Staff) {
+ if ($cfg->alertStaffONAssignment())
$recipients[] = $assignee;
- } elseif(!strcasecmp(get_class($assignee), 'Team')) {
- if($cfg->alertTeamMembersONAssignment() && ($members=$assignee->getMembers()))
+ } elseif (($assignee instanceof Team) && $assignee->alertsEnabled()) {
+ if ($cfg->alertTeamMembersONAssignment() && ($members=$assignee->getMembers()))
$recipients = array_merge($recipients, $members);
- elseif($cfg->alertTeamLeadONAssignment() && ($lead=$assignee->getTeamLead()))
+ elseif ($cfg->alertTeamLeadONAssignment() && ($lead=$assignee->getTeamLead()))
$recipients[] = $lead;
}
//Get the message template
- if($recipients && ($msg=$tpl->getAssignedAlertMsgTemplate())) {
+ if ($recipients
+ && ($msg=$tpl->getAssignedAlertMsgTemplate())) {
$msg = $this->replaceVars($msg->asArray(),
array('comments' => $comments,
--
GitLab