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

MINOR Updating old URLs in installer, show message about creating admin

Browse Source 
account
This commit is contained in:
Sean Harvey 2012-04-15 16:01:06 +12:00
parent e71b8d6215
commit 515a2ccfcc
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev/install/config-form.html
View File

@ -28,12 +28,6 @@
<div id="Layout"> <div id="Layout">
<div class="typography"> <div class="typography">
<!--
<p>Thanks for choosing to use SilverStripe! Please follow the instructions below and you should be up in running in no time.<br>
If you get stuck, head over to the <a href="http://silverstripe.org/installing-silverstripe" target="_blank">installation forum</a>, or check out our list of <a href="http://doc.silverstripe.org/doku.php?id=suggested-web-hosts" target="_blank">suggested web hosts</a> known to work with SilverStripe.
</p>
-->
<form action="install.php" method="post"> <form action="install.php" method="post">
<?php if(isset($hasErrorOtherThanDatabase)) { ?> <?php if(isset($hasErrorOtherThanDatabase)) { ?>
<p class="message error"> <p class="message error">
@ -96,7 +90,7 @@
<strong>Other databases:</strong><br> <strong>Other databases:</strong><br>
Databases in the list that are greyed out cannot currently be used. Click on them for more information and possible remedies. Databases in the list that are greyed out cannot currently be used. Click on them for more information and possible remedies.
</p> </p>
<div class="fields"> <div class="fields">
<div class="field"> <div class="field">
<ul id="database_selection"> <ul id="database_selection">
<?php <?php
@ -184,7 +178,7 @@
<?php if($envFileExists) { ?> <?php if($envFileExists) { ?>
<div id="use_environment_field" class="field"> <div id="use_environment_field" class="field">
<input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>> <input id="use_environment" type="checkbox" name="useEnv" <?php if($usingEnv) echo "checked=\"checked\"" ?>>
<label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/doku.php?id=environment-management" target="_blank">?</a>)</label> <label for="use_environment">Use _ss_environment file for configuration (<a href="http://doc.silverstripe.org/sapphire/en/topics/environment-management" target="_blank">?</a>)</label>
</div> </div>
<?php } ?> <?php } ?>

6
dev/install/install.php5
View File

@ -392,9 +392,7 @@ class InstallRequirements {
// Check for Standard PHP Library (SPL) support // Check for Standard PHP Library (SPL) support
$this->requireFunction('spl_classes', array('PHP Configuration', 'SPL support', 'Standard PHP Library (SPL) not included in PHP.')); $this->requireFunction('spl_classes', array('PHP Configuration', 'SPL support', 'Standard PHP Library (SPL) not included in PHP.'));
if(version_compare(PHP_VERSION, '5.3.0', '>=')) { $this->requireDateTimezone(array('PHP Configuration', 'date.timezone set and valid', 'date.timezone option in php.ini must be set correctly.', ini_get('date.timezone')));
$this->requireDateTimezone(array('PHP Configuration', 'date.timezone set and valid', 'date.timezone option in php.ini must be set in PHP 5.3.0+', ini_get('date.timezone')));
}
$this->suggestPHPSetting('asp_tags', array(false,0,''), array('PHP Configuration', 'asp_tags option turned off', 'This should be turned off as it can cause issues with SilverStripe')); $this->suggestPHPSetting('asp_tags', array(false,0,''), array('PHP Configuration', 'asp_tags option turned off', 'This should be turned off as it can cause issues with SilverStripe'));
$this->suggestPHPSetting('magic_quotes_gpc', array(false,0,''), array('PHP Configuration', 'magic_quotes_gpc option turned off', 'This should be turned off, as it can cause issues with cookies. More specifically, unserializing data stored in cookies.')); $this->suggestPHPSetting('magic_quotes_gpc', array(false,0,''), array('PHP Configuration', 'magic_quotes_gpc option turned off', 'This should be turned off, as it can cause issues with cookies. More specifically, unserializing data stored in cookies.'));
@ -1135,8 +1133,10 @@ PHP
// @todo Exception thrown if database with admin already exists with same Email // @todo Exception thrown if database with admin already exists with same Email
try { try {
$this->statusMessage('Creating default admin account...');
$adminMember->write(); $adminMember->write();
} catch(Exception $e) { } catch(Exception $e) {
$this->statusMessage('Admin account could not be created.');
} }
// Syncing filesystem (so /assets/Uploads is available instantly, see ticket #2266) // Syncing filesystem (so /assets/Uploads is available instantly, see ticket #2266)