git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 eaf19520bef3b840586ad7ac4c61116591bee118..859d797a094c45486b3edcb07ab3571bbe7ced78 100644
(file)
--- a/
www/www-header.php
+++ b/
www/www-header.php
@@
-1,6
+1,6
@@
<?php
namespace phorkie;
<?php
namespace phorkie;
-error_reporting(error_reporting() & ~E_STRICT);
+error_reporting(error_reporting() & ~E_STRICT
& ~E_DEPRECATED
);
session_set_cookie_params(14 * 86400);//2 weeks session expiry time
session_start();
session_set_cookie_params(14 * 86400);//2 weeks session expiry time
session_start();
@@
-91,7
+91,7
@@
if (!isset($noSecurityCheck) || $noSecurityCheck !== true) {
require __DIR__ . '/www-security.php';
}
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'])) {
{
$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'];
$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'])) {
}
$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');
$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);
function redirect($target)
{
header('Location: ' . $target);