X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fuser%2Fextended%2Fclass_ShipSimuMember.php;h=a37ef16ff5616ffc9f834d1a3ea6f04cb581e1d3;hp=5efdf8de819c0408b30593e7b309e98ef3f30d0a;hb=4f70843ae8428f051d70ccff5bb43fc4c03dda8d;hpb=2b7c3e43b2fe0f3c5ae0455d13fa7743b638049f

diff --git a/application/ship-simu/main/user/extended/class_ShipSimuMember.php b/application/ship-simu/main/user/extended/class_ShipSimuMember.php
index 5efdf8d..a37ef16 100644
--- a/application/ship-simu/main/user/extended/class_ShipSimuMember.php
+++ b/application/ship-simu/main/user/extended/class_ShipSimuMember.php
@@ -2,11 +2,11 @@
 /**
  * A special member class for Ship-Simu
  *
- * @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 Ship-Simu 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
@@ -55,7 +55,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
 	 * @return	$userInstance	An instance of this user class
 	 * @throws	UsernameMissingException	If the username does not exist
 	 */
-	public final static function createMemberByUsername ($userName) {
+	public static final function createMemberByUsername ($userName) {
 		// Get a new instance
 		$userInstance = new ShipSimuMember();
 
@@ -79,7 +79,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
 	 * @param	$email			Email address of the user
 	 * @return	$userInstance	An instance of this user class
 	 */
-	public final static function createMemberByEmail ($email) {
+	public static final function createMemberByEmail ($email) {
 		// Get a new instance
 		$userInstance = new ShipSimuMember();
 
@@ -97,7 +97,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
 	 * @return	$userInstance		An instance of this user class
 	 * @todo	Add more ways of creating user instances
 	 */
-	public final static function createMemberByRequest (Requestable $requestInstance) {
+	public static final function createMemberByRequest (Requestable $requestInstance) {
 		// Determine if by email or username
 		if (!is_null($requestInstance->getRequestElement('username'))) {
 			// Username supplied
@@ -131,7 +131,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
 
 		// If there is no action use the default on
 		if (is_null($lastAction)) {
-			$lastAction = $this->getConfigInstance()->readConfig('login_default_action');
+			$lastAction = $this->getConfigInstance()->getConfigEntry('login_default_action');
 		} // END - if
 
 		// Get a critieria instance
@@ -145,8 +145,8 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
 		$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);
@@ -159,15 +159,23 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
 	}
 
 	/**
-	 * Books the given 'amount' in the request instance on the users "points
-	 * account"
+	 * Books the given 'amount' in the request instance on the users 'points
+	 * account'
 	 *
 	 * @param	$requestInstance	An instance of a Requestable class
 	 * @return	void
 	 */
 	public function bookAmountDirectly (Requestable $requestInstance) {
-		// Get the points class from registry
-		$pointsInstance = Registry::getRegistry()->getInstance('points');
+		// Init points instance
+		$pointsInstance = null;
+
+		try {
+			// Get the points class from registry
+			$pointsInstance = Registry::getRegistry()->getInstance('points');
+		} catch (NullPointerException $e) {
+			// Instance not found in registry
+			// @TODO We should log this later
+		}
 
 		// Is the points instance null?
 		if (is_null($pointsInstance)) {