tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-03 14:48:38 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT roll batch permissions in to a generic function (from r97748) (from r98219)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102627 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-13 02:29:03 +00:00
parent 9fdc7cb2ff
commit 031835a361
1 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
core/model/SiteTree.php
View File

@ -186,7 +186,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
/** /**
* Cache for canView/Edit/Publish/Delete permissions * Cache for canView/Edit/Publish/Delete permissions
*/ */
private static $cache_permissions = array(); public static $cache_permissions = array();
/** /**
* Returns TRUE if nested URLs (e.g. page/sub-page/) are currently enabled on this site. * Returns TRUE if nested URLs (e.g. page/sub-page/) are currently enabled on this site.
@ -899,8 +899,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if($this->ID) { if($this->ID) {
// Check cache (the can_edit_multiple call below will also do this, but this is quicker) // Check cache (the can_edit_multiple call below will also do this, but this is quicker)
if(isset(self::$cache_permissions['edit'][$this->ID])) { if(isset(self::$cache_permissions['CanEditType'][$this->ID])) {
return self::$cache_permissions['edit'][$this->ID]; return self::$cache_permissions['CanEditType'][$this->ID];
} }
// Regular canEdit logic is handled by can_edit_multiple // Regular canEdit logic is handled by can_edit_multiple
@ -990,15 +990,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} }
} }
/** static function batch_permission_check($ids, $memberID, $typeField, $groupJoinTable, $siteConfigMethod, $globalPermission = 'CMS_ACCESS_CMSMain', $useCached = true) {
* Get the 'can edit' information for a number of SiteTree pages.
*
* @param An array of IDs of the SiteTree pages to look up.
* @param useCached Return values from the permission cache if they exist.
* @return A map where the IDs are keys and the values are booleans stating whether the given
* page can be edited.
*/
static function can_edit_multiple($ids, $memberID, $useCached = true) {
// Sanitise the IDs // Sanitise the IDs
$ids = array_filter($ids, 'is_numeric'); $ids = array_filter($ids, 'is_numeric');
@ -1007,20 +999,20 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if($ids) { if($ids) {
// Look in the cache for values // Look in the cache for values
if($useCached && isset(self::$cache_permissions['edit'])) { if($useCached && isset(self::$cache_permissions[$typeField])) {
$cachedValues = array_intersect_key(self::$cache_permissions['edit'], $result); $cachedValues = array_intersect_key(self::$cache_permissions[$typeField], $result);
// If we can't find everything in the cache, then look up the remainder separately // If we can't find everything in the cache, then look up the remainder separately
$uncachedValues = array_diff_key($result, self::$cache_permissions['edit']); $uncachedValues = array_diff_key($result, self::$cache_permissions[$typeField]);
if($uncachedValues) { if($uncachedValues) {
$cachedValues = self::can_edit_multiple(array_keys($uncachedValues), $memberID, false) $cachedValues = self::batch_permission_check(array_keys($uncachedValues), $memberID, $typeField, $groupJoinTable, $siteConfigMethod, $globalPermission, false) + $cachedValues;
+ $cachedValues; // $cachedValues = self::can_edit_multiple(array_keys($uncachedValues), $memberID, false) + $cachedValues;
} }
return $cachedValues; return $cachedValues;
} }
// If a member doesn't have CMS_ACCESS_CMSMain permission then they can't edit anything // If a member doesn't have CMS_ACCESS_CMSMain permission then they can't edit anything
if(!$memberID || !Permission::checkMember($memberID, 'CMS_ACCESS_CMSMain')) { if(!$memberID || ($globalPermission && !Permission::checkMember($memberID, $globalPermission))) {
return $result; return $result;
} }
@ -1044,13 +1036,13 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
WHERE \"ID\" IN (".implode(", ", $ids).")")->column(), false); WHERE \"ID\" IN (".implode(", ", $ids).")")->column(), false);
// Get the uninherited permissions // Get the uninherited permissions
$uninheritedPermissions = Versioned::get_by_stage("SiteTree", $stage, "(\"CanEditType\" = 'LoggedInUsers' OR $uninheritedPermissions = Versioned::get_by_stage("SiteTree", $stage, "(\"$typeField\" = 'LoggedInUsers' OR
(\"CanEditType\" = 'OnlyTheseUsers' AND \"SiteTree_EditorGroups\".\"SiteTreeID\" IS NOT NULL)) (\"$typeField\" = 'OnlyTheseUsers' AND \"$groupJoinTable\".\"SiteTreeID\" IS NOT NULL))
AND \"SiteTree\".\"ID\" IN ($SQL_idList)", AND \"SiteTree\".\"ID\" IN ($SQL_idList)",
"", "",
"LEFT JOIN \"SiteTree_EditorGroups\" "LEFT JOIN \"$groupJoinTable\"
ON \"SiteTree_EditorGroups\".\"SiteTreeID\" = \"SiteTree\".\"ID\" ON \"$groupJoinTable\".\"SiteTreeID\" = \"SiteTree\".\"ID\"
AND \"SiteTree_EditorGroups\".\"GroupID\" IN ($SQL_groupList)"); AND \"$groupJoinTable\".\"GroupID\" IN ($SQL_groupList)");
if($uninheritedPermissions) { if($uninheritedPermissions) {
// Set all the relevant items in $result to true // Set all the relevant items in $result to true
@ -1058,20 +1050,21 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} }
// Get permissions that are inherited // Get permissions that are inherited
$potentiallyInherited = Versioned::get_by_stage("SiteTree", $stage, "\"CanEditType\" = 'Inherit' $potentiallyInherited = Versioned::get_by_stage("SiteTree", $stage, "\"$typeField\" = 'Inherit'
AND \"SiteTree\".\"ID\" IN ($SQL_idList)"); AND \"SiteTree\".\"ID\" IN ($SQL_idList)");
if($potentiallyInherited) { if($potentiallyInherited) {
// Group $potentiallyInherited by ParentID; we'll look at the permission of all those // Group $potentiallyInherited by ParentID; we'll look at the permission of all those
// parents and then see which ones the user has permission on // parents and then see which ones the user has permission on
$canEditSiteConfig = SiteConfig::current_site_config()->canEdit($memberID); $siteConfigPermission = SiteConfig::current_site_config()->{$siteConfigMethod}($memberID);
foreach($potentiallyInherited as $item) { foreach($potentiallyInherited as $item) {
if (!isset($groupedByParent[$item->ParentID])) $groupedByParent[$item->ParentID] = array(); if (!isset($groupedByParent[$item->ParentID])) $groupedByParent[$item->ParentID] = array();
if ($item->ParentID) $groupedByParent[$item->ParentID][] = $item->ID; if ($item->ParentID) $groupedByParent[$item->ParentID][] = $item->ID;
else $result[$item->ID] = $canEditSiteConfig; else $result[$item->ID] = $siteConfigPermission;
} }
$actuallyInherited = self::can_edit_multiple(array_keys($groupedByParent), $memberID); $actuallyInherited = self::can_edit_multiple(array_keys($groupedByParent), $memberID);
$actuallyInherited = self::batch_permission_check(array_keys($groupedByParent), $memberID, $typeField, $groupJoinTable, $siteConfigMethod);
if($actuallyInherited) { if($actuallyInherited) {
$parentIDs = array_keys(array_filter($actuallyInherited)); $parentIDs = array_keys(array_filter($actuallyInherited));
foreach($parentIDs as $parentID) { foreach($parentIDs as $parentID) {
@ -1087,26 +1080,18 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} }
return isset($combinedStageResult) ? $combinedStageResult : array(); return isset($combinedStageResult) ? $combinedStageResult : array();
}
/*
// check for empty spec /**
if(!$this->CanEditType || $this->CanEditType == 'Anyone') return true; * Get the 'can edit' information for a number of SiteTree pages.
*
// check for inherit * @param An array of IDs of the SiteTree pages to look up.
if($this->CanEditType == 'Inherit') { * @param useCached Return values from the permission cache if they exist.
if($this->ParentID) return $this->Parent()->canEdit($member); * @return A map where the IDs are keys and the values are booleans stating whether the given
else return ($member && Permission::checkMember($member, 'CMS_ACCESS_CMSMain')); * page can be edited.
} */
static function can_edit_multiple($ids, $memberID, $useCached = true) {
// check for any logged-in users return self::batch_permission_check($ids, $memberID, 'CanEditType', 'SiteTree_EditorGroups', 'canEdit', 'CMS_ACCESS_CMSMain', $useCached);
if($this->CanEditType == 'LoggedInUsers' && ) return true;
// check for specific groups
if($this->CanEditType == 'OnlyTheseUsers' && $member && $member->inGroups($this->EditorGroups())) return true;
return false;
*/
} }
/** /**