diff --git a/install.php b/install.php
index 283a891..74541e2 100644
--- a/install.php
+++ b/install.php
@@ -442,12 +442,42 @@ class InstallRequirements {
} else {
foreach($this->tests as $section => $tests) {
- echo "
$section
";
- echo "";
+ $failedRequirements = 0;
+ $warningRequirements = 0;
+
+ $output = "";
foreach($tests as $test => $result) {
- echo "$test | " . nl2br(htmlentities($result[1])) . " |
";
+ if(isset($result['0'])) {
+ switch($result['0']) {
+ case 'error':
+ $failedRequirements++;
+ break;
+ case 'warning':
+ $warningRequirements++;
+ break;
+ }
+ }
+ $output .= "$test | " . nl2br(htmlentities($result[1])) . " |
";
}
+ $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 "";
+ echo "";
+ echo $output;
echo "
";
}
}
@@ -903,8 +933,6 @@ PHP
} else {
$this->statusMessage("Setting up 'mysite/_config.php'...");
-
- $devServers = $this->var_export_array_nokeys(explode("\n", $_POST['devsites']));
$escapedPassword = addslashes($dbConfig['password']);
$this->writeToFile("mysite/_config.php", <<