From 8d8905061857fcd98d1fd7d1b9b14496028351cd Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 16 Sep 2007 01:48:38 +0000 Subject: [PATCH] mlanthaler: Refactored the created code since the coding conventions for static methods were changed (ticket #49). (merged from branches/gsoc) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42019 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/ContentController.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/control/ContentController.php b/core/control/ContentController.php index 3bc37ad8b..62a4c7bfe 100644 --- a/core/control/ContentController.php +++ b/core/control/ContentController.php @@ -173,7 +173,7 @@ class ContentController extends Controller { * all available log-in forms (also OpenID...) */ public function LoginForm() { - return MemberAuthenticator::getLoginForm($this); + return MemberAuthenticator::get_login_form($this); } public function SilverStripeNavigator() { @@ -312,6 +312,8 @@ HTML; } + + /** * This action is called by the installation system */ @@ -356,7 +358,7 @@ HTML $tempcontent = ''; $username = Session::get('username'); $password = Session::get('password'); - + $installfiles = array( 'index.php', 'install.php', @@ -366,17 +368,17 @@ HTML 'config-form.html', 'index.html' ); - + foreach($installfiles as $installfile) { if(file_exists('../' . $installfile)) { unlink('../' . $installfile); } - + if(file_exists('../' . $installfile)) { $unsuccessful[] = $installfile; } } - + if(isset($unsuccessful)) { $title->setValue("Unable to delete installation files"); $tempcontent = "

Unable to delete installation files. Please delete the files below manually: