Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NFC] Extract function to get component permissions #12994

Merged
merged 1 commit into from
Oct 24, 2018
Merged

[NFC] Extract function to get component permissions #12994

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 54 additions & 44 deletions CRM/Activity/BAO/Activity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2715,50 +2715,8 @@ public static function checkPermission($activityId, $action) {
return self::isContactPermittedAccessToCaseActivity($activityId, $action, $activity->activity_type_id);
}

$allow = FALSE;
// Component related permissions.
$compPermissions = array(
'CiviCase' => array(
'administer CiviCase',
'access my cases and activities',
'access all cases and activities',
),
'CiviMail' => array('access CiviMail'),
'CiviEvent' => array('access CiviEvent'),
'CiviGrant' => array('access CiviGrant'),
'CiviPledge' => array('access CiviPledge'),
'CiviMember' => array('access CiviMember'),
'CiviReport' => array('access CiviReport'),
'CiviContribute' => array('access CiviContribute'),
'CiviCampaign' => array('administer CiviCampaign'),
);

// First check the component permission.
$sql = "
SELECT component_id
FROM civicrm_option_value val
INNER JOIN civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.name = %1 )
WHERE val.value = %2";
$params = array(
1 => array('activity_type', 'String'),
2 => array($activity->activity_type_id, 'Integer'),
);
$componentId = CRM_Core_DAO::singleValueQuery($sql, $params);

if ($componentId) {
$componentName = CRM_Core_Component::getComponentName($componentId);
$compPermission = CRM_Utils_Array::value($componentName, $compPermissions);

// Here we are interesting in any single permission.
if (is_array($compPermission)) {
foreach ($compPermission as $per) {
if (CRM_Core_Permission::check($per)) {
$allow = TRUE;
break;
}
}
}
}
$allow = self::hasPermissionForActivityType($activity->activity_type_id);

// Check for this permission related to contact.
$permission = CRM_Core_Permission::VIEW;
Expand All @@ -2772,7 +2730,7 @@ public static function checkPermission($activityId, $action) {
$targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);

// Check for source contact.
if (!$componentId || $allow) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eileenmcnaughton this seems to be a bit odd given that what if there is no component id?

Copy link
Contributor Author

@eileenmcnaughton eileenmcnaughton Oct 24, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seamuslee001 yeah I remove componentId there because I return TRUE when componentId if NULL from the hasPermission function. $allow is reset 2 lines after that point so the change doesn't carry on past there

if ($allow) {
$sourceContactId = self::getActivityContact($activity->id, $sourceID);
// Account for possibility of activity not having a source contact (as it may have been deleted).
$allow = $sourceContactId ? CRM_Contact_BAO_Contact_Permission::allow($sourceContactId, $permission) : TRUE;
Expand Down Expand Up @@ -2848,6 +2806,58 @@ protected static function isContactPermittedAccessToCaseActivity($activityId, $a
return $allow;
}

/**
* @param int $activityTypeID
* @return bool
*/
protected static function hasPermissionForActivityType($activityTypeID) {
$compPermissions = [
'CiviCase' => [
'administer CiviCase',
'access my cases and activities',
'access all cases and activities',
],
'CiviMail' => ['access CiviMail'],
'CiviEvent' => ['access CiviEvent'],
'CiviGrant' => ['access CiviGrant'],
'CiviPledge' => ['access CiviPledge'],
'CiviMember' => ['access CiviMember'],
'CiviReport' => ['access CiviReport'],
'CiviContribute' => ['access CiviContribute'],
'CiviCampaign' => ['administer CiviCampaign'],
];

// First check the component permission.
$sql = "
SELECT component_id
FROM civicrm_option_value val
INNER JOIN civicrm_option_group grp ON ( grp.id = val.option_group_id AND grp.name = %1 )
WHERE val.value = %2";
$params = [
1 => ['activity_type', 'String'],
2 => [$activityTypeID, 'Integer'],
];
$componentId = CRM_Core_DAO::singleValueQuery($sql, $params);

if ($componentId) {
$componentName = CRM_Core_Component::getComponentName($componentId);
$compPermission = CRM_Utils_Array::value($componentName, $compPermissions);

// Here we are interesting in any single permission.
if (is_array($compPermission)) {
foreach ($compPermission as $per) {
if (CRM_Core_Permission::check($per)) {
return TRUE;
}
}
}
}
else {
return TRUE;
}
return FALSE;
}

/**
* Checks if user has permissions to edit inbound e-mails, either bsic info
* or both basic information and content.
Expand Down