phorkie setup check

From 3cd888fdd3bcd9f8d8ed47acf1c3420c09f4030d Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 4 Jul 2014 07:42:52 +0200 Subject: [PATCH] rework setup check --- src/phorkie/SetupCheck.php | 31 ++++++++++-- www/setup.php | 98 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 123 insertions(+), 6 deletions(-) diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php index 177a0f7..c459e2a 100644 --- a/src/phorkie/SetupCheck.php +++ b/src/phorkie/SetupCheck.php @@ -18,6 +18,8 @@ class SetupCheck protected $writableDirs; protected $elasticsearch; + public $messages = array(); + public function __construct() { $cfg = $GLOBALS['phorkie']['cfg']; @@ -31,11 +33,25 @@ class SetupCheck public static function run() { $sc = new self(); + $sc->checkConfigFiles(); $sc->checkDeps(); $sc->checkDirs(); $sc->checkGit(); $sc->checkDatabase(); $sc->checkMimeTypeDetection(); + + return $sc->messages; + } + + public function checkConfigFiles() + { + foreach ($GLOBALS['phorkie']['cfgfiles'] as $file => $loaded) { + if ($loaded) { + $this->ok('Loaded config file: ' . $file); + } else { + $this->info('Possible config file: ' . $file . ' (not loaded)'); + } + } } public function checkDeps() @@ -69,8 +85,7 @@ class SetupCheck foreach ($this->writableDirs as $name => $dir) { if (!is_dir($dir)) { $this->fail($name . ' directory does not exist at ' . $dir); - } - if (!is_writable($dir)) { + } else if (!is_writable($dir)) { $this->fail($name . ' directory is not writable at ' . $dir); } } @@ -120,7 +135,17 @@ class SetupCheck public function fail($msg) { - throw new Exception($msg); + $this->messages[] = array('error', $msg); + } + + public function info($msg) + { + $this->messages[] = array('info', $msg); + } + + public function ok($msg) + { + $this->messages[] = array('ok', $msg); } } diff --git a/www/setup.php b/www/setup.php index d62efe0..cd0deaa 100644 --- a/www/setup.php +++ b/www/setup.php @@ -3,6 +3,8 @@ * Check if all is setup correctly */ namespace phorkie; +header('HTTP/1.0 500 Internal Server Error'); + $reqWritePermissions = false; require_once 'www-header.php'; @@ -13,8 +15,98 @@ if (!$GLOBALS['phorkie']['cfg']['setupcheck']) { exit(1); } -SetupCheck::run(); +$messages = SetupCheck::run(); +$errors = 0; +foreach ($messages as $arMessage) { + list($type, $message) = $arMessage; + $type == 'error' && ++$errors; +} +if ($errors == 0) { + header('HTTP/1.0 200 OK'); +} +header('Content-type: text/html'); + +if ($errors == 0) { + $messages[] = array('ok', 'All fine'); +} + +$out = << + + + + phorkie setup check + + + + + + + +

+ + + +

'; + $out .= htmlspecialchars($message); + $out .= '

+ back to the index +

+ + -header('Content-type: text/plain'); -echo "All fine\n"; + + +HTM; +echo $out; ?> -- 2.30.2