X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=de0c7d88443a68397395c1838d609cb3d05622a6;hp=03bc377ac5d781427711d319ddd2a873b9f8202a;hb=558b417d946a1a6cee5278e86b5ed042afb3aad6;hpb=886d3459eb15f9bc6b15051b2fe2d3605c19a5d4

diff --git a/inc/database.php b/inc/database.php
index 03bc377ac5..de0c7d8844 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -29,10 +29,9 @@ $layerInstance = null;
 $cfg = FrameworkConfiguration::getInstance();
 
 // Generate FQFN for the database layer
-$INC = sprintf("%sinc/database/lib-%s%s",
+$INC = sprintf("%sinc/database/lib-%s.php",
 	$cfg->readConfig('base_path'),
-	$cfg->readConfig('db_type'),
-	$cfg->readConfig('php_extension')
+	$cfg->readConfig('db_type')
 );
 
 // Load the database layer include
@@ -53,31 +52,34 @@ unset($INC);
 try {
 	$db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);
 } catch (NullPointerException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
 		$e->getMessage()
 	));
 } catch (InvalidDirectoryResourceException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
 		$e->getMessage()
 	));
 } catch (PathIsEmptyException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
 		$e->getMessage()
 	));
 } catch (PathIsNoDirectoryException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
 		$e->getMessage()
 	));
 } catch (PathReadProtectedException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
 		$e->getMessage()
 	));
 } catch (DirPointerNotOpenedException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <span class=\"exception_reason\">%s</span><br />\n",
 		$e->getMessage()
 	));
 }
 
+// Is the app variable there and valid?
+if (is_object($app)) $app->setDatabaseInstance($db);
+
 // Datenbankobjekt debuggen
 if (defined('DEBUG_DATABASE_OBJ')) {
 	DebugMiddleware::getInstance()->output(sprintf("The database sub-system does now look like this:<br />