renamed lib-local.php -> lib-lfdb.php because it really loads the "legendary"

[core.git] / inc / database.php

diff --git a/inc/database.php b/inc/database.php
index aa5ad74176fe52fad2ea870b2de516bf10e34a03..c54d1d9c6880780dbf71d5ab585aba1d120c8a85 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -1,4 +1,10 @@
 <?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
  *
@@ -28,7 +34,11 @@
 $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 (BaseFrameworkSystem::isReadableFile($fqfn)) {
@@ -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