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

MINOR Renamed keys to database configuration results (from r98795)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112103 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sminnee 2010-10-13 02:48:46 +00:00
parent 6368a4fea0
commit c4de1cb3be
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install.php
View File

@ -216,7 +216,7 @@ class InstallRequirements {
var $errors, $warnings, $tests; var $errors, $warnings, $tests;
/** /**
* Just check that the database configuration is okay * Just check that the database configuration is all good.
*/ */
function checkdatabase($databaseConfig) { function checkdatabase($databaseConfig) {
if($this->requireDatabaseFunctions( if($this->requireDatabaseFunctions(
@ -629,7 +629,7 @@ class InstallRequirements {
$this->testing($testDetails); $this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']); $helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseConnection($databaseConfig); $result = $helper->requireDatabaseConnection($databaseConfig);
if($result['okay']) { if($result['success']) {
return true; return true;
} else { } else {
$testDetails[2] .= ": " . $result['error']; $testDetails[2] .= ": " . $result['error'];
@ -642,7 +642,7 @@ class InstallRequirements {
$this->testing($testDetails); $this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']); $helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseServer($databaseConfig); $result = $helper->requireDatabaseServer($databaseConfig);
if($result['okay']) { if($result['success']) {
return true; return true;
} else { } else {
$testDetails[2] .= ": " . $result['error']; $testDetails[2] .= ": " . $result['error'];
@ -655,8 +655,8 @@ class InstallRequirements {
$this->testing($testDetails); $this->testing($testDetails);
$helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']); $helper = $this->getDatabaseConfigurationHelper($databaseConfig['type']);
$result = $helper->requireDatabaseOrCreatePermissions($databaseConfig); $result = $helper->requireDatabaseOrCreatePermissions($databaseConfig);
if($result['okay']) { if($result['success']) {
if($result['existsAlready']) $testDetails[3] = "Database $databaseConfig[database] exists"; if($result['alreadyExists']) $testDetails[3] = "Database $databaseConfig[database] exists";
else $testDetails[3] = "Able to create a new database"; else $testDetails[3] = "Able to create a new database";
$this->testing($testDetails); $this->testing($testDetails);
return true; return true;