MINOR removing old cruft, improving formatting

This commit is contained in:
Tom Rix 2010-03-30 21:02:44 +00:00
parent 92976e8eff
commit 2792c1780a

View File

@ -228,11 +228,8 @@ JS;
* @return int ID of the current subsite instance
*/
static function currentSubsiteID() {
if(isset($_REQUEST['SubsiteID'])) {
$id = (int)$_REQUEST['SubsiteID'];
} else {
$id = Session::get('SubsiteID');
}
if(isset($_REQUEST['SubsiteID'])) $id = (int)$_REQUEST['SubsiteID'];
else $id = Session::get('SubsiteID');
if($id === NULL) {
$id = self::getSubsiteIDForDomain();
@ -241,19 +238,7 @@ JS;
return (int)$id;
}
/**
* @todo Object::create() shoudln't be overloaded with different parameters.
*/
static function create($name) {
$newSubsite = Object::create('Subsite');
$newSubsite->Title = $name;
$newSubsite->Subdomain = str_replace(' ', '-', preg_replace('/[^0-9A-Za-z\s]/', '', strtolower(trim($name))));
$newSubsite->write();
$newSubsite->createInitialRecords();
return $newSubsite;
}
/**
* Switch to another subsite.
*
@ -273,9 +258,7 @@ JS;
}
// Only bother flushing caches if we've actually changed
if($subsiteID != self::currentSubsiteID()) {
Permission::flush_permission_cache();
}
if($subsiteID != self::currentSubsiteID()) Permission::flush_permission_cache();
}
/**
@ -370,13 +353,6 @@ JS;
}
/**
* Overload this function to generate initial records in your newly created subsite.
*/
function createInitialRecords() {
}
/**
* Duplicate this subsite
*/
@ -612,15 +588,6 @@ class Subsite_Template extends Subsite {
}
}
/**
* Copy groups from the template to the given subsites. Each of the groups will be created and left
* empty.
*/
$groups = $this->Groups();
if($groups) foreach($groups as $group) {
$group->duplicateToSubsite($intranet);
}
self::changeSubsite($oldSubsiteID);
return $intranet;