tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Removed Group_Unsecure which was never used

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64369 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2008-10-16 05:43:57 +00:00
parent 344d6e173c
commit 050321cb3c
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/model/DataObject.php
View File

@ -1794,8 +1794,6 @@ class DataObject extends ViewableData implements DataObjectInterface {
if(!isset($permissionCache[$memberID][$perm])) { if(!isset($permissionCache[$memberID][$perm])) {
if($member->ID) { if($member->ID) {
$groups = $member->Groups(); $groups = $member->Groups();
} else {
$groups = DataObject::get("Group_Unsecure", "");
} }
$groupList = implode(', ', $groups->column("ID")); $groupList = implode(', ', $groups->column("ID"));

7
security/Group.php
View File

@ -298,11 +298,4 @@ class Group extends DataObject {
} }
} }
/**
* A group representing everyone, including users not logged in.
* @package sapphire
* @subpackage security
*/
class Group_Unsecure extends Group {
}
?> ?>

18
security/Member.php
View File

@ -635,18 +635,13 @@ class Member extends DataObject {
*/ */
public function Groups() { public function Groups() {
$groups = $this->getManyManyComponents("Groups"); $groups = $this->getManyManyComponents("Groups");
$unsecure = DataObject::get("Group_Unsecure");
if($unsecure) {
foreach($unsecure as $unsecureItem) {
$groups->push($unsecureItem);
}
}
$groupIDs = $groups->column(); $groupIDs = $groups->column();
$collatedGroups = array(); $collatedGroups = array();
foreach($groups as $group) {
$collatedGroups = array_merge((array)$collatedGroups, $group->collateAncestorIDs()); if($groups) {
foreach($groups as $group) {
$collatedGroups = array_merge((array)$collatedGroups, $group->collateAncestorIDs());
}
} }
$table = "Group_Members"; $table = "Group_Members";
@ -666,8 +661,7 @@ class Member extends DataObject {
$result = new Member_GroupSet(); $result = new Member_GroupSet();
} }
$result->setComponentInfo("many-to-many", $this, "Member", $table, $result->setComponentInfo("many-to-many", $this, "Member", $table, "Group");
"Group");
return $result; return $result;
} }