X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/271df87bc8c768167889902c455d3c7dfc0f155b..027c801a4dc51db673bcbfcfbd396845f244e357:/www/www-header.php diff --git a/www/www-header.php b/www/www-header.php index 01214d7..9aa8732 100644 --- a/www/www-header.php +++ b/www/www-header.php @@ -1,5 +1,7 @@ $e)); + + if (!isset($GLOBALS['twig'])) { + echo '

Exception

'; + echo '

' . $e->getMessage() . '

'; + exit(); + } + + render( + 'exception', + array( + 'exception' => $e, + 'debug' => $GLOBALS['phorkie']['cfg']['debug'] + ) + ); exit(); } ); @@ -30,8 +45,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']); @@ -42,10 +68,24 @@ $twig = new \Twig_Environment( 'debug' => true ) ); +//$twig->addExtension(new \Twig_Extension_Debug()); + +if (!isset($noSecurityCheck) || $noSecurityCheck !== true) { + 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); } @@ -54,4 +94,4 @@ function redirect($target) header('Location: ' . $target); exit(); } -?> \ No newline at end of file +?>