git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Catch remote forking errors and display them
[phorkie.git]
/
www
/
www-header.php
diff --git
a/www/www-header.php
b/www/www-header.php
index 72a2e670578149cc5ac97d6430bb5390550b4c38..1d59b1c4feb7447628bd0e3f278946b62b090225 100644
(file)
--- a/
www/www-header.php
+++ b/
www/www-header.php
@@
-1,5
+1,7
@@
<?php
namespace phorkie;
<?php
namespace phorkie;
+session_start();
+
set_include_path(
__DIR__ . '/../src/'
. PATH_SEPARATOR . get_include_path()
set_include_path(
__DIR__ . '/../src/'
. PATH_SEPARATOR . get_include_path()
@@
-46,6
+48,16
@@
if (file_exists(__DIR__ . '/../data/config.php')) {
if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
SetupCheck::run();
}
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']);
\Twig_Autoloader::register();
$loader = new \Twig_Loader_Filesystem($GLOBALS['phorkie']['cfg']['tpl']);
@@
-56,14
+68,39
@@
$twig = new \Twig_Environment(
'debug' => true
)
);
'debug' => true
)
);
+$twig->addFunction('ntext', new \Twig_Function_Function('\phorkie\ntext'));
+function ntext($value, $singular, $plural)
+{
+ if (abs($value) == 1) {
+ return sprintf($singular, $value);
+ }
+ return sprintf($plural, $value);
+}
//$twig->addExtension(new \Twig_Extension_Debug());
//$twig->addExtension(new \Twig_Extension_Debug());
-function render($tplname, $vars)
+if (!isset($noSecurityCheck) || $noSecurityCheck !== true) {
+ require __DIR__ . '/www-security.php';
+}
+
+function render($tplname, $vars = array())
{
{
+ $vars['baseurl'] = '/';
+ if (!empty($GLOBALS['phorkie']['cfg']['baseurl'])) {
+ $vars['baseurl'] = $GLOBALS['phorkie']['cfg']['baseurl'];
+ }
$vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
$vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
+ $vars['iconpng'] = $GLOBALS['phorkie']['cfg']['iconpng'];
$vars['title'] = $GLOBALS['phorkie']['cfg']['title'];
$vars['topbar'] = $GLOBALS['phorkie']['cfg']['topbar'];
$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();
$vars['db'] = new Database();
+ if (!isset($vars['htmlhelper'])) {
+ $vars['htmlhelper'] = new HtmlHelper();
+ }
$template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
echo $template->render($vars);
$template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
echo $template->render($vars);
@@
-73,4
+110,4
@@
function redirect($target)
header('Location: ' . $target);
exit();
}
header('Location: ' . $target);
exit();
}
-?>
\ No newline at end of file
+?>