hide additional fields and add button to show them

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

diff --git a/www/www-header.php b/www/www-header.php
index 520d793520627c73ae116f882e0a6fdf299014dc..72a2e670578149cc5ac97d6430bb5390550b4c38 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -1,5 +1,5 @@
 <?php
 <?php

-namespace Phorkie;
+namespace phorkie;

 set_include_path(
     __DIR__ . '/../src/'
     . PATH_SEPARATOR . get_include_path()
 set_include_path(
     __DIR__ . '/../src/'
     . PATH_SEPARATOR . get_include_path()


@@ -21,14 +21,31 @@ set_exception_handler(
         } else {
             header('HTTP/1.0 500 Internal server error');
         }
         } else {
             header('HTTP/1.0 500 Internal server error');
         }

-        render('exception', array('exception' => $e));
+
+        if (!isset($GLOBALS['twig'])) {
+            echo '<h1>Exception</h1>';
+            echo '<p>' . $e->getMessage() . '</p>';
+            exit();
+        }
+
+        render(
+            'exception',
+            array(
+                'exception' => $e,
+                'debug'     => $GLOBALS['phorkie']['cfg']['debug']
+            )
+        );

         exit();
     }
 );
 
 require_once __DIR__ . '/../data/config.default.php';
         exit();
     }
 );
 
 require_once __DIR__ . '/../data/config.default.php';

-require_once 'VersionControl/Git.php';
-require_once 'Twig/Autoloader.php';
+if (file_exists(__DIR__ . '/../data/config.php')) {
+    require_once __DIR__ . '/../data/config.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']);


@@ -39,9 +56,15 @@ $twig = new \Twig_Environment(
         'debug' => true
     )
 );
         'debug' => true
     )
 );

+//$twig->addExtension(new \Twig_Extension_Debug());

 
 function render($tplname, $vars)
 {
 
 function render($tplname, $vars)
 {

+    $vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
+    $vars['title'] = $GLOBALS['phorkie']['cfg']['title'];
+    $vars['topbar'] = $GLOBALS['phorkie']['cfg']['topbar'];
+    $vars['db'] = new Database();
+

     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
     echo $template->render($vars);
 }
     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
     echo $template->render($vars);
 }