Use shared function to check inbound email permissions

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index af4961d5ab5ee4115f7928d79e39f95b73c470d5..8aeadbde9a7928da3f1a7e3c0e5a262df5b603de 100644 (file)
--- 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 e03072dbdd175adf0321ad4882139e375a46d92e..6fef52aaff359b1ef55f3e9c4df1444164b8d7d8 100644 (file)
--- 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 091b4e9f046f74b26202acd3c39bd5fac2f95fc2..2c66cdd4c8296c19c1ed5c78afb8c4a5df1b96ed 100644 (file)
--- 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';
       }