X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=52d7506032cc4ae0fdb093a9334b7ae664fe9357;hp=8dd90e46da5f2d9169f3d3280612742550664ff9;hb=abb8bf6be9f5238f8a4552707bcb190f0dbf0b7a;hpb=55b327a3f5f2fe1d244532e07be7444e94b2a768

diff --git a/inc/database.php b/inc/database.php
index 8dd90e4..52d7506 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -23,21 +23,15 @@
  */
 
 // Initialize layer
-$layer = null;
+$layerInstance = null;
 
-// Is the type defined?
-if (!defined('_DB_TYPE')) {
-	// Abort here
-	ApplicationEntryPoint::app_die("[Main:] Please define a database type first!<br />
-E.g.:<pre>&#36;GLOBALS[&#39;cfg&#39]->defineDatabaseType(&quot;local&quot;);</pre>
-This will choose the local-file-based database type (layer)");
-}
+// Get config instance
+$cfg = FrameworkConfiguration::getInstance();
 
 // Generate FQFN for the database layer
-$INC = sprintf("%sinc/database/lib-%s%s",
-	PATH,
-	_DB_TYPE,
-	FrameworkConfiguration::getInstance()->readConfig('php_extension')
+$INC = sprintf("%sinc/database/lib-%s.php",
+	$cfg->readConfig('base_path'),
+	$cfg->readConfig('db_type')
 );
 
 // Load the database layer include
@@ -47,7 +41,7 @@ if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
 } else {
 	// Layer is missing!
 	ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
-		_DB_TYPE
+		$cfg->readConfig('db_type')
 	));
 }
 
@@ -56,7 +50,7 @@ unset($INC);
 
 // Prepare database instance
 try {
-	$db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layer);
+	$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",
 		$e->getMessage()
@@ -83,6 +77,9 @@ try {
 	));
 }
 
+// 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 />