git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some spacing between files
[phorkie.git]
/
www
/
www-header.php
diff --git
a/www/www-header.php
b/www/www-header.php
index 3fa4e0e7ba6e05b38d10cf9ffb4d41ff5ffdb525..833fb8a56479a461382dba5983cfe6cfc9495551 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();
@@
-40,13
+40,22
@@
if ($pharFile == '') {
$cfgFilePath = substr($pharFile, 7) . '.config.php';
}
$GLOBALS['phorkie']['cfgfiles'][$cfgFilePath] = false;
$cfgFilePath = substr($pharFile, 7) . '.config.php';
}
$GLOBALS['phorkie']['cfgfiles'][$cfgFilePath] = false;
+$GLOBALS['phorkie']['suggestSetupCheck'] = false;
if (file_exists($cfgFilePath)) {
$GLOBALS['phorkie']['cfgfiles'][$cfgFilePath] = true;
require_once $cfgFilePath;
if (file_exists($cfgFilePath)) {
$GLOBALS['phorkie']['cfgfiles'][$cfgFilePath] = true;
require_once $cfgFilePath;
+} else if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
+ $GLOBALS['phorkie']['suggestSetupCheck'] = true;
}
if ($GLOBALS['phorkie']['cfg']['baseurl'] === null) {
$GLOBALS['phorkie']['cfg']['baseurl'] = Tools::detectBaseUrl();
}
if ($GLOBALS['phorkie']['cfg']['baseurl'] === null) {
$GLOBALS['phorkie']['cfg']['baseurl'] = Tools::detectBaseUrl();
+ if (substr($GLOBALS['phorkie']['cfg']['git']['public'], 0, 9) == '%BASEURL%') {
+ //make autoconfig work
+ $GLOBALS['phorkie']['cfg']['git']['public'] = Tools::fullUrlNoPhar(
+ substr($GLOBALS['phorkie']['cfg']['git']['public'], 9)
+ );
+ }
}
// Set/Get git commit session variables
}
// Set/Get git commit session variables
@@
-96,11
+105,16
@@
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['htmlhelper'] = new HtmlHelper();
}
}
$vars['db'] = new Database();
if (!isset($vars['htmlhelper'])) {
$vars['htmlhelper'] = new HtmlHelper();
}
+ $vars['suggestSetupCheck'] = $GLOBALS['phorkie']['suggestSetupCheck'];
$template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
echo $template->render($vars);
$template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
echo $template->render($vars);