A lot CSS classes rewritten, please update all your themes.

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 45d1e87f67648beed2f9f92030aa12aafee867bc..40a86ef8f9ec909cde97e4f04ff6db6abec42b39 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load more function libraries or includes
-foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
+foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions','revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -71,8 +72,11 @@ initFatalMessages();
 // Init message system
 initMessages();
 
-// Check if this file is writeable or read-only and warn the user
-if (!isInstalling()) {
+// Enable HTML templates by default
+enableTemplateHtml();
+
+// Are we in installation phase?
+if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 
@@ -82,7 +86,7 @@ if (!isInstalling()) {
        // 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__);
 
@@ -102,9 +106,6 @@ if (!isInstalling()) {
                                // Load cache
                                loadIncludeOnce('inc/load_cache.php');
 
-                               // Run the init filter chain
-                               runFilterChain('init');
-
                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
@@ -120,26 +121,22 @@ if (!isInstalling()) {
                                }
                        } 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
@@ -148,28 +145,16 @@ if (!isInstalling()) {
        setConfigEntry('_DB_TYPE', 'mysql3');
 
        // Include more
-       foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       foreach (array('db/lib','databases','session','versions','install-functions','load_config','load_cache') as $inc) {
                // Load the include
-               loadIncludeOnce($inc);
+               loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
 
-       // Load config
-       loadIncludeOnce('inc/load_config.php');
-
-       // 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
-
-       // Init filter system here
-       initFilterSystem();
-
-       // Load cache
-       loadIncludeOnce('inc/load_cache.php');
-
-       // Run the init filter chain
-       runFilterChain('init');
 }
 
 // Handle fatal errors