Lead users to setup check page when no config file given

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

diff --git a/www/www-header.php b/www/www-header.php
index f13108db0113aad94e7312452d68608741a6d4f8..5381eed67a4f01e89b528ad7a47a8630d6031d9d 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -1,6 +1,7 @@
 <?php
 namespace phorkie;
 error_reporting(error_reporting() & ~E_STRICT);
 <?php
 namespace phorkie;
 error_reporting(error_reporting() & ~E_STRICT);

+session_set_cookie_params(14 * 86400);//2 weeks session expiry time

 session_start();
 
 require_once __DIR__ . '/../src/phorkie/autoload.php';
 session_start();
 
 require_once __DIR__ . '/../src/phorkie/autoload.php';


@@ -31,8 +32,24 @@ set_exception_handler(
 );
 
 require_once __DIR__ . '/../data/config.default.php';
 );
 
 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';
+}
+$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();

 }
 
 // Set/Get git commit session variables
 }
 
 // Set/Get git commit session variables


@@ -87,6 +104,7 @@ function render($tplname, $vars = array())
     if (!isset($vars['htmlhelper'])) {
         $vars['htmlhelper'] = new HtmlHelper();
     }
     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);