X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fdatabase%2Fwrapper%2Fclass_UserDatabaseWrapper.php;h=d68f2883cff5a6204404d3e6416ae68cdd6c0af1;hp=9687d4ab6e74e6738e664fe1a9975471fc9893f9;hb=1a91dabdfed365947d1ce11675aacae9d424edff;hpb=1e58a8d1ef99b38855c8d9d72ce18e9cdd0f1f08

diff --git a/inc/classes/main/database/wrapper/class_UserDatabaseWrapper.php b/inc/classes/main/database/wrapper/class_UserDatabaseWrapper.php
index 9687d4ab..d68f2883 100644
--- a/inc/classes/main/database/wrapper/class_UserDatabaseWrapper.php
+++ b/inc/classes/main/database/wrapper/class_UserDatabaseWrapper.php
@@ -2,11 +2,11 @@
 /**
  * A database wrapper for the User class
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.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
@@ -26,21 +26,21 @@ class UserDatabaseWrapper extends BaseDatabaseWrapper implements ManageableAccou
 	const EXCEPTION_CLIENT_USERNAME_NOT_FOUND = 0x180;
 
 	// Constants for database columns
-	const DB_COLUMN_USERID       = "userid";
-	const DB_COLUMN_USERNAME     = "username";
-	const DB_COLUMN_EMAIL        = "email";
-	const DB_COLUMN_CONFIRM_HASH = "confirm_hash";
-	const DB_COLUMN_USER_STATUS  = "user_status";
+	const DB_COLUMN_USERID       = 'userid';
+	const DB_COLUMN_USERNAME     = 'username';
+	const DB_COLUMN_EMAIL        = 'email';
+	const DB_COLUMN_CONFIRM_HASH = 'confirm_hash';
+	const DB_COLUMN_USER_STATUS  = 'user_status';
 
 	// Constants for database table names
-	const DB_TABLE_USER = "user";
+	const DB_TABLE_USER = 'user';
 
 	/**
 	 * Protected constructor
 	 *
 	 * @return	void
 	 */
-	protected function __construct() {
+	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -50,7 +50,7 @@ class UserDatabaseWrapper extends BaseDatabaseWrapper implements ManageableAccou
 	 *
 	 * @return	$wrapperInstance	An instance of the created wrapper class
 	 */
-	public final static function createUserDatabaseWrapper () {
+	public static final function createUserDatabaseWrapper () {
 		// Get a new instance
 		$wrapperInstance = new UserDatabaseWrapper();
 
@@ -61,15 +61,6 @@ class UserDatabaseWrapper extends BaseDatabaseWrapper implements ManageableAccou
 		return $wrapperInstance;
 	}
 
-	/**
-	 * Getter for index key
-	 *
-	 * @return	$indexKey	Index key
-	 */
-	public final function getIndexKey () {
-		return $this->getDatabaseInstance()->getIndexKey();
-	}
-
 	/**
 	 * Handles inserting the registration data from a registration instance into the database
 	 *
@@ -84,10 +75,10 @@ class UserDatabaseWrapper extends BaseDatabaseWrapper implements ManageableAccou
 		$dataSetInstance->setUniqueKey(self::DB_COLUMN_USERNAME);
 
 		// Add registration elements to the dataset
-		$registrationInstance->addElementsToDataSet($dataSetInstance);
+		$registrationInstance->addElementsToDataSet($dataSetInstance, NULL);
 
 		// "Insert" this request instance completely into the database
-		$this->getDatabaseInstance()->queryInsertDataSet($dataSetInstance);
+		$this->queryInsertDataSet($dataSetInstance);
 	}
 
 	/**
@@ -118,7 +109,7 @@ class UserDatabaseWrapper extends BaseDatabaseWrapper implements ManageableAccou
 			// Is it still null?
 			if (is_null($searchInstance)) {
 				// Throw an exception here
-				throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
+				throw new NullPointerException($updateInstance, self::EXCEPTION_IS_NULL_POINTER);
 			} // END - if
 		} // END - if
 
@@ -132,7 +123,7 @@ class UserDatabaseWrapper extends BaseDatabaseWrapper implements ManageableAccou
 		$dataSetInstance->setUniqueKey(self::DB_COLUMN_USERNAME);
 
 		// Add all update criteria to the database set
-		$resultInstance->addElementsToDataSet($dataSetInstance);
+		$resultInstance->addElementsToDataSet($dataSetInstance, NULL);
 
 		// "Update" this request with the database
 		$this->getDatabaseInstance()->queryUpdateDataSet($dataSetInstance);