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

BUGFIX Allowing Security controller methods to work without Page or Page_Controller classes (now moved to 'cms' module)

Browse Source
This commit is contained in:
Ingo Schommer 2011-03-23 11:43:49 +13:00
parent d93025d668
commit e1b249d0d8
1 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
security/Security.php
View File

@ -83,6 +83,8 @@ class Security extends Controller {
*/
protected static $wordlist = './wordlist.txt';
static $template = 'BlankPage';
/**
* Template thats used to render the pages.
*
@ -339,6 +341,7 @@ class Security extends Controller {
Requirements::css($customCSS);
}
if(class_exists('SiteTree')) {
$tmpPage = new Page();
$tmpPage->Title = _t('Security.LOGIN', 'Log in');
$tmpPage->URLSegment = "Security";
@ -348,6 +351,10 @@ class Security extends Controller {
$controller = new Page_Controller($tmpPage);
$controller->init();
//Controller::$currentController = $controller;
} else {
$controller = $this;
}
$content = '';
$forms = $this->GetLoginForms();
@ -436,12 +443,16 @@ class Security extends Controller {
Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/scriptaculous/effects.js');
if(class_exists('SiteTree')) {
$tmpPage = new Page();
$tmpPage->Title = _t('Security.LOSTPASSWORDHEADER', 'Lost Password');
$tmpPage->URLSegment = 'Security';
$tmpPage->ID = -1; // Set the page ID to -1 so we dont get the top level pages as its children
$controller = new Page_Controller($tmpPage);
$controller->init();
} else {
$controller = $this;
}
$customisedController = $controller->customise(array(
'Content' =>
@ -495,12 +506,16 @@ class Security extends Controller {
Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js');
Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/scriptaculous/effects.js');
if(class_exists('SiteTree')) {
$tmpPage = new Page();
$tmpPage->Title = _t('Security.LOSTPASSWORDHEADER');
$tmpPage->URLSegment = 'Security';
$tmpPage->ID = -1; // Set the page ID to -1 so we dont get the top level pages as its children
$controller = new Page_Controller($tmpPage);
$controller->init();
} else {
$controller = $this;
}
$email = Convert::raw2xml($request->param('ID') . '.' . $request->getExtension());
@ -541,12 +556,16 @@ class Security extends Controller {
* @return string Returns the "change password" page as HTML code.
*/
public function changepassword() {
if(class_exists('SiteTree')) {
$tmpPage = new Page();
$tmpPage->Title = _t('Security.CHANGEPASSWORDHEADER', 'Change your password');
$tmpPage->URLSegment = 'Security';
$tmpPage->ID = -1; // Set the page ID to -1 so we dont get the top level pages as its children
$controller = new Page_Controller($tmpPage);
$controller->init();
} else {
$controller = $this;
}
// First load with hash: Redirect to same URL without hash to avoid referer leakage
if(isset($_REQUEST['h']) && Member::member_from_autologinhash($_REQUEST['h'])) {
@ -935,4 +954,3 @@ class Security extends Controller {
}
}
?>