Missing bonus mode 'ADD' added

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 70a3ef45b937a4b67ba104c3266a85d63b94f39b..7369be9ae6517cdc3d51edbbc2f02b3037f59c96 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,8 @@ 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();
@@ -83,6 +81,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
+       // Init message system
+       initMessages();
+
        // CSS array
        initExtensionCssFiles();
 
@@ -128,7 +129,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                        addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
                }
        } else {
-               // Maybe you forgot to enter your MySQL data?
+               // Maybe you forgot to enter your database login?
                addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
        }
 } else {
@@ -144,11 +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('db/lib','databases','session','versions','install-functions','load_config','load_cache') as $inc) {
+       foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) {
                // Load the include
                loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach
+
+       // Check wether we are in installation routine
+       if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
+               // Redirect to the URL
+               redirectToUrl('install.php');
+       } // END - if
 }
 
 // Handle fatal errors