Lead users to setup check page when no config file given

diff --git a/data/templates/base.htm b/data/templates/base.htm
index 90ccc0a4e6a7948790f24035a7d63f82b98ef409..86c79e6e1bb0801727025fb904b0ceb4fe504baa 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -74,6 +74,12 @@
   <div class="container">
    <div class="row">
     <div class="span9">
+     {% if suggestSetupCheck %}
+     <div class="alert alert-error">
+       It seems phorkie is not setup properly.
+       Visit the <a href="setup">setup check page</a> for more information.
+     </div>
+     {% endif %}
      {% block content %}{% endblock %}
     </div>
     <div class="span3">

diff --git a/www/www-header.php b/www/www-header.php
index 3fa4e0e7ba6e05b38d10cf9ffb4d41ff5ffdb525..5381eed67a4f01e89b528ad7a47a8630d6031d9d 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -40,9 +40,12 @@ if ($pharFile == '') {
     $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) {
@@ -101,6 +104,7 @@ function render($tplname, $vars = array())
     if (!isset($vars['htmlhelper'])) {
         $vars['htmlhelper'] = new HtmlHelper();
     }
+    $vars['suggestSetupCheck'] = $GLOBALS['phorkie']['suggestSetupCheck'];
 
     $template = $GLOBALS['twig']->loadTemplate($tplname . '.htm');
     echo $template->render($vars);