X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=28ad6743294a12264742e7477afce852a5e82453;hp=b9f40fa65476b01527c70577a9b79893124a9035;hb=39c1aaf705e8e3c274d56ef1fa931a086f729c48;hpb=7a41f3cbb6640f18a4205ef367de6bf050020ed6

diff --git a/inc/database.php b/inc/database.php
index b9f40fa6..28ad6743 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -2,11 +2,13 @@
 /**
  * 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 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 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
@@ -22,26 +24,20 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Initialize layer
-$layerInstance = null;
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
+// Initialize database layer
+$databaseInstance = NULL;
 
 // Generate FQFN for the database layer
-$fqfn = sprintf("%sinc/database/lib-%s.php",
-	$cfg->readConfig('base_path'),
-	$cfg->readConfig('db_type')
-);
+$fqfn = FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type') . '.php';
 
 // Load the database layer include
-if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
+if (BaseFrameworkSystem::isReadableFile($fqfn)) {
 	// Load the layer
-	require_once($fqfn);
+	require($fqfn);
 } else {
 	// Layer is missing!
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
-		$cfg->readConfig('db_type')
+	ApplicationEntryPoint::app_exit(sprintf('[Main:] Database layer is missing! (%s) -&gt; R.I.P.',
+		FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
 	));
 }
 
@@ -49,11 +45,8 @@ if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
 unset($fqfn);
 
 // Prepare database instance
-$db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);
+$connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getSelfInstance(), $databaseInstance);
 
 // Is the app variable there and valid?
 // @TODO Rewrite this
-if (is_object($app)) $app->setDatabaseInstance($db);
-
-// [EOF]
-?>
+if (is_object($app)) $app->setDatabaseInstance($connectionInstance);