X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fuser%2Fmember%2Fclass_Member.php;h=1b939c2013035a4962f3e559d8ed6cba9bfea7b1;hp=83ecf849e28f6cb41d520c2590e761ff72aee506;hb=cbd2f71aee1c3daca3d11acc346c79757852316f;hpb=607a11e2c22949ea0647568c17d62a605595e83b

diff --git a/inc/classes/main/user/member/class_Member.php b/inc/classes/main/user/member/class_Member.php
index 83ecf849..1b939c20 100644
--- a/inc/classes/main/user/member/class_Member.php
+++ b/inc/classes/main/user/member/class_Member.php
@@ -2,11 +2,11 @@
 /**
  * A generic class for handling users
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 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
@@ -40,6 +40,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
 	 * @param	$userName		Username we need a class instance for
 	 * @return	$userInstance	An instance of this user class
 	 * @throws	UsernameMissingException	If the username does not exist
+	 * @throws	UnexpectedGuestAccountException		If the user status is 'guest'
 	 */
 	public static final function createMemberByUsername ($userName) {
 		// Get a new instance
@@ -49,10 +50,13 @@ class Member extends BaseUser implements ManageableMember, Registerable {
 		$userInstance->setUserName($userName);
 
 		// Check if username exists
-		if ($userInstance->ifUsernameExists() === false) {
+		if ($userInstance->ifUsernameExists() === FALSE) {
 			// Throw an exception here
 			throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND);
-		} // END - if
+		} elseif ($userInstance->isGuest()) === TRUE) {
+			// User should not be a guest here
+			throw new UnexpectedGuestAccountException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND);
+		}
 
 		// Return the instance
 		return $userInstance;
@@ -130,8 +134,8 @@ class Member extends BaseUser implements ManageableMember, Registerable {
 		$updateInstance = ObjectFactory::createObjectByConfiguredName('update_criteria_class');
 
 		// And add our both entries
-		$updateInstance->addCriteria("last_activity", date("Y-m-d H:i:s", time()));
-		$updateInstance->addCriteria("last_action", $lastAction);
+		$updateInstance->addCriteria('last_activity', date('Y-m-d H:i:s', time()));
+		$updateInstance->addCriteria('last_action', $lastAction);
 
 		// Add the search criteria for searching for the right entry
 		$updateInstance->setSearchInstance($searchInstance);