www/www-header.php - FIX: non-set _SESSION variables causing 'undefined index' in...

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

diff --git a/www/www-header.php b/www/www-header.php
index 8b99234a0b091216d5129158a93c8030fcffebb4..74863e1637f18b011a31ec2609eb38105e0bbea2 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -1,5 +1,6 @@
 <?php
-namespace Phorkie;
+namespace phorkie;
+session_start();
 set_include_path(
     __DIR__ . '/../src/'
     . PATH_SEPARATOR . get_include_path()
@@ -21,14 +22,31 @@ set_exception_handler(
         } 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';
-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']);
@@ -39,15 +57,26 @@ $twig = new \Twig_Environment(
         'debug' => true
     )
 );
+//$twig->addExtension(new \Twig_Extension_Debug());
 
 function render($tplname, $vars)
 {
+    $vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
+    $vars['title'] = $GLOBALS['phorkie']['cfg']['title'];
+    $vars['topbar'] = $GLOBALS['phorkie']['cfg']['topbar'];
+    if (isset($_SESSION['identity'])) {
+        $vars['identity'] = $_SESSION['identity'];
+        $vars['name'] = $_SESSION['name'];
+        $vars['email'] = $_SESSION['email'];
+    }
+    $vars['db'] = new Database();
+
     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
     echo $template->render($vars);
 }
 function redirect($target)
 {
-    header('Location: /' . $target);
+    header('Location: ' . $target);
     exit();
 }
-?>
\ No newline at end of file
+?>