From 5dee2ffe6aace1373c230897c49574266b3a073a Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Tue, 14 Jan 2014 19:35:39 +0000
Subject: [PATCH] Refactor how source is added.
---
include/class.mailfetch.php | 2 +-
include/class.mailparse.php | 2 +-
include/class.ticket.php | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index d962e1e1f..9184ea8d1 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -295,7 +295,7 @@ class MailFetcher {
foreach($list as $addr) {
if(!($emailId=Email::getIdByEmail(strtolower($addr->mailbox).'@'.$addr->host))) {
$header['recipients'][] = array(
- 'source' => $source,
+ 'source' => "Email ($source)",
'name' => $this->mime_decode(@$addr->personal),
'email' => strtolower($addr->mailbox).'@'.$addr->host);
} elseif(!$header['emailId']) {
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 48cf98a59..fc865d4de 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -402,7 +402,7 @@ class EmailDataParser {
foreach($list as $addr) {
if(!($emailId=Email::getIdByEmail(strtolower($addr->mailbox).'@'.$addr->host))) {
$data['recipients'][] = array(
- 'source' => $source,
+ 'source' => "Email ($source)",
'name' => trim(@$addr->personal, '"'),
'email' => strtolower($addr->mailbox).'@'.$addr->host);
} elseif(!$data['emailId']) {
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 3ff537135..1a1a822cc 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1466,9 +1466,9 @@ class Ticket {
foreach ($vars['recipients'] as $recipient) {
if (($user=User::fromVars($recipient)))
if ($c=$this->addCollaborator($user, $info, $errors))
- $collabs[] = sprintf('%s %s',
+ $collabs[] = sprintf('%s%s',
(string) $c,
- $recipient['source'] ? " ({$recipient['source']}) " : ''
+ $recipient['source'] ? " via {$recipient['source']}" : ''
);
}
//TODO: Can collaborators add others?
--
GitLab