X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/d80854dc9a670e0ee996cc89a59af2c5f8521205..3cd888fdd3bcd9f8d8ed47acf1c3420c09f4030d:/src/phorkie/SetupCheck.php

diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php
index fbc99c7..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()
@@ -46,10 +62,12 @@ class SetupCheck
             }
         }
 
-        if (!class_exists('GeSHi', true)) {
-            @include_once 'geshi.php';
-            if (!class_exists('GeSHi', false)) {
-                $this->fail('PEAR package not installed: pear.geshi.org/geshi');
+        if (!class_exists('geshi', true)) {
+            $geshi = stream_resolve_include_path(
+                $GLOBALS['phorkie']['cfg']['geshi']
+            );
+            if ($geshi === false) {
+                $this->fail('GeSHi not available');
             }
         }
 
@@ -67,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);
             }
         }
@@ -118,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);
     }
 }