Continued:

[core.git] / inc / database.php

diff --git a/inc/database.php b/inc/database.php
index a028026d0261a8f04886fe0c21448f1b9fe16a71..01ab8471d4ee37dfe52b45ca1b5d86c92d20c9e7 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -1,10 +1,16 @@
 <?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@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 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 +37,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 +55,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