Fatal message removed in installation when the script is installed

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 7c2f8534ac034d3963630768e5f6d2fcb055c56a..ce675dc08c85d344350414433699a87de0d858eb 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -50,7 +50,7 @@ if (($header != "1") && ($header != "2")) {
 
                // Add title decorations? (left)
                if (!defined('__PAGE_TITLE')) {
-                       if ((count($_CONFIG) > 1) && (is_resource($link)) && (!is_resource($db))) {
+                       if ((count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
                                if (($_CONFIG['title_decoration'] == 'Y') && (trim(!empty($_CONFIG['title_left'])))) $TITLE .= trim($_CONFIG['title_left'])." ";
                                $TITLE .= MAIN_TITLE;
 
@@ -68,7 +68,7 @@ if (($header != "1") && ($header != "2")) {
 
                                // Remember title in constant for the template
                                define('__PAGE_TITLE', html_entity_decode($TITLE));
-                       } elseif ((!mxchange_installed) || (!admin_registered)) {
+                       } elseif ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
                                // Load language file because it was missing in installation finalizer step... *sigh*
                                require_once(sprintf("%sinc/language/install_%s.php",
                                        PATH,
@@ -80,7 +80,9 @@ if (($header != "1") && ($header != "2")) {
                        } else {
                                // Configuration not found!
                                define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE);
-                               ADD_FATAL(NO_CONFIG_FOUND);
+
+                               // Do not add the fatal message in installation mode
+                               if (basename($_SERVER['SELF']) != "install.php") ADD_FATAL(NO_CONFIG_FOUND);
                        }
                }
 
@@ -94,7 +96,7 @@ if (($header != "1") && ($header != "2")) {
                LOAD_TEMPLATE("metadata");
 
                // Add meta description to header
-               if ((mxchange_installed) && (admin_registered) && ($GLOBALS['module'] != "admin") && ($GLOBALS['module'] != "login") && (isset($db)) && (isset($link))) {
+               if ((isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && ($GLOBALS['module'] != "admin") && ($GLOBALS['module'] != "login") && (isset($db)) && (isset($link))) {
                        // Add meta description not in admin and login module and when the script is installed
                        META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
                }