Theme renamed, missing dash added (minor fixes)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index bd91776d29aeff97a51e04932384e6dc5c7c8c9e..82e55ff7195d9c9de1c474ded915104adbdf9398 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 *
@@ -71,6 +72,9 @@ initFatalMessages();
 // Init message system
 initMessages();
 
+// Enable HTML templates by default
+enableTemplateHtml();
+
 // Are we in installation phase?
 if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load configuration file(s) here
@@ -82,7 +86,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // 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__);
 
@@ -117,15 +121,15 @@ 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 {
        ///////////////////////////////////////////////////
@@ -150,20 +154,17 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                loadIncludeOnce($inc);
        } // END - foreach
 
-       // Init filter system here
-       initFilterSystem();
+       // Load cache
+       loadIncludeOnce('inc/load_cache.php');
+
+       // Run the init filter chain
+       runFilterChain('init');
 
        // Are we installation routine?
        if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
                // You have to install first!
                redirectToUrl('install.php');
        } // END - if
-
-       // Load cache
-       loadIncludeOnce('inc/load_cache.php');
-
-       // Run the init filter chain
-       runFilterChain('init');
 }
 
 // Handle fatal errors