git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid mixed content warnings by letting Libravatar detect HTTPS connection.
[phorkie.git]
/
www
/
www-header.php
diff --git
a/www/www-header.php
b/www/www-header.php
index 96cd481829ac43a2e5c002d537253505f309269c..b58bd95ed659306b764ca40b67fc381002e0b756 100644
(file)
--- a/
www/www-header.php
+++ b/
www/www-header.php
@@
-1,23
+1,8
@@
<?php
namespace phorkie;
<?php
namespace phorkie;
-if (session_id() == "") {
- session_start();
-}
+session_start();
-set_include_path(
- __DIR__ . '/../src/'
- . PATH_SEPARATOR . get_include_path()
-);
-spl_autoload_register(
- function ($class) {
- $file = str_replace(array('\\', '_'), '/', $class) . '.php';
- $hdl = @fopen($file, 'r', true);
- if ($hdl !== false) {
- fclose($hdl);
- require $file;
- }
- }
-);
+require_once __DIR__ . '/../src/phorkie/autoload.php';
set_exception_handler(
function ($e) {
if ($e instanceof Exception) {
set_exception_handler(
function ($e) {
if ($e instanceof Exception) {
@@
-29,6
+14,7
@@
set_exception_handler(
if (!isset($GLOBALS['twig'])) {
echo '<h1>Exception</h1>';
echo '<p>' . $e->getMessage() . '</p>';
if (!isset($GLOBALS['twig'])) {
echo '<h1>Exception</h1>';
echo '<p>' . $e->getMessage() . '</p>';
+ echo "\n";
exit();
}
exit();
}
@@
-47,9
+33,6
@@
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';
}
-if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
- SetupCheck::run();
-}
// Set/Get git commit session variables
$_SESSION['ipaddr'] = $_SERVER['REMOTE_ADDR'];
// Set/Get git commit session variables
$_SESSION['ipaddr'] = $_SERVER['REMOTE_ADDR'];
@@
-70,11
+53,28
@@
$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'];
if (isset($_SESSION['identity'])) {
$vars['title'] = $GLOBALS['phorkie']['cfg']['title'];
$vars['topbar'] = $GLOBALS['phorkie']['cfg']['topbar'];
if (isset($_SESSION['identity'])) {
@@
-83,6
+83,9
@@
function render($tplname, $vars)
$vars['email'] = $_SESSION['email'];
}
$vars['db'] = new Database();
$vars['email'] = $_SESSION['email'];
}
$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);