Fixes for image generation

[shipsimu.git] / inc / database.php

diff --git a/inc/database.php b/inc/database.php
index ad29f0e495bf58a3c731bd70e596c30de1701f8d..03bc377ac5d781427711d319ddd2a873b9f8202a 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -2,11 +2,11 @@
 /**
  * Initializes the database layer
  *
- * @author             Roland Haeder <webmaster@mxchange.org>
+ * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.ship-simu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,18 +23,17 @@
  */
 
 // Initialize layer
-$layer = null;
+$layerInstance = null;
 
-// Is the type defined?
-if (!defined('_DB_TYPE')) {
-       // Abort here
-       ApplicationEntryPoint::app_die("[Main:] Please define a database type first!<br />
-E.g.:<pre>&#36;GLOBALS[&#39;cfg&#39]->defineDatabaseType(&quot;local&quot;);</pre>
-This will choose the local-file-based database type (layer)");
-}
+// Get config instance
+$cfg = FrameworkConfiguration::getInstance();
 
 // Generate FQFN for the database layer
-$INC = sprintf("%sinc/database/lib-%s%s", PATH, _DB_TYPE, FrameworkConfiguration::getInstance()->readConfig("php_extension"));
+$INC = sprintf("%sinc/database/lib-%s%s",
+       $cfg->readConfig('base_path'),
+       $cfg->readConfig('db_type'),
+       $cfg->readConfig('php_extension')
+);
 
 // Load the database layer include
 if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
@@ -43,7 +42,7 @@ if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
 } else {
        // Layer is missing!
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -&gt; R.I.P.",
-               _DB_TYPE
+               $cfg->readConfig('db_type')
        ));
 }
 
@@ -52,7 +51,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()