X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/03bca6d0304209d14c6bfaae0e1fb4b85057adfd..f662a50e02abe50321766c84a23b977a455d401c:/www/www-header.php diff --git a/www/www-header.php b/www/www-header.php index 756bdc9..290e680 100644 --- a/www/www-header.php +++ b/www/www-header.php @@ -1,5 +1,9 @@ Exception'; + echo '

' . $e->getMessage() . '

'; + exit(); + } + render( 'exception', array( @@ -36,8 +47,19 @@ require_once __DIR__ . '/../data/config.default.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(); +} + +// Set/Get git commit session variables +$_SESSION['ipaddr'] = $_SERVER['REMOTE_ADDR']; +if (!isset($_SESSION['name'])) { + $_SESSION['name'] = $GLOBALS['phorkie']['auth']['anonymousName']; +} +if (!isset($_SESSION['email'])) { + $_SESSION['email'] = $GLOBALS['phorkie']['auth']['anonymousEmail']; +} + \Twig_Autoloader::register(); $loader = new \Twig_Loader_Filesystem($GLOBALS['phorkie']['cfg']['tpl']); @@ -48,11 +70,21 @@ $twig = new \Twig_Environment( 'debug' => true ) ); +//$twig->addExtension(new \Twig_Extension_Debug()); + +require __DIR__ . '/www-security.php'; -function render($tplname, $vars) +function render($tplname, $vars = array()) { $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); @@ -62,4 +94,4 @@ function redirect($target) header('Location: ' . $target); exit(); } -?> \ No newline at end of file +?>