From 70ddd0f2f285ebb430f04740db4cd03fd6a679c6 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@enhancesoft.com>
Date: Thu, 14 Nov 2013 04:11:39 +0000
Subject: [PATCH] Make variable %{recipient} a complex variable of type person.
---
include/class.thread.php | 6 +++++-
include/class.ticket.php | 39 +++++++++++++++------------------------
include/class.user.php | 4 ++++
3 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/include/class.thread.php b/include/class.thread.php
index 13c2e0dfe..a68db4ddf 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -785,13 +785,17 @@ Class ThreadEntry {
}
$vars['body'] = Format::sanitize($vars['body']);
+ $poster = $vars['poster'];
+ if ($poster && is_object($poster))
+ $poster = $poster->getName();
+
$sql=' INSERT INTO '.TICKET_THREAD_TABLE.' SET created=NOW() '
.' ,thread_type='.db_input($vars['type'])
.' ,ticket_id='.db_input($vars['ticketId'])
.' ,title='.db_input(Format::sanitize($vars['title'], true))
.' ,body='.db_input($vars['body'])
.' ,staff_id='.db_input($vars['staffId'])
- .' ,poster='.db_input($vars['poster'])
+ .' ,poster='.db_input($poster)
.' ,source='.db_input($vars['source']);
if(isset($vars['pid']))
diff --git a/include/class.ticket.php b/include/class.ticket.php
index aa482f7df..a97c89f60 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -874,9 +874,8 @@ class Ticket {
$recipients=$sentlist=array();
//Alert admin??
if($cfg->alertAdminONNewTicket()) {
- $alert = str_replace('%{recipient}', 'Admin', $msg['body']);
- $email->sendAlert($cfg->getAdminEmail(), $msg['subj'],
- $alert, null, $options);
+ $alert = $this->replaceVars($msg, array('recipient' => 'Admin'));
+ $email->sendAlert($cfg->getAdminEmail(), $alert['subj'], $alert['body'], null, $options);
$sentlist[]=$cfg->getAdminEmail();
}
@@ -891,13 +890,10 @@ class Ticket {
foreach( $recipients as $k=>$staff) {
if(!is_object($staff) || !$staff->isAvailable() || in_array($staff->getEmail(), $sentlist)) continue;
- $alert = str_replace('%{recipient}', $staff->getFirstName(), $msg['body']);
- $email->sendAlert($staff->getEmail(), $msg['subj'], $alert,
- null, $options);
+ $alert = $this->replaceVars($msg, array('recipient' => $staff));
+ $email->sendAlert($staff->getEmail(), $alert['subj'], $alert['body'], null, $options);
$sentlist[] = $staff->getEmail();
}
-
-
}
return true;
@@ -1045,9 +1041,8 @@ class Ticket {
'references'=>$note->getEmailReferences());
foreach( $recipients as $k=>$staff) {
if(!is_object($staff) || !$staff->isAvailable() || in_array($staff->getEmail(), $sentlist)) continue;
- $alert = str_replace('%{recipient}', $staff->getFirstName(), $msg['body']);
- $email->sendAlert($staff->getEmail(), $msg['subj'], $alert,
- null, $options);
+ $alert = $this->replaceVars($msg, array('recipient' => $staff));
+ $email->sendAlert($staff->getEmail(), $alert['subj'], $alert['body'], null, $options);
$sentlist[] = $staff->getEmail();
}
}
@@ -1095,9 +1090,8 @@ class Ticket {
$sentlist=array();
foreach( $recipients as $k=>$staff) {
if(!is_object($staff) || !$staff->isAvailable() || in_array($staff->getEmail(), $sentlist)) continue;
- $alert = str_replace("%{recipient}", $staff->getFirstName(), $msg['body']);
- $email->sendAlert($staff->getEmail(), $msg['subj'], $alert,
- null);
+ $alert = $this->replaceVars($msg, array('recipient' => $staff));
+ $email->sendAlert($staff->getEmail(), $alert['subj'], $alert['body'], null);
$sentlist[] = $staff->getEmail();
}
@@ -1296,9 +1290,8 @@ class Ticket {
'references'=>$note->getEmailReferences());
foreach( $recipients as $k=>$staff) {
if(!is_object($staff) || !$staff->isAvailable() || in_array($staff->getEmail(), $sentlist)) continue;
- $alert = str_replace('%{recipient}', $staff->getFirstName(), $msg['body']);
- $email->sendAlert($staff->getEmail(), $msg['subj'], $alert,
- null, $options);
+ $alert = $this->replaceVars($msg, array('recipient' => $staff));
+ $email->sendAlert($staff->getEmail(), $alert['subj'], $alert['body'], null, $options);
$sentlist[] = $staff->getEmail();
}
}
@@ -1451,9 +1444,8 @@ class Ticket {
$sentlist=array(); //I know it sucks...but..it works.
foreach( $recipients as $k=>$staff) {
if(!$staff || !$staff->getEmail() || !$staff->isAvailable() || in_array($staff->getEmail(), $sentlist)) continue;
- $alert = str_replace('%{recipient}', $staff->getFirstName(), $msg['body']);
- $email->sendAlert($staff->getEmail(), $msg['subj'], $alert,
- $attachments, $options);
+ $alert = $this->replaceVars($msg, array('recipient' => $staff));
+ $email->sendAlert($staff->getEmail(), $alert['subj'], $alert['body'], $attachments, $options);
$sentlist[] = $staff->getEmail();
}
}
@@ -1520,7 +1512,7 @@ class Ticket {
if(!$vars['poster'] && $thisstaff)
- $vars['poster'] = $thisstaff->getName();
+ $vars['poster'] = $thisstaff;
if(!$vars['staffId'] && $thisstaff)
$vars['staffId'] = $thisstaff->getId();
@@ -1676,9 +1668,8 @@ class Ticket {
|| in_array($staff->getEmail(), $sentlist) //No duplicates.
|| $note->getStaffId() == $staff->getId()) //No need to alert the poster!
continue;
- $alert = str_replace('%{recipient}', $staff->getFirstName(), $msg['body']);
- $email->sendAlert($staff->getEmail(), $msg['subj'], $alert, $attachments,
- $options);
+ $alert = $this->replaceVars($msg, array('recipient' => $staff));
+ $email->sendAlert($staff->getEmail(), $alert['subj'], $alert['body'], $attachments, $options);
$sentlist[] = $staff->getEmail();
}
}
diff --git a/include/class.user.php b/include/class.user.php
index 215117bff..95bcaa86b 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -329,6 +329,10 @@ class PersonsName {
return $this->name;
}
+ function getName() {
+ return $this;
+ }
+
function asVar() {
return $this->__toString();
}
--
GitLab