X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fheader.php;h=a7dc3af343c08feabefed1aff7628d1f08e59225;hb=31f72989438afa5abd59305ecb8e6933ca4ceba1;hp=9afbe993d24e72c7a1b70be2020d6e0afef68b12;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361;p=mailer.git diff --git a/inc/header.php b/inc/header.php index 9afbe993d2..a7dc3af343 100644 --- a/inc/header.php +++ b/inc/header.php @@ -54,7 +54,7 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) { // Add title decorations? (left) if (!defined('__PAGE_TITLE')) { // Config and database connection valid? - if ((isConfigLoaded()) && (SQL_IS_LINK_UP())) { + if ((isConfigLocalLoaded()) && (isConfigLoaded()) && (SQL_IS_LINK_UP())) { // Title decoration enabled? if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left'))." "; @@ -73,7 +73,7 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) { // Add title from what file $mode = ''; if ($GLOBALS['module'] == "login") $mode = 'member'; - elseif ($GLOBALS['module'] == 'index') $mode = 'guest'; + elseif ($GLOBALS['module'] == 'index') $mode = 'guest'; if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleDescription($mode, $GLOBALS['what']); // Add title decorations? (right) @@ -127,7 +127,7 @@ if (($GLOBALS['header_sent'] != '1') && ($GLOBALS['header_sent'] != '2')) { } // END - if // Load body or not -if (($GLOBALS['module'] != 'frametester') || (($GLOBALS['module'] == 'frametester') && (REQUEST_ISSET_GET(('frame')))) || (($GLOBALS['header_sent'] == '1') && (REQUEST_ISSET_GET(('frame')))) && ($GLOBALS['output_mode'] != '1')) { +if (($GLOBALS['module'] != 'frametester') || (($GLOBALS['module'] == 'frametester') && (REQUEST_ISSET_GET('frame'))) || (($GLOBALS['header_sent'] == '1') && (REQUEST_ISSET_GET('frame'))) && ($GLOBALS['output_mode'] != '1')) { // Is the header sent and the script is not the mail confirmation script and not a CSS? if (($GLOBALS['header_sent'] == '1') && (basename($_SERVER['PHP_SELF']) != 'mailid.php') && ($GLOBALS['output_mode'] != '1')) { // Add BODY tag