tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-06-18 10:41:40 +02:00
Code Issues Projects Releases Wiki Activity

BUG LeftAndMainSubsites::Subsites() fails with limited CMS access

Browse Source 
Users with non-ADMIN permissions won't see the dropdown of available
subsites, because LeftAndMainSubsites::Subsites() will check if
the user has a non-existent code CMS_ACCESS_CMSPagesController.

Fallback to checking required_permission_codes first, and failing
that, check for CMS_ACCESS_LeftAndMain
This commit is contained in:
Sean Harvey 2013-05-08 14:27:56 +12:00
parent 69ace90bc1
commit f35a42ec64
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
code/extensions/LeftAndMainSubsites.php
View File

@ -48,23 +48,35 @@ class LeftAndMainSubsites extends Extension {
} }
public function Subsites() { public function Subsites() {
$accessPerm = 'CMS_ACCESS_'. $this->owner->class; // figure out what permission the controller needs
// Subsite::accessible_sites() expects something, so if there's no permission
// then fallback to using CMS_ACCESS_LeftAndMain.
$permission = 'CMS_ACCESS_' . $this->owner->class;
$available = Permission::get_codes(false);
if(!isset($available[$permission])) {
$permission = $this->owner->stat('required_permission_codes');
if(!$permission) {
$permission = 'CMS_ACCESS_LeftAndMain';
}
}
switch($this->owner->class) { switch($this->owner->class) {
case "AssetAdmin": case "AssetAdmin":
$subsites = Subsite::accessible_sites($accessPerm, true, "Shared files & images"); $subsites = Subsite::accessible_sites($permission, true, "Shared files & images");
break; break;
case "SecurityAdmin": case "SecurityAdmin":
$subsites = Subsite::accessible_sites($accessPerm, true, "Groups accessing all sites"); $subsites = Subsite::accessible_sites($permission, true, "Groups accessing all sites");
if($subsites->find('ID',0)) { if($subsites->find('ID',0)) {
$subsites->push(new ArrayData(array('Title' => 'All groups', 'ID' => -1))); $subsites->push(new ArrayData(array('Title' => 'All groups', 'ID' => -1)));
} }
break; break;
case "CMSMain": case "CMSMain":
case "CMSPagesController":
// If there's a default site then main site has no meaning // If there's a default site then main site has no meaning
$showMainSite = !DataObject::get_one('Subsite',"\"DefaultSite\"=1"); $showMainSite = !DataObject::get_one('Subsite',"\"DefaultSite\"=1");
$subsites = Subsite::accessible_sites($accessPerm, $showMainSite); $subsites = Subsite::accessible_sites($permission, $showMainSite);
break; break;
case "SubsiteAdmin": case "SubsiteAdmin":
@ -72,7 +84,7 @@ class LeftAndMainSubsites extends Extension {
break; break;
default: default:
$subsites = Subsite::accessible_sites($accessPerm); $subsites = Subsite::accessible_sites($permission);
break; break;
} }
@ -81,9 +93,8 @@ class LeftAndMainSubsites extends Extension {
public function SubsiteList() { public function SubsiteList() {
$list = $this->Subsites(); $list = $this->Subsites();
$currentSubsiteID = Subsite::currentSubsiteID(); $currentSubsiteID = Subsite::currentSubsiteID();
if($list->Count() > 1) { if($list->Count() > 1) {
$output = '<div class="field dropdown">'; $output = '<div class="field dropdown">';
$output .= '<select id="SubsitesSelect">'; $output .= '<select id="SubsitesSelect">';
@ -98,7 +109,7 @@ class LeftAndMainSubsites extends Extension {
Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js'); Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js');
return $output; return $output;
} else if($list->Count() == 1) { } elseif($list->Count() == 1) {
if($list->First()->DefaultSite==false) { if($list->First()->DefaultSite==false) {
$output = '<div class="field dropdown">'; $output = '<div class="field dropdown">';
$output .= '<select id="SubsitesSelect">'; $output .= '<select id="SubsitesSelect">';
@ -107,15 +118,15 @@ class LeftAndMainSubsites extends Extension {
$selected = $subsite->ID == $currentSubsiteID ? ' selected="selected"' : ''; $selected = $subsite->ID == $currentSubsiteID ? ' selected="selected"' : '';
$output .= "\n<option value=\"{$subsite->ID}\"$selected>". Convert::raw2xml($subsite->Title) . "</option>"; $output .= "\n<option value=\"{$subsite->ID}\"$selected>". Convert::raw2xml($subsite->Title) . "</option>";
} }
$output .= '</select></div>'; $output .= '</select></div>';
Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js'); Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js');
return $output; return $output;
}else { } else {
return '<span>'.$list->First()->Title.'</span>'; return '<span>'.$list->First()->Title.'</span>';
} }
} }
} }