New naming convention applied to many functions, see #118 for details

[mailer.git] / inc / header.php

diff --git a/inc/header.php b/inc/header.php
index f729ec3ed0926cad6ff7ac782986fcbaf74b859f..5c904093df1782a87afb5070670b04b1e3632f5f 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -56,7 +56,7 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
                        // Config and database connection valid?
                        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)) {
@@ -68,16 +68,16 @@ 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'))." ".getModuleTitle($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']);
+                               if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleDescription($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);
@@ -107,7 +107,7 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
                        // Add meta description to header
                        if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) {
                                // Add meta description not in admin and login module and when the script is installed
-                               META_DESCRIPTION($GLOBALS['module'], $GLOBALS['what']);
+                               generateMetaDescriptionCode($GLOBALS['module'], $GLOBALS['what']);
                        } // END - if
                } // END - if
 
@@ -115,7 +115,7 @@ if (($GLOBALS['header_sent'] != "1") && ($GLOBALS['header_sent'] != "2")) {
                LOAD_TEMPLATE("header");
 
                // Include stylesheet
-               LOAD_INC_ONCE("inc/stylesheet.php");
+               loadIncludeOnce("inc/stylesheet.php");
        } // END - if
 
        // Closing HEAD tag