setup check

[phorkie.git] / www / www-header.php

diff --git a/www/www-header.php b/www/www-header.php
index 0fd3c79e81f48035f5d16e9cd887550eb95005d9..f381872691f67a29140c67fb6a488600e36e587c 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -21,6 +21,13 @@ set_exception_handler(
         } else {
             header('HTTP/1.0 500 Internal server error');
         }
         } else {
             header('HTTP/1.0 500 Internal server error');
         }

+
+        if (!isset($GLOBALS['twig'])) {
+            echo '<h1>Exception</h1>';
+            echo '<p>' . $e->getMessage() . '</p>';
+            exit();
+        }
+

         render(
             'exception',
             array(
         render(
             'exception',
             array(


@@ -36,8 +43,9 @@ require_once __DIR__ . '/../data/config.default.php';
 if (file_exists(__DIR__ . '/../data/config.php')) {
     require_once __DIR__ . '/../data/config.php';
 }
 if (file_exists(__DIR__ . '/../data/config.php')) {
     require_once __DIR__ . '/../data/config.php';
 }

-require_once 'VersionControl/Git.php';
-require_once 'Twig/Autoloader.php';
+if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
+    SetupCheck::run();
+}

 \Twig_Autoloader::register();
 
 $loader = new \Twig_Loader_Filesystem($GLOBALS['phorkie']['cfg']['tpl']);
 \Twig_Autoloader::register();
 
 $loader = new \Twig_Loader_Filesystem($GLOBALS['phorkie']['cfg']['tpl']);