X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fuser%2Fclass_BaseUser.php;h=ed832a9702025e7787bbd1c59ef92fc0be9f2d00;hp=e9ce25c3f45061a9b66c7361fc2372ab5960d8ee;hb=75b77629c6bd94d453d9d4208e2cae76f3d64be5;hpb=d0b833b090c7cb50e075e4b08d052d415780faa0

diff --git a/inc/classes/main/user/class_BaseUser.php b/inc/classes/main/user/class_BaseUser.php
index e9ce25c..ed832a9 100644
--- a/inc/classes/main/user/class_BaseUser.php
+++ b/inc/classes/main/user/class_BaseUser.php
@@ -22,6 +22,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class BaseUser extends BaseFrameworkSystem {
+	// Exception constances
+	const EXCEPTION_USERNAME_NOT_FOUND   = 0x150;
+	const EXCEPTION_USER_EMAIL_NOT_FOUND = 0x151;
+	const EXCEPTION_USER_PASS_MISMATCH   = 0x152;
+
 	/**
 	 * Username of current user
 	 */
@@ -47,38 +52,6 @@ class BaseUser extends BaseFrameworkSystem {
 		$this->removeSystemArray();
 	}
 
-	/**
-	 * "Getter" for databse entry
-	 *
-	 * @return	$entry	An array with database entries
-	 * @throws	NullPointerException	If the database result is not found
-	 * @throws	InvalidDatabaseResultException	If the database result is invalid
-	 */
-	private function getDatabaseEntry () {
-		// Is there an instance?
-		if (is_null($this->getResultInstance())) {
-			// Throw new exception
-			throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-		} // END - if
-
-		// Rewind it
-		$this->getResultInstance()->rewind();
-
-		// Do we have an entry?
-		if (!$this->getResultInstance()->valid()) {
-			throw new InvalidDatabaseResultException(array($this, $this->getResultInstance()), DatabaseResult::EXCEPTION_INVALID_DATABASE_RESULT);
-		} // END - if
-
-		// Get next entry
-		$this->getResultInstance()->next();
-
-		// Fetch it
-		$entry = $this->getResultInstance()->current();
-
-		// And return it
-		return $entry;
-	}
-
 	/**
 	 * Setter for username
 	 *
@@ -187,6 +160,15 @@ class BaseUser extends BaseFrameworkSystem {
 		if ($this->getResultInstance()->next()) {
 			// Entry found
 			$exists = true;
+
+			// Is the username set?
+			if ($this->getUserName() == "") {
+				// Get current entry
+				$currEntry = $this->getResultInstance()->current();
+
+				// Set the username
+				$this->setUserName($currEntry['username']);
+			} // END - if
 		} // END - if
 
 		// Return the status
@@ -247,36 +229,12 @@ class BaseUser extends BaseFrameworkSystem {
 		if (isset($entry['pass_hash'])) {
 			// Get it
 			$passHash = $entry['pass_hash'];
-		}
+		} // END - if
 
 		// And return the hash
 		return $passHash;
 	}
 
-	/**
-	 * Getter for field name
-	 *
-	 * @param	$fieldName		Field name which we shall get
-	 * @return	$fieldValue		Field value from the user
-	 * @todo	Do we need to secure this here against missing results?
-	 */
-	public final function getField ($fieldName) {
-		// Default field value
-		$fieldValue = null;
-
-		// Get current array
-		$fieldArray = $this->getResultInstance()->current();
-
-		// Does the field exist?
-		if (isset($fieldArray[$fieldName])) {
-			// Get it
-			$fieldValue = $fieldArray[$fieldName];
-		} // END - if
-
-		// Return it
-		return $fieldValue;
-	}
-
 	/**
 	 * Getter for primary key value
 	 *