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

mlanthaler: Refactored the created code since the coding conventions for static methods were changed (ticket #49).

Browse Source 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42019 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-16 01:48:38 +00:00
parent 83c60460cf
commit 8d89050618
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/control/ContentController.php
View File

@ -173,7 +173,7 @@ class ContentController extends Controller {
* all available log-in forms (also OpenID...) * all available log-in forms (also OpenID...)
*/ */
public function LoginForm() { public function LoginForm() {
return MemberAuthenticator::getLoginForm($this); return MemberAuthenticator::get_login_form($this);
} }
public function SilverStripeNavigator() { public function SilverStripeNavigator() {
@ -312,6 +312,8 @@ HTML;
} }
/** /**
* This action is called by the installation system * This action is called by the installation system
*/ */
@ -356,7 +358,7 @@ HTML
$tempcontent = ''; $tempcontent = '';
$username = Session::get('username'); $username = Session::get('username');
$password = Session::get('password'); $password = Session::get('password');
$installfiles = array( $installfiles = array(
'index.php', 'index.php',
'install.php', 'install.php',
@ -366,17 +368,17 @@ HTML
'config-form.html', 'config-form.html',
'index.html' 'index.html'
); );
foreach($installfiles as $installfile) { foreach($installfiles as $installfile) {
if(file_exists('../' . $installfile)) { if(file_exists('../' . $installfile)) {
unlink('../' . $installfile); unlink('../' . $installfile);
} }
if(file_exists('../' . $installfile)) { if(file_exists('../' . $installfile)) {
$unsuccessful[] = $installfile; $unsuccessful[] = $installfile;
} }
} }
if(isset($unsuccessful)) { if(isset($unsuccessful)) {
$title->setValue("Unable to delete installation files"); $title->setValue("Unable to delete installation files");
$tempcontent = "<p style=\"margin: 1em 0\">Unable to delete installation files. Please delete the files below manually:</p><ul>"; $tempcontent = "<p style=\"margin: 1em 0\">Unable to delete installation files. Please delete the files below manually:</p><ul>";