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

ENHANCEMENT: refactored requirements section to hide successful tests

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101382 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
wrossiter 2010-03-19 03:55:02 +00:00 committed by Sam Minnee
parent befa638192
commit 43f99930df
1 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
install.php
View File

@ -442,12 +442,42 @@ class InstallRequirements {
} else { } else {
foreach($this->tests as $section => $tests) { foreach($this->tests as $section => $tests) {
echo "<h5>$section</h5>"; $failedRequirements = 0;
echo "<table class=\"testResults\">"; $warningRequirements = 0;
$output = "";
foreach($tests as $test => $result) { foreach($tests as $test => $result) {
echo "<tr class=\"$result[0]\"><td>$test</td><td>" . nl2br(htmlentities($result[1])) . "</td></tr>"; if(isset($result['0'])) {
switch($result['0']) {
case 'error':
$failedRequirements++;
break;
case 'warning':
$warningRequirements++;
break;
}
}
$output .= "<tr class=\"$result[0]\"><td>$test</td><td>" . nl2br(htmlentities($result[1])) . "</td></tr>";
} }
$className = "good";
$text = "All Requirements Pass";
$pluralWarnings = ($warningRequirements == 1) ? 'Warning' : 'Warnings';
if($failedRequirements > 0) {
$className = "error";
$pluralWarnings = ($warningRequirements == 1) ? 'Warning' : 'Warnings';
$text = $failedRequirements . ' Failed and '. $warningRequirements . ' '. $pluralWarnings;
}
else if($warningRequirements > 0) {
$className = "warning";
$text = "All Requirements Pass but ". $warningRequirements . ' '. $pluralWarnings;
}
echo "<h5 class='requirement $className'>$section <a href='#'>See All Requirements</a> <span>$text</span></h5>";
echo "<table class=\"testResults\">";
echo $output;
echo "</table>"; echo "</table>";
} }
} }
@ -903,8 +933,6 @@ PHP
} else { } else {
$this->statusMessage("Setting up 'mysite/_config.php'..."); $this->statusMessage("Setting up 'mysite/_config.php'...");
$devServers = $this->var_export_array_nokeys(explode("\n", $_POST['devsites']));
$escapedPassword = addslashes($dbConfig['password']); $escapedPassword = addslashes($dbConfig['password']);
$this->writeToFile("mysite/_config.php", <<<PHP $this->writeToFile("mysite/_config.php", <<<PHP
<?php <?php
@ -926,7 +954,10 @@ global \$databaseConfig;
// run in development mode. See // run in development mode. See
// http://doc.silverstripe.org/doku.php?id=configuration // http://doc.silverstripe.org/doku.php?id=configuration
// for a description of what dev mode does. // for a description of what dev mode does.
Director::set_dev_servers($devServers); Director::set_dev_servers(array(
'localhost',
'127.0.0.1'
));
MySQLDatabase::set_connection_charset('utf8'); MySQLDatabase::set_connection_charset('utf8');