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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 3514b82a4b..a6ef2e98e2 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -11,7 +11,7 @@
  * Kurzbeschreibung  : Verbindet zu Ihrer Datenbank                     *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 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 *
@@ -52,6 +52,7 @@ foreach ( array(
 		'language',
 		'sql',
 		'expression',
+		'encryption',
 		'filter',
 		'extensions') as $lib) {
 
@@ -120,8 +121,21 @@ if ((!isInstaller()) && (isInstalled())) {
 		setConfigEntry('OUTPUT_MODE', 'render');
 	} // END - if
 
-	// CFG: DATABASE-TYPE
-	setConfigEntry('_DB_TYPE', 'mysql');
+	// 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__);