git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 5b2fa565be7013ef339583b0f7dd2568980f3154..72a2e670578149cc5ac97d6430bb5390550b4c38 100644
(file)
--- a/
www/www-header.php
+++ b/
www/www-header.php
@@
-1,5
+1,5
@@
<?php
<?php
-namespace
P
horkie;
+namespace
p
horkie;
set_include_path(
__DIR__ . '/../src/'
. PATH_SEPARATOR . get_include_path()
set_include_path(
__DIR__ . '/../src/'
. PATH_SEPARATOR . get_include_path()
@@
-21,7
+21,20
@@
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();
}
);
exit();
}
);
@@
-30,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']);
@@
-42,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);
}