X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=a6ef2e98e245182a1c4cfd33cb95f3745c65a220;hb=987bf5583fce2696a1c6b2b72b123747b4cd4536;hp=77eb4bb074d33739ebbd9d06ebbffb458c45abcc;hpb=52df1e5bd6f47fa516c1b4dc675f8dcb27d56b71;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 77eb4bb074..a6ef2e98e2 100644
--- 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 - 2015 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,27 @@ foreach ( array(
 		'request',
 		'session',
 		'code',
+		'pool',
 		'language',
 		'sql',
 		'expression',
+		'encryption',
 		'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 +92,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');
 
@@ -121,8 +121,24 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 		setConfigEntry('OUTPUT_MODE', 'render');
 	} // END - if
 
-	// CFG: DATABASE-TYPE
-	setConfigEntry('_DB_TYPE', 'mysql3');
+	// Debug message
+	/* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'isAjaxOutputMode()=' . intval(isAjaxOutputMode()) . ',isSessionVariableSet(database_extension)=' . intval(isSessionVariableSet('database_extension')));
+
+	// Is it AJAX call and database_extension is set?
+	if ((isAjaxOutputMode()) && (isSessionVariableSet('database_extension'))) {
+		// Then take it from session
+		/* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Setting _DB_TYPE from session;database_extension=' . getSession('database_extension'));
+		setConfigEntry('_DB_TYPE', getSession('database_extension'));
+	} else {
+		// Debug message
+		/* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Setting _DB_TYPE to default (mysql) ...');
+
+		// Set (old) default
+		setConfigEntry('_DB_TYPE', 'mysql');
+	}
+
+	// Set link as down
+	unsetSqlLinkUp(__FILE__, __LINE__);
 
 	// Load database layer here
 	loadIncludeOnce('inc/db/lib.php');
@@ -130,9 +146,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