From 3010bc476a6b9d237fb13c6baffd958773eea1f2 Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Thu, 20 Jul 2017 10:27:00 -0500
Subject: [PATCH] oops: Fix Agent Identity Masking
This pull request addresses issues 2955 & 3524 where an Agent's name is
visible to User even when Agent Identity Masking is enabled. This adds a
check for `hide_staff_name` in the config table and if enabled the system
will show Staff on all thread responses and events.
---
include/class.thread.php | 24 +++++++++++--------
.../client/templates/thread-entry.tmpl.php | 5 +++-
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/include/class.thread.php b/include/class.thread.php
index 3911f714b..38d1990df 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -1613,15 +1613,16 @@ class ThreadEvent extends VerySimpleModel {
return $this->template(sprintf(
__('%s by {somebody} {timestamp}'),
$this->state
- ));
+ ), $mode);
}
- function template($description) {
+ function template($description, $mode=self::MODE_STAFF) {
global $thisstaff, $cfg;
$self = $this;
+ $hideName = $cfg->hideStaffName();
return preg_replace_callback('/\{(<(?P<type>([^>]+))>)?(?P<key>[^}.]+)(\.(?P<data>[^}]+))?\}/',
- function ($m) use ($self, $thisstaff, $cfg) {
+ function ($m) use ($self, $thisstaff, $cfg, $hideName, $mode) {
switch ($m['key']) {
case 'assignees':
$assignees = array();
@@ -1637,7 +1638,10 @@ class ThreadEvent extends VerySimpleModel {
}
return implode('/', $assignees);
case 'somebody':
- $name = $self->getUserName();
+ if ($hideName && $self->agent && $mode == self::MODE_CLIENT)
+ $name = __('Staff');
+ else
+ $name = $self->getUserName();
if ($cfg->isAvatarsEnabled()
&& ($avatar = $self->getAvatar()))
$name = $avatar.$name;
@@ -1850,9 +1854,9 @@ class CloseEvent extends ThreadEvent {
function getDescription($mode=self::MODE_STAFF) {
if ($this->getData('status'))
- return $this->template(__('Closed by <b>{somebody}</b> with status of {<TicketStatus>data.status} {timestamp}'));
+ return $this->template(__('Closed by <b>{somebody}</b> with status of {<TicketStatus>data.status} {timestamp}'), $mode);
else
- return $this->template(__('Closed by <b>{somebody}</b> {timestamp}'));
+ return $this->template(__('Closed by <b>{somebody}</b> {timestamp}'), $mode);
}
}
@@ -1909,7 +1913,7 @@ class CollaboratorEvent extends ThreadEvent {
: 'somebody';
break;
}
- return $this->template($desc);
+ return $this->template($desc, $mode);
}
}
@@ -1918,7 +1922,7 @@ class CreationEvent extends ThreadEvent {
static $state = 'created';
function getDescription($mode=self::MODE_STAFF) {
- return $this->template(__('Created by <b>{somebody}</b> {timestamp}'));
+ return $this->template(__('Created by <b>{somebody}</b> {timestamp}'), $mode);
}
}
@@ -2000,7 +2004,7 @@ class EditEvent extends ThreadEvent {
break;
}
- return $this->template($desc);
+ return $this->template($desc, $mode);
}
}
@@ -2018,7 +2022,7 @@ class ReopenEvent extends ThreadEvent {
static $state = 'reopened';
function getDescription($mode=self::MODE_STAFF) {
- return $this->template(__('Reopened by <b>{somebody}</b> {timestamp}'));
+ return $this->template(__('Reopened by <b>{somebody}</b> {timestamp}'), $mode);
}
}
diff --git a/include/client/templates/thread-entry.tmpl.php b/include/client/templates/thread-entry.tmpl.php
index c87edfa0b..cae371a77 100644
--- a/include/client/templates/thread-entry.tmpl.php
+++ b/include/client/templates/thread-entry.tmpl.php
@@ -2,7 +2,10 @@
global $cfg;
$entryTypes = array('M'=>'message', 'R'=>'response', 'N'=>'note');
$user = $entry->getUser() ?: $entry->getStaff();
-$name = $user ? $user->getName() : $entry->poster;
+if ($entry->staff && $cfg->hideStaffName())
+ $name = __('Staff');
+else
+ $name = $user ? $user->getName() : $entry->poster;
$avatar = '';
if ($cfg->isAvatarsEnabled() && $user)
$avatar = $user->getAvatar();
--
GitLab