tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-09-28 20:29:23 +02:00
Code Issues Projects Releases Wiki Activity

API CHANGE Removed $permissionCodes parameter from Subsite->getSubsitesForMember() - was never used, and defaulted to ADMIN, which makes any permission control harder than it needs to be. The permission codes should be handled transparently by the Subsite class, not injected into calls as additional check.

Browse Source 
MINOR Cleaned up Subsite->changeSubsite()
MINOR Reformatted queries in Subsite class
This commit is contained in:
Ingo Schommer 2008-11-24 06:35:51 +00:00
parent c058679097
commit d175e494a5
1 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
code/Subsite.php
View File

@ -255,29 +255,16 @@ JS;
} }
/** /**
* Switch to another subsite * Switch to another subsite.
* @param $subsite Either the ID of the subsite, or the subsite object itself *
* @param int|Subsite $subsite Either the ID of the subsite, or the subsite object itself
*/ */
static function changeSubsite($subsite) { static function changeSubsite($subsite) {
if(is_object($subsite)) $subsiteID = $subsite->ID;
elseif(is_numeric($subsite)) $subsiteID = $subsite;
else user_error('Subsite::changeSubsite(): Wrong format', E_USER_ERROR);
// Debug::backtrace(); Session::set('SubsiteID', $subsiteID);
if(!$subsite) {
Session::set('SubsiteID', 0);
return;
}
if(is_object($subsite))
$subsite = $subsite->ID;
Session::set('SubsiteID', $subsite);
/*if(!is_object($subsite) && is_numeric($subsite))
$subsite = DataObject::get_by_id('Subsite', $subsite);
if($subsite)
Session::set('SubsiteID', $subsite->ID);*/
} }
/** /**
@ -329,35 +316,39 @@ JS;
$SQL_permissionCodes = join("','", $SQL_permissionCodes); $SQL_permissionCodes = join("','", $SQL_permissionCodes);
$join = <<<SQL return DataObject::get(
LEFT JOIN `Group_Members` ON `Member`.`ID` = `Group_Members`.`MemberID` 'Member',
LEFT JOIN `Group` ON `Group`.`ID` = `Group_Members`.`GroupID` "`Group`.`SubsiteID` = $this->ID AND `Permission`.`Code` IN ('$SQL_permissionCodes')",
LEFT JOIN `Permission` ON `Permission`.`GroupID` = `Group`.`ID` '',
SQL; "LEFT JOIN `Group_Members` ON `Member`.`ID` = `Group_Members`.`MemberID`
return DataObject::get('Member', "`Group`.`SubsiteID` = $this->ID AND `Permission`.`Code` IN ('$SQL_permissionCodes')", '', $join); LEFT JOIN `Group` ON `Group`.`ID` = `Group_Members`.`GroupID`
LEFT JOIN `Permission` ON `Permission`.`GroupID` = `Group`.`ID`"
);
} }
static function getSubsitesForMember( $member = null, $permissionCodes = array('ADMIN')) { /**
if(!is_array($permissionCodes)) * Get all subsites.
user_error('Permissions must be passed to Subsite::getSubsitesForMember as an array', E_USER_ERROR); *
* @return DataObjectSet Subsite instances
*/
static function getSubsitesForMember( $member = null) {
if(!$member) $member = Member::currentMember();
if(!$member) if(self::hasMainSitePermission($member)) {
$member = Member::currentMember();
$memberID = (int)$member->ID;
$SQLa_permissionCodes = Convert::raw2sql($permissionCodes);
$SQLa_permissionCodes = join("','", $SQLa_permissionCodes);
if(self::hasMainSitePermission($member, $permissionCodes))
return DataObject::get('Subsite'); return DataObject::get('Subsite');
else } else {
return DataObject::get('Subsite', "`MemberID` = {$memberID}" . ($permissionCodes ? " AND `Permission`.`Code` IN ('$SQLa_permissionCodes')" : ''), '', "LEFT JOIN `Group` ON `Subsite`.`ID` = `SubsiteID` LEFT JOIN `Permission` ON `Group`.`ID` = `Permission`.`GroupID` LEFT JOIN `Group_Members` ON `Group`.`ID` = `Group_Members`.`GroupID`"); return DataObject::get(
'Subsite',
"`MemberID` = {$member->ID}",
'',
"LEFT JOIN `Group` ON `Subsite`.`ID` = `SubsiteID`
LEFT JOIN `Permission` ON `Group`.`ID` = `Permission`.`GroupID`
LEFT JOIN `Group_Members` ON `Group`.`ID` = `Group_Members`.`GroupID`"
);
}
} }
static function hasMainSitePermission($member = null, $permissionCodes = array('ADMIN')) { static function hasMainSitePermission($member = null, $permissionCodes = array('ADMIN')) {
if(!is_array($permissionCodes)) if(!is_array($permissionCodes))
user_error('Permissions must be passed to Subsite::hasMainSitePermission as an array', E_USER_ERROR); user_error('Permissions must be passed to Subsite::hasMainSitePermission as an array', E_USER_ERROR);
@ -369,11 +360,15 @@ SQL;
$SQL_perms = join("','", $SQLa_perm); $SQL_perms = join("','", $SQLa_perm);
$memberID = (int)$member->ID; $memberID = (int)$member->ID;
return DB::query("SELECT COUNT(`Permission`.`ID`) FROM `Permission` DB::query("
SELECT COUNT(`Permission`.`ID`)
FROM `Permission`
INNER JOIN `Group` ON `Group`.`ID` = `Permission`.`GroupID` AND `Group`.`SubsiteID` = 0 INNER JOIN `Group` ON `Group`.`ID` = `Permission`.`GroupID` AND `Group`.`SubsiteID` = 0
INNER JOIN `Group_Members` USING(`GroupID`) INNER JOIN `Group_Members` USING(`GroupID`)
WHERE `Permission`.`Code` IN ('$SQL_perms') AND `MemberID` = {$memberID}")->value(); WHERE
} `Permission`.`Code` IN ('$SQL_perms')
AND `MemberID` = {$memberID}
")->value(); }
function createInitialRecords() { function createInitialRecords() {
@ -431,10 +426,16 @@ SQL;
if(!$member) return new DataObjectSet(); if(!$member) return new DataObjectSet();
$subsites = DataObject::get('Subsite', $subsites = DataObject::get(
"`Group_Members`.`MemberID` = $member->ID AND `Permission`.`Code` IN ($SQL_codes, 'ADMIN') AND Subdomain IS NOT NULL AND `Subsite`.Title != ''", '', 'Subsite',
"LEFT JOIN `Group` ON (`SubsiteID`=`Subsite`.`ID` OR `SubsiteID` = 0) LEFT JOIN `Group_Members` ON `Group_Members`.`GroupID`=`Group`.`ID` "`Group_Members`.`MemberID` = $member->ID
LEFT JOIN `Permission` ON `Group`.`ID`=`Permission`.`GroupID`"); AND `Permission`.`Code` IN ($SQL_codes, 'ADMIN')
AND Subdomain IS NOT NULL AND `Subsite`.Title != ''",
'',
"LEFT JOIN `Group` ON (`SubsiteID`=`Subsite`.`ID` OR `SubsiteID` = 0)
LEFT JOIN `Group_Members` ON `Group_Members`.`GroupID`=`Group`.`ID`
LEFT JOIN `Permission` ON `Group`.`ID`=`Permission`.`GroupID`"
);
return $subsites; return $subsites;
} }