get rid of openid config file

[phorkie.git] / www / www-header.php

diff --git a/www/www-header.php b/www/www-header.php
index 5785a3ec300ff16552a627896f99ebf65e71fca2..290e680015900ca445bb25ad599e0d3779837f6f 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -1,6 +1,9 @@
 <?php
 namespace phorkie;
-session_start();
+if (session_id() == "") {
+    session_start();
+}
+
 set_include_path(
     __DIR__ . '/../src/'
     . PATH_SEPARATOR . get_include_path()
@@ -50,8 +53,12 @@ if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
 
 // 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']; }
+if (!isset($_SESSION['name'])) {
+    $_SESSION['name'] = $GLOBALS['phorkie']['auth']['anonymousName'];
+}
+if (!isset($_SESSION['email'])) {
+    $_SESSION['email'] = $GLOBALS['phorkie']['auth']['anonymousEmail'];
+}
 
 \Twig_Autoloader::register();
 
@@ -65,7 +72,9 @@ $twig = new \Twig_Environment(
 );
 //$twig->addExtension(new \Twig_Extension_Debug());
 
-function render($tplname, $vars)
+require __DIR__ . '/www-security.php';
+
+function render($tplname, $vars = array())
 {
     $vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
     $vars['title'] = $GLOBALS['phorkie']['cfg']['title'];