Update jQuery from 1.12.4 to 3.7.1

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

diff --git a/www/www-header.php b/www/www-header.php
index 74329ed6d0da1191fa61969fd29cd36ed974bc44..859d797a094c45486b3edcb07ab3571bbe7ced78 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -91,7 +91,7 @@ if (!isset($noSecurityCheck) || $noSecurityCheck !== true) {
     require __DIR__ . '/www-security.php';
 }
 
-function render($tplname, $vars = array())
+function render($tplname, $vars = array(), $return = false)
 {
     $vars['baseurl'] = '/';
     if (!empty($GLOBALS['phorkie']['cfg']['baseurl'])) {
@@ -105,6 +105,10 @@ function render($tplname, $vars = array())
         $vars['identity'] = $_SESSION['identity'];
         $vars['name'] = $_SESSION['name'];
         $vars['email'] = $_SESSION['email'];
+    } else if (isset($_COOKIE['lastopenid'])
+        && !isset($_COOKIE['tried-autologin'])
+    ) {
+        $vars['autologin'] = true;
     }
     $vars['db'] = new Database();
     if (!isset($vars['htmlhelper'])) {
@@ -113,8 +117,14 @@ function render($tplname, $vars = array())
     $vars['suggestSetupCheck'] = $GLOBALS['phorkie']['suggestSetupCheck'];
 
     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
-    echo $template->render($vars);
+
+    if ($return) {
+        return $template->render($vars);
+    } else {
+        echo $template->render($vars);
+    }
 }
+
 function redirect($target)
 {
     header('Location: ' . $target);