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

diff --git a/inc/database.php b/inc/database.php
index 7a008ece..c54d1d9c 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -1,12 +1,18 @@
 <?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 - 2012 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
  *
@@ -28,15 +34,19 @@
 $databaseInstance = NULL;
 
 // Generate FQFN for the database layer
-$fqfn = FrameworkConfiguration::getSelfInstance()->getConfigEntry('base_path') . 'inc/database/lib-' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('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_exit(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
+	ApplicationEntryPoint::app_exit(sprintf('[Main:] Database layer is missing! (%s) -&gt; R.I.P.',
 		FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
 	));
 }
@@ -49,7 +59,6 @@ $connectionInstance = DatabaseConnection::createDatabaseConnection(DebugMiddlewa
 
 // 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