Payment introduced, minor rewrites

[shipsimu.git] / inc / database.php

diff --git a/inc/database.php b/inc/database.php
index 7f9003a897139e76bd3ff8f31c72c1243702b8f6..52d7506032cc4ae0fdb093a9334b7ae664fe9357 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -23,16 +23,15 @@
  */
 
 // Initialize layer
-$layer = null;
+$layerInstance = null;
 
 // Get config instance
 $cfg = FrameworkConfiguration::getInstance();
 
 // Generate FQFN for the database layer
-$INC = sprintf("%sinc/database/lib-%s%s",
+$INC = sprintf("%sinc/database/lib-%s.php",
        $cfg->readConfig('base_path'),
-       $cfg->readConfig('db_type'),
-       $cfg->readConfig('php_extension')
+       $cfg->readConfig('db_type')
 );
 
 // Load the database layer include
@@ -51,7 +50,7 @@ unset($INC);
 
 // Prepare database instance
 try {
-       $db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layer);
+       $db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);
 } catch (NullPointerException $e) {
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
                $e->getMessage()
@@ -78,6 +77,9 @@ try {
        ));
 }
 
+// Is the app variable there and valid?
+if (is_object($app)) $app->setDatabaseInstance($db);
+
 // Datenbankobjekt debuggen
 if (defined('DEBUG_DATABASE_OBJ')) {
        DebugMiddleware::getInstance()->output(sprintf("The database sub-system does now look like this:<br />