X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=inc%2Fdatabase.php;h=cc4d384643876ada9859522cf9a83a0e7aec706e;hp=99611eabc51d88cd913fe97ecd95c70b6dca9fa7;hb=05f1e91cc36a525f2a281a6ed374cf3d5eb7cf81;hpb=b912eda46059527fc0475e043944c3ebff47fbcd

diff --git a/inc/database.php b/inc/database.php
index 99611ea..cc4d384 100644
--- 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
  * @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
@@ -29,12 +29,16 @@ $layer = null;
 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)");
+E.g.:<pre>&#36;cfg->defineDatabaseType(&quot;local&quot;);</pre>
+This will choose the local file-based database layer.");
 }
 
 // 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",
+	PATH,
+	_DB_TYPE,
+	FrameworkConfiguration::getInstance()->readConfig('php_extension')
+);
 
 // Load the database layer include
 if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
@@ -54,34 +58,34 @@ unset($INC);
 try {
 	$db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layer);
 } catch (NullPointerException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Datenbank-System nicht initialisiert. Reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
 		$e->getMessage()
 	));
 } catch (InvalidDirectoryResourceException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Datenbank-System nicht initialisiert. Reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
 		$e->getMessage()
 	));
 } catch (PathIsEmptyException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Datenbank-System nicht initialisiert. Reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
 		$e->getMessage()
 	));
 } catch (PathIsNoDirectoryException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Datenbank-System nicht initialisiert. Reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
 		$e->getMessage()
 	));
 } catch (PathReadProtectedException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Datenbank-System nicht initialisiert. Reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
 		$e->getMessage()
 	));
 } catch (DirPointerNotOpenedException $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Datenbank-System nicht initialisiert. Reason: <strong>%s</strong><br />\n",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] Database sub-system not initialized for the follwing reason: <strong>%s</strong><br />\n",
 		$e->getMessage()
 	));
 }
 
 // Datenbankobjekt debuggen
 if (defined('DEBUG_DATABASE_OBJ')) {
-	DebugMiddleware::getInstance()->output(sprintf("Die Datenbank-Schicht sieht wie folgt aus:<br />
+	DebugMiddleware::getInstance()->output(sprintf("The database sub-system does now look like this:<br />
 <pre>%s</pre>\n",
 		print_r($db, true)
 	));