From: Roland Häder Date: Mon, 18 Feb 2008 00:23:00 +0000 (+0000) Subject: strange notice fixes X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=011e5e7b4a6eff28aea4f30bc87fbf3ac5161612;p=mailer.git strange notice fixes --- diff --git a/inc/functions.php b/inc/functions.php index 4fcb932fce..456e1a5bf8 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -941,6 +941,8 @@ function MAKE_TIME($H, $M, $S, $stamp) } // function LOAD_URL($URL, $addUrlData=true) { + global $CSS, $_CONFIG, $link, $db, $footer; + // Check if http(s):// is there if ((substr($URL, 0, 7) != "http://") && (substr($URL, 0, 8) != "https://")) { // Make all URLs full-qualified diff --git a/inc/header.php b/inc/header.php index cee6e091ab..7c2f8534ac 100644 --- a/inc/header.php +++ b/inc/header.php @@ -49,37 +49,39 @@ if (($header != "1") && ($header != "2")) { $TITLE = ""; // Add title decorations? (left) - if ((count($_CONFIG) > 1) && (is_resource($link)) && ($db) !== false) { - if (($_CONFIG['title_decoration'] == 'Y') && (trim(!empty($_CONFIG['title_left'])))) $TITLE .= trim($_CONFIG['title_left'])." "; - $TITLE .= MAIN_TITLE; - - // Add title of module? (middle decoration will also be added!) - if (($_CONFIG['title_mod_show'] == 'Y') || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']); - - // Add title from what file - $MODE = ""; - if ($GLOBALS['module'] == "login") $MODE = "member"; - elseif ($GLOBALS['module'] == "index") $MODE = "guest"; - if ((!empty($MODE)) && (isset($_CONFIG['title_what_show'])) && ($_CONFIG['title_what_show'] == 'Y')) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']); - - // Add title decorations? (right) - if (($_CONFIG['title_decoration'] == 'Y') && (!empty($_CONFIG['title_right']))) $TITLE .= " ".trim($_CONFIG['title_right']); - - // Remember title in constant for the template - define('__PAGE_TITLE', html_entity_decode($TITLE)); - } elseif ((!mxchange_installed) || (!admin_registered)) { - // Load language file because it was missing in installation finalizer step... *sigh* - require_once(sprintf("%sinc/language/install_%s.php", - PATH, - GET_LANGUAGE() - )); - - // Installation mode - define('__PAGE_TITLE', INSTALLATION_OF_MXCHANGE); - } else { - // Configuration not found! - define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE); - ADD_FATAL(NO_CONFIG_FOUND); + if (!defined('__PAGE_TITLE')) { + if ((count($_CONFIG) > 1) && (is_resource($link)) && (!is_resource($db))) { + if (($_CONFIG['title_decoration'] == 'Y') && (trim(!empty($_CONFIG['title_left'])))) $TITLE .= trim($_CONFIG['title_left'])." "; + $TITLE .= MAIN_TITLE; + + // Add title of module? (middle decoration will also be added!) + if (($_CONFIG['title_mod_show'] == 'Y') || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".ADD_MODULE_TITLE($GLOBALS['module']); + + // Add title from what file + $MODE = ""; + if ($GLOBALS['module'] == "login") $MODE = "member"; + elseif ($GLOBALS['module'] == "index") $MODE = "guest"; + if ((!empty($MODE)) && (isset($_CONFIG['title_what_show'])) && ($_CONFIG['title_what_show'] == 'Y')) $TITLE .= " ".trim($_CONFIG['title_middle'])." ".GET_MOD_DESCR($MODE, $GLOBALS['what']); + + // Add title decorations? (right) + if (($_CONFIG['title_decoration'] == 'Y') && (!empty($_CONFIG['title_right']))) $TITLE .= " ".trim($_CONFIG['title_right']); + + // Remember title in constant for the template + define('__PAGE_TITLE', html_entity_decode($TITLE)); + } elseif ((!mxchange_installed) || (!admin_registered)) { + // Load language file because it was missing in installation finalizer step... *sigh* + require_once(sprintf("%sinc/language/install_%s.php", + PATH, + GET_LANGUAGE() + )); + + // Installation mode + define('__PAGE_TITLE', INSTALLATION_OF_MXCHANGE); + } else { + // Configuration not found! + define('__PAGE_TITLE', NO_CONFIG_FOUND_TITLE); + ADD_FATAL(NO_CONFIG_FOUND); + } } // Save some little memory