X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=6bcb51535ef8774d45d01915e0720458e35e4cd6;hp=7402d6f1e8f7c05df6abdb819c323bd83d420906;hb=de1f271c2bdb43725f6671ea6588a44cf33bf091;hpb=1ee35e6d96c456b8e3499bd683f1647aa28bd501

diff --git a/inc/database.php b/inc/database.php
index 7402d6f1..6bcb5153 100644
--- a/inc/database.php
+++ b/inc/database.php
@@ -1,10 +1,15 @@
 <?php
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Middleware\Debug\DebugMiddleware;
+
 /**
  * Initializes the database layer
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 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.shipsimu.org
  * @deprecated
@@ -31,12 +36,12 @@ $databaseInstance = NULL;
 $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($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 +54,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