Added missing initSession() call.

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 77eb4bb074d33739ebbd9d06ebbffb458c45abcc..d3c8afd80de9953d1bb5d211368738cba41b7527 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Verbindet zu Ihrer Datenbank                     *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,6 +35,9 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
+// Init array
+$__functions = array();
+
 // Init include file array as it follows same naming scheme
 foreach ( array(
                'stats',
@@ -50,22 +48,26 @@ foreach ( array(
                'request',
                'session',
                'code',
+               'pool',
                'language',
                'sql',
                'expression',
                'filter',
-               'revision',
                'extensions') as $lib) {
-       // Load special functions
-       loadIncludeOnce('inc/' . $lib . '-functions.php');
+
+       // Add it
+       array_push($__functions, $lib . '-functions');
 } // END - foreach
 
 // Load more function libraries or includes
-foreach (array('filters', 'mysql-manager', 'handler') as $lib) {
+foreach (array_merge($__functions, array('filters', 'mysql-manager', 'handler')) as $lib) {
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
 
+// Remove array
+unset($__functions);
+
 // Set error handler
 set_error_handler('__errorHandler');
 
@@ -89,14 +91,11 @@ if (!isset($GLOBALS['__header_sent'])) {
 // Init fatal messages
 initFatalMessages();
 
-// Init repository data sub-system
-initRepositoryData();
-
 // Enable HTML templates by default
 enableTemplateHtml();
 
 // Are we in installation phase?
-if ((!isInstalling()) && (!isInstallationPhase())) {
+if ((!isInstaller()) && (isInstalled())) {
        // Load configuration file(s) here
        loadIncludeOnce('inc/load_config.php');
 
@@ -111,6 +110,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
        // Initialize SQL link
        initSqlLink();
+
+       // Init session
+       initSession();
 } else {
        // Default output is 'direct' for HTML output
        setConfigEntry('OUTPUT_MODE', 'direct');
@@ -122,7 +124,10 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        } // END - if
 
        // CFG: DATABASE-TYPE
-       setConfigEntry('_DB_TYPE', 'mysql3');
+       setConfigEntry('_DB_TYPE', 'mysql');
+
+       // Set link as down
+       unsetSqlLinkUp(__FILE__, __LINE__);
 
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
@@ -130,9 +135,12 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        // Init message system
        initMessages();
 
+       // Init session
+       initSession();
+
        // Include more
-       foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) {
-               // Load the include
+       foreach (array('databases', 'install-functions', 'load_config', 'load_cache') as $inc) {
+               // Load include file
                loadIncludeOnce('inc/' . $inc . '.php');
        } // END - foreach