X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmiddleware%2Fdatabase%2Fclass_DatabaseConnection.php;h=3e3332c3da6ed66fe232aae16abc37b5fc80d57e;hb=4cfe82256d609b7d6cdffb7baa2286bd026040d5;hp=20a1e14df7c2a2fd981b11616a462b6191ea7e9e;hpb=7a41f3cbb6640f18a4205ef367de6bf050020ed6;p=core.git

diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php
index 20a1e14d..3e3332c3 100644
--- a/inc/classes/middleware/database/class_DatabaseConnection.php
+++ b/inc/classes/middleware/database/class_DatabaseConnection.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -33,42 +33,42 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 	);
 
 	// The real database layer
-	private $dbLayer = null;
+	private $dbLayer = NULL;
 
 	// An instance of this class
-	private static $thisInstance = null;
+	private static $selfInstance = NULL;
 
 	/**
 	 * Protected constructor
 	 *
 	 * @return	void
 	 */
-	protected function __construct() {
+	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
 
 	// Create new database connection layer
-	public final static function createDatabaseConnection (DebugMiddleware $debugInstance, DatabaseFrontendInterface $dbLayer) {
+	public static final function createDatabaseConnection (DebugMiddleware $debugInstance, DatabaseBackendInterface $dbLayer) {
 		// Get instance
-		$dbInstance = new DatabaseConnection();
+		$databaseInstance = new DatabaseConnection();
 
 		// Set debug output handler
-		$dbInstance->setDebugInstance($debugInstance);
+		$databaseInstance->setDebugInstance($debugInstance);
 
 		// Set database layer
-		$dbInstance->setDatabaseLayer($dbLayer);
+		$databaseInstance->setDatabaseLayer($dbLayer);
 
 		// Set db instance
-		self::$thisInstance = $dbInstance;
+		self::$selfInstance = $databaseInstance;
 
 		// Return instance
-		return $dbInstance;
+		return $databaseInstance;
 	}
 
 	// Get an instance of this class
-	public final static function getInstance () {
-		return self::$thisInstance;
+	public static final function getSelfInstance () {
+		return self::$selfInstance;
 	}
 
 	// Public setter for database connection
@@ -94,7 +94,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 	 * @param	$dbLayer	An instance of the real database layer
 	 * @return	void
 	 */
-	public final function setDatabaseLayer (DatabaseFrontendInterface $dbLayer) {
+	public final function setDatabaseLayer (DatabaseBackendInterface $dbLayer) {
 		$this->dbLayer = $dbLayer;
 	}
 
@@ -120,7 +120,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 		$this->dbLayer->connectToDatabase();
 
 		// Get result from query
-		$result = $this->dbLayer->querySelect('array', $tableName, $criteriaInstance);
+		$result = $this->dbLayer->querySelect($tableName, $criteriaInstance);
 
 		// Return the result
 		return $result;