From: Christian Weiske <cweiske@cweiske.de>
Date: Fri, 28 Sep 2012 21:27:31 +0000 (+0200)
Subject:  Fix bug #24: verify geshi installation, Fix bug #25: setupcheck: verify markdown
X-Git-Tag: v0.3.1~1
X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/df17d804e9f47966c595aedf3e1095f604d068fa

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

diff --git a/ChangeLog b/ChangeLog
index 16b0774..3cd4ba3 100644
--- 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 93ec3ef..0affe05 100644
--- 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()