Fix bug #24: verify geshi installation, Fix bug #25: setupcheck: verify markdown

diff --git a/ChangeLog b/ChangeLog
index 16b0774c8db80471188ec9ad9e5d1b237a7b8602..3cd4ba375869a28b6a04642c303e8516250675e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
-2012-09-28  Christian Weiske  <cweiske@bogo>
+2012-09-28  Christian Weiske  <cweiske@cweiske.de>
 
        * Check for OpenID package in SetupCheck
+       * Fix bug #24: setupcheck: verify geshi installation
+       * Fix bug #25: setupcheck: verify markdown
 
 2012-09-28  Christian Weiske  <cweiske@cweiske.de>
 

diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php
index 93ec3efe57f256f45c199fa98c21d34d2ce1d4a4..0affe05caec281d960e4fa093a8ba23b4e592390 100644 (file)
--- a/src/phorkie/SetupCheck.php
+++ b/src/phorkie/SetupCheck.php
@@ -43,6 +43,18 @@ class SetupCheck
                 $this->fail('PEAR package not installed: ' . $package);
             }
         }
+
+        $geshi = stream_resolve_include_path(
+            $GLOBALS['phorkie']['cfg']['geshi']
+        );
+        if ($geshi === false) {
+            $this->fail('GeSHi not available');
+        }
+
+        $markdown = stream_resolve_include_path('markdown.php');
+        if ($markdown === false) {
+            $this->fail('Markdown renderer not available');
+        }
     }
 
     public function checkDirs()