X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/825c9662ddc1c534712056c458c8f6d71b81b921..7ccd696a9a83b0bd897d0ae770239c2246e201d3:/www/www-header.php?ds=inline

diff --git a/www/www-header.php b/www/www-header.php
index d763742..833fb8a 100644
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -1,21 +1,10 @@
 <?php
 namespace phorkie;
+error_reporting(error_reporting() & ~E_STRICT & ~E_DEPRECATED);
+session_set_cookie_params(14 * 86400);//2 weeks session expiry time
 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) {
@@ -43,11 +32,30 @@ set_exception_handler(
 );
 
 require_once __DIR__ . '/../data/config.default.php';
-if (file_exists(__DIR__ . '/../data/config.php')) {
-    require_once __DIR__ . '/../data/config.php';
+$pharFile = \Phar::running();
+if ($pharFile == '') {
+    $cfgFilePath = __DIR__ . '/../data/config.php';
+} else {
+    //remove phar:// from the path
+    $cfgFilePath = substr($pharFile, 7) . '.config.php';
 }
-if ($GLOBALS['phorkie']['cfg']['setupcheck']) {
-    SetupCheck::run();
+$GLOBALS['phorkie']['cfgfiles'][$cfgFilePath] = false;
+$GLOBALS['phorkie']['suggestSetupCheck'] = false;
+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 (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
@@ -97,11 +105,16 @@ 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'])) {
         $vars['htmlhelper'] = new HtmlHelper();
     }
+    $vars['suggestSetupCheck'] = $GLOBALS['phorkie']['suggestSetupCheck'];
 
     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
     echo $template->render($vars);