A lot double-quotes rewritten to single-quotes, some redirect URLs fixed

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index 226c9918cd4eceb973edfc88402c1a80cfa19b8e..642ef5508aea30b82cb61ba4f824536fa7e64630 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -12,7 +12,12 @@
  * Kurzbeschreibung  : Gibt nur dann HTML-Code fuer den Kopf-Bereich    *
  *           aus, wenn Frameset nicht aktiv ist                         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -35,7 +40,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -44,14 +49,14 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
        // If not in CSS mode generate the header
        if (($GLOBALS['output_mode'] != "1")) {
                // Generate header
-               $TITLE = "";
+               $TITLE = '';
 
                // Add title decorations? (left)
                if (!defined('__PAGE_TITLE')) {
                        // Config and database connection valid?
-                       if ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 1) && (SQL_IS_LINK_UP())) {
+                       if ((isConfigLoaded()) && (SQL_IS_LINK_UP())) {
                                // Title decoration enabled?
-                               if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_left') != "")) $TITLE .= trim(getConfig('title_left'))." ";
+                               if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != "")) $TITLE .= trim(getConfig('title_left'))." ";
 
                                // Do we have some extra title?
                                if (!empty($EXTRA_TITLE)) {
@@ -63,31 +68,28 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
                                $TITLE .= constant('MAIN_TITLE');
 
                                // Add title of module? (middle decoration will also be added!)
-                               if ((getConfig('enable_mod_title') == "Y") || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == "admin")) $TITLE .= " ".trim(getConfig('title_middle'))." ".ADD_MODULE_TITLE($GLOBALS['module']);
+                               if ((getConfig('enable_mod_title') == 'Y') || ((empty($GLOBALS['what'])) && (empty($GLOBALS['action']))) || ($GLOBALS['module'] == 'admin')) $TITLE .= " ".trim(getConfig('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)) && (getConfig('enable_what_title') == "Y")) $TITLE .= " ".trim(getConfig('title_middle'))." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
+                               $MODE = '';
+                               if ($GLOBALS['module'] == "login") $MODE = 'member';
+                                elseif ($GLOBALS['module'] == 'index') $MODE = 'guest';
+                               if ((!empty($MODE)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".GET_MOD_DESCR($MODE, $GLOBALS['what']);
 
                                // Add title decorations? (right)
-                               if ((getConfig('enable_title_deco') == "Y") && (getConfig('title_right') != "")) $TITLE .= " ".trim(getConfig('title_right'));
+                               if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != "")) $TITLE .= " ".trim(getConfig('title_right'));
 
                                // Remember title in constant for the template
                                define('__PAGE_TITLE', $TITLE);
                        } elseif ((!isInstalled()) || (!isAdminRegistered())) {
-                               // Load language here
-                               LOAD_INC_ONCE("inc/language.php");
-
                                // Installation mode
-                               define('__PAGE_TITLE', getMessage('INSTALLATION_OF_MXCHANGE'));
+                               define('__PAGE_TITLE', sprintf(getMessage('INSTALLATION_OF_MXCHANGE'), constant('MAIN_TITLE')));
                        } else {
                                // Configuration not found!
                                define('__PAGE_TITLE', getMessage('NO_CONFIG_FOUND_TITLE'));
 
                                // Do not add the fatal message in installation mode
-                               if (basename($_SERVER['PHP_SELF']) != "install.php") addFatalMessage(getMessage('NO_CONFIG_FOUND'));
+                               if (!isInstalling()) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
                        }
                } // END - if
 
@@ -97,8 +99,8 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
                // Output page header code
                LOAD_TEMPLATE("page_header");
 
-               // Include meta data in "guest" module
-               if ($GLOBALS['module'] == "index") {
+               // Include meta data in 'guest' module
+               if ($GLOBALS['module'] == 'index') {
                        // Load meta data template
                        LOAD_TEMPLATE("metadata");