Renamed function so it might be more understandable

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 526741c10c035958a837d20b367285b3e69122c3..6124c29e4d9dc2f06605fc8f5385618299d92b10 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -14,8 +14,6 @@
  * $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 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -69,8 +67,11 @@ if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
 // Init fatal messages
 initFatalMessages();
 
-// Init message system
-initMessages();
+// Init repository data sub-system
+initRepositoryData();
+
+// Enable HTML templates by default
+enableTemplateHtml();
 
 // Are we in installation phase?
 if ((!isInstalling()) && (!isInstallationPhase())) {
@@ -80,10 +81,13 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
+       // Init message system
+       initMessages();
+
        // CSS array
        initExtensionCssFiles();
 
-       if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) {
+       if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['dbase']))) {
                // Connect to DB
                SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FILE__, __LINE__);
 
@@ -118,26 +122,22 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                }
                        } else {
                                // Wrong database?
-                               addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
+                               addFatalMessage(__FILE__, __LINE__, '{--WRONG_DB_SELECTED--}');
                        }
                } else {
                        // No link to database!
-                       addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
+                       addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
                }
        } else {
                // Maybe you forgot to enter your MySQL data?
-               addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
+               addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
        }
 } else {
-       ///////////////////////////////////////////////////
-       // Include neccessary functions for installation //
-       ///////////////////////////////////////////////////
-
        // Default output is 'direct' for HTML output
        setConfigEntry('OUTPUT_MODE', 'direct');
 
        // This hack prevents a backtrace in CSS output
-       if (getOutputMode() == 1) {
+       if (isCssOutputMode()) {
                // Problem with config so set output mode
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
@@ -145,26 +145,23 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // CFG: DATABASE-TYPE
        setConfigEntry('_DB_TYPE', 'mysql3');
 
+       // Load database layer here
+       loadIncludeOnce('inc/db/lib.php');
+
+       // Init message system
+       initMessages();
+
        // Include more
-       foreach (array('inc/db/lib.php','inc/databases.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       foreach (array('databases','session','versions','install-functions','load_config','load_cache') as $inc) {
                // Load the include
-               loadIncludeOnce($inc);
+               loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
 
-       // Init filter system here
-       initFilterSystem();
-
-       // Are we installation routine?
-       if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
-               // You have to install first!
+       // Check wether we are in installation routine
+       if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
+               // Redirect to the URL
                redirectToUrl('install.php');
        } // END - if
-
-       // Load cache
-       loadIncludeOnce('inc/load_cache.php');
-
-       // Run the init filter chain
-       runFilterChain('init');
 }
 
 // Handle fatal errors