From 426fe3c792d9d73922a18cb035aada8fdfe25f35 Mon Sep 17 00:00:00 2001 From: "Matthew Wire (MJW Consulting)" Date: Mon, 22 Apr 2019 13:24:13 +0100 Subject: [PATCH] Use shared function to check inbound email permissions --- CRM/Activity/BAO/Activity.php | 2 +- CRM/Activity/Selector/Activity.php | 4 +--- CRM/Case/BAO/Case.php | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index af4961d5ab..8aeadbde9a 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -2414,7 +2414,7 @@ INNER JOIN civicrm_option_group grp ON (grp.id = option_group_id AND grp.name = } /** - * Checks if user has permissions to edit inbound e-mails, either bsic info + * Checks if user has permissions to edit inbound e-mails, either basic info * or both basic information and content. * * @return bool diff --git a/CRM/Activity/Selector/Activity.php b/CRM/Activity/Selector/Activity.php index e03072dbdd..6fef52aaff 100644 --- a/CRM/Activity/Selector/Activity.php +++ b/CRM/Activity/Selector/Activity.php @@ -181,9 +181,7 @@ class CRM_Activity_Selector_Activity extends CRM_Core_Selector_Base implements C $url = 'civicrm/contact/view/activity'; $qsView = "atype={$activityTypeId}&action=view&reset=1&id=%%id%%&cid=%%cid%%&context=%%cxt%%{$extraParams}"; - if (CRM_Core_Permission::check('edit inbound email basic information') - || CRM_Core_Permission::check('edit inbound email basic information and content') - ) { + if (CRM_Activity_BAO_Activity::checkEditInboundEmailsPermissions()) { $showDelete = $showUpdate = TRUE; $qsUpdate = "atype={$activityTypeId}&action=update&reset=1&id=%%id%%&cid=%%cid%%&context=%%cxt%%{$extraParams}"; } diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 091b4e9f04..2c66cdd4c8 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -2750,9 +2750,7 @@ WHERE id IN (' . implode(',', $copiedActivityIds) . ')'; //allow edit operation. $allowEditNames = array('Open Case'); - if (CRM_Core_Permission::check('edit inbound email basic information') || - CRM_Core_Permission::check('edit inbound email basic information and content') - ) { + if (CRM_Activity_BAO_Activity::checkEditInboundEmailsPermissions()) { $allowEditNames[] = 'Inbound Email'; } -- 2.25.1