X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=c54d1d9c6880780dbf71d5ab585aba1d120c8a85;hp=f2b5632f7512a16e5f46ae1fbe7c10ccc815704a;hb=7629f2314d517561d4301ddfb068a797b6ed8700;hpb=d0b4c6f14572b8f390b357dcf48082632e53d458

diff --git a/inc/database.php b/inc/database.php
index f2b5632f..c54d1d9c 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -1,12 +1,20 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Connection\Database\DatabaseConnection;
+use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Middleware\Debug\DebugMiddleware;
+
 /**
  * Initializes the database layer
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
+ * @deprecated
+ * @todo		Minimize these includes
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,19 +31,23 @@
  */
 
 // Initialize database layer
-$databaseInstance = null;
+$databaseInstance = NULL;
 
 // Generate FQFN for the database layer
-$fqfn = FrameworkConfiguration::getInstance()->readConfig('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getInstance()->readConfig('db_type') . '.php';
+$fqfn = sprintf(
+	'%sinc/database/lib-%s.php',
+	FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path'),
+	FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
+);
 
 // Load the database layer include
-if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
+if (BaseFrameworkSystem::isReadableFile($fqfn)) {
 	// Load the layer
 	require($fqfn);
 } else {
 	// Layer is missing!
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
-		FrameworkConfiguration::getInstance()->readConfig('db_type')
+	ApplicationEntryPoint::app_exit(sprintf('[Main:] Database layer is missing! (%s) -&gt; R.I.P.',
+		FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
 	));
 }
 
@@ -43,11 +55,10 @@ if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
 unset($fqfn);
 
 // Prepare database instance
-$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $databaseInstance);
+$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getSelfInstance(), $databaseInstance);
 
 // Is the app variable there and valid?
 // @TODO Rewrite this
-if (is_object($app)) $app->setDatabaseInstance($connectionInstance);
-
-// [EOF]
-?>
+if (is_object($app)) {
+	$app->setDatabaseInstance($connectionInstance);
+} // END - if