From e18bbfed01e236aa28bd02efdea7993ac3c278c1 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Tue, 4 Dec 2012 13:55:25 -0500
Subject: [PATCH] Use bulk/auto_reply wrappers
---
include/class.osticket.php | 2 +-
include/class.ticket.php | 25 ++++++++++++-------------
include/class.upgrader.php | 2 +-
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/include/class.osticket.php b/include/class.osticket.php
index 80d6216b1..df0766f3d 100644
--- a/include/class.osticket.php
+++ b/include/class.osticket.php
@@ -242,7 +242,7 @@ class osTicket {
$email=$this->getConfig()->getDefaultEmail(); //will take the default email.
if($email) {
- $email->send($to, $subject, $message, null, array('bulk' => true));
+ $email->sendAlert($to, $subject, $message);
} else {//no luck - try the system mail.
Email::sendmail($to, $subject, $message, sprintf('"osTicket Alerts"<%s>',$to));
}
diff --git a/include/class.ticket.php b/include/class.ticket.php
index d77291f0f..5a3fd83f3 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -867,8 +867,7 @@ class Ticket {
if($cfg->stripQuotedReply() && ($tag=$cfg->getReplySeparator()))
$msg['body'] ="\n$tag\n\n".$msg['body'];
- //TODO: add auto flags....be nice to mail servers and sysadmins!!
- $email->send($this->getEmail(), $msg['subj'], $msg['body'], null, array('autoreply' => true));
+ $email->sendAutoReply($this->getEmail(), $msg['subj'], $msg['body']);
}
if(!($email=$cfg->getAlertEmail()))
@@ -885,7 +884,7 @@ class Ticket {
//Alert admin??
if($cfg->alertAdminONNewTicket()) {
$alert = str_replace('%{recipient}', 'Admin', $msg['body']);
- $email->send($cfg->getAdminEmail(), $msg['subj'], $alert, null, array('bulk' => true));
+ $email->sendAlert($cfg->getAdminEmail(), $msg['subj'], $alert);
$sentlist[]=$cfg->getAdminEmail();
}
@@ -901,7 +900,7 @@ 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->send($staff->getEmail(), $msg['subj'], $alert, null, array('bulk' => true));
+ $email->sendAlert($staff->getEmail(), $msg['subj'], $alert);
$sentlist[] = $staff->getEmail();
}
@@ -934,7 +933,7 @@ class Ticket {
$msg = $this->replaceVars($msg,
array('signature' => ($dept && $dept->isPublic())?$dept->getSignature():''));
- $email->send($this->getEmail(), $msg['subj'], $msg['body'], null, array('bulk' => true));
+ $email->sendAutoReply($this->getEmail(), $msg['subj'], $msg['body']);
}
$client= $this->getClient();
@@ -997,7 +996,7 @@ class Ticket {
if($cfg->stripQuotedReply() && ($tag=$cfg->getReplySeparator()))
$msg['body'] ="\n$tag\n\n".$msg['body'];
- $email->send($this->getEmail(), $msg['subj'], $msg['body'], null, array('autoreply'=>true));
+ $email->sendAutoReply($this->getEmail(), $msg['subj'], $msg['body']);
}
}
@@ -1056,7 +1055,7 @@ 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->send($staff->getEmail(), $msg['subj'], $alert, null, array('autoreply' => true));
+ $email->sendAlert($staff->getEmail(), $msg['subj'], $alert);
$sentlist[] = $staff->getEmail();
}
}
@@ -1109,7 +1108,7 @@ 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->send($staff->getEmail(), $msg['subj'], $alert, null, array('bulk' => true));
+ $email->sendAlert($staff->getEmail(), $msg['subj'], $alert);
$sentlist[] = $staff->getEmail();
}
@@ -1294,7 +1293,7 @@ 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->send($staff->getEmail(), $msg['subj'], $alert, null, array('bulk' => true));
+ $email->sendAlert($staff->getEmail(), $msg['subj'], $alert);
$sentlist[] = $staff->getEmail();
}
}
@@ -1453,7 +1452,7 @@ class Ticket {
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->send($staff->getEmail(), $msg['subj'], $alert, null, array('bulk' => true));
+ $email->sendAlert($staff->getEmail(), $msg['subj'], $alert);
$sentlist[] = $staff->getEmail();
}
}
@@ -1503,7 +1502,7 @@ class Ticket {
$msg['body'] ="\n$tag\n\n".$msg['body'];
$attachments =($cfg->emailAttachments() && $files)?$this->getAttachments($respId, 'R'):array();
- $email->send($this->getEmail(), $msg['subj'], $msg['body'], $attachments, array('autoreply' => true));
+ $email->sendAutoReply($this->getEmail(), $msg['subj'], $msg['body'], $attachments);
}
return $respId;
@@ -1717,7 +1716,7 @@ class Ticket {
if(!$staff || !is_object($staff) || !$staff->getEmail() || !$staff->isAvailable()) continue;
if(in_array($staff->getEmail(),$sentlist) || ($staffId && $staffId==$staff->getId())) continue;
$alert = str_replace('%{recipient}',$staff->getFirstName(), $msg['body']);
- $email->send($staff->getEmail(), $msg['subj'], $alert, $attachments, array('bulk' => true));
+ $email->sendAlert($staff->getEmail(), $msg['subj'], $alert, $attachments);
$sentlist[] = $staff->getEmail();
}
}
@@ -2312,7 +2311,7 @@ class Ticket {
$msg['body'] ="\n$tag\n\n".$msg['body'];
$attachments =($cfg->emailAttachments() && $respId)?$ticket->getAttachments($respId,'R'):array();
- $email->send($ticket->getEmail(), $msg['subj'], $msg['body'], $attachments, array('bulk' => true));
+ $email->send($ticket->getEmail(), $msg['subj'], $msg['body'], $attachments);
}
return $ticket;
diff --git a/include/class.upgrader.php b/include/class.upgrader.php
index 265ae7c9a..e437fcad7 100644
--- a/include/class.upgrader.php
+++ b/include/class.upgrader.php
@@ -67,7 +67,7 @@ class Upgrader extends SetupWizard {
$subject = 'Upgrader Error';
if($email) {
- $email->send($thisstaff->getEmail(), $subject, $error, null, array('bulk' => true));
+ $email->sendAlert($thisstaff->getEmail(), $subject, $error);
} else {//no luck - try the system mail.
Mailer::sendmail($thisstaff->getEmail(), $subject, $error, sprintf('"osTicket Alerts"<%s>', $thisstaff->getEmail()));
}
--
GitLab