X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmiddleware%2Fdatabase%2Fclass_DatabaseConnection.php;h=0a688c39638799f2a2d0cf01628ac2d21d350abf;hp=420421fd4f1ecb461e694153f6d24302206ed195;hb=768cc231b262ebeaa5aec373d9b7d97cc6b6ac95;hpb=3107989f93cfb5808ce9d75f1c7d2b7ee3d83d18

diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php
index 420421fd..0a688c39 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 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -33,46 +33,46 @@ 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 $thisInstance = 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, DatabaseFrontendInterface $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::$thisInstance = $databaseInstance;
 
 		// Return instance
-		return $dbInstance;
+		return $databaseInstance;
 	}
 
 	// Get an instance of this class
-	public final static function getInstance () {
+	public static final function getSelfInstance () {
 		return self::$thisInstance;
 	}
 
 	// Public setter for database connection
-	public final function setConnectionData ($login, $pass, $dbase, $host="localhost") {
+	public final function setConnectionData ($login, $pass, $dbase, $host='localhost') {
 		// Transfer connection data
 		$this->connectData['login'] = (string) $login;
 		$this->connectData['pass']  = (string) $pass;
@@ -108,10 +108,10 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 	}
 
 	/**
-	 * Runs a "select" statement on the database layer with given table name
+	 * Runs a 'select' statement on the database layer with given table name
 	 * and criteria. If this doesn't fail the result will be returned
 	 *
-	 * @param	$tableName			Name of the "table" we shall query
+	 * @param	$tableName			Name of the 'table' we shall query
 	 * @param	$criteriaInstance	An instance of a Criteria class
 	 * @return	$result				The result as an array
 	 */
@@ -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;
@@ -137,7 +137,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 	}
 
 	/**
-	 * "Inserts" a data set instance into a local file database folder
+	 * 'Inserts' a data set instance into a local file database folder
 	 *
 	 * @param	$dataSetInstance	A storeable data set
 	 * @return	void
@@ -151,7 +151,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
 	}
 
 	/**
-	 * "Updates" a data set instance with a database layer
+	 * 'Updates' a data set instance with a database layer
 	 *
 	 * @param	$dataSetInstance	A storeable data set
 	 * @return	void