X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fuser%2Fclass_ShipSimuBaseUser.php;h=96a107f666b881d7c0da4e95b01b34474bda2ded;hp=243218adc230a6e40a9277e0ca35b9b177b705f8;hb=2b7c3e43b2fe0f3c5ae0455d13fa7743b638049f;hpb=7218cb584f42412c13d8ae39b89c82a584a85b31

diff --git a/application/ship-simu/main/user/class_ShipSimuBaseUser.php b/application/ship-simu/main/user/class_ShipSimuBaseUser.php
index 243218a..96a107f 100644
--- a/application/ship-simu/main/user/class_ShipSimuBaseUser.php
+++ b/application/ship-simu/main/user/class_ShipSimuBaseUser.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @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
  *
@@ -76,7 +76,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
 		// Is there an instance?
 		if (is_null($pointsInstance)) {
 			// Then create one
-			$pointsInstance = ObjectFactory::createObjectByConfiguredName('user_ppints_class', array($this));
+			$pointsInstance = ObjectFactory::createObjectByConfiguredName('user_points_class', array($this));
 
 			// And store it in registry
 			Registry::getRegistry()->addInstance('points', $pointsInstance);
@@ -90,28 +90,28 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
 	}
 
 	/**
-	 * Determines if goverment can still pay a "virtual training course" in general
+	 * Determines if government can still pay a "virtual training course" in general
 	 *
-	 * @return	$ifGovHelps		Wether if goverment helps the user with a virtual training course
+	 * @return	$ifGovHelps		Wether if government helps the user with a virtual training course
 	 */
 	public function ifGovernmentPaysTraining () {
 		// By default they want to help.
 		$ifGovHelps = true;
 
-		// First get a goverment instance from registry
-		$govermentInstance = Registry::getRegistry()->getInstance('goverment');
+		// First get a government instance from registry
+		$governmentInstance = Registry::getRegistry()->getInstance('government');
 
 		// Is it there?
-		if (is_null($govermentInstance)) {
+		if (is_null($governmentInstance)) {
 			// Then create a new one
-			$govermentInstance = ObjectFactory::createObjectByConfiguredName('goverment_class', array($this));
+			$governmentInstance = ObjectFactory::createObjectByConfiguredName('government_class', array($this));
 
 			// Store it in registry
-			Registry::getRegistry()->addInstance('goverment', $govermentInstance);
+			Registry::getRegistry()->addInstance('government', $governmentInstance);
 		} // END - if
 
-		// Then ask the goverment if they want to pay a "startup help" to the user
-		if ($govermentInstance->ifGovernmentAlreadyPayedTraining()) {
+		// Then ask the government if they want to pay a "startup help" to the user
+		if ($governmentInstance->ifGovernmentAlreadyPayedTraining()) {
 			// Training already given!
 			$ifGovHelps = false;
 		} // END - if
@@ -121,28 +121,28 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
 	}
 
 	/**
-	 * Determines if goverment can still pay a "startup help" to the user
+	 * Determines if government can still pay a "startup help" to the user
 	 *
-	 * @return	$ifGovHelps		Wether if goverment helps the user with some startup money
+	 * @return	$ifGovHelps		Wether if government helps the user with some startup money
 	 */
 	public function ifGovernmentPaysStartupHelp () {
 		// By default they want to help.
 		$ifGovHelps = true;
 
-		// First get a goverment instance from registry
-		$govermentInstance = Registry::getRegistry()->getInstance('goverment');
+		// First get a government instance from registry
+		$governmentInstance = Registry::getRegistry()->getInstance('government');
 
 		// Is it there?
-		if (is_null($govermentInstance)) {
+		if (is_null($governmentInstance)) {
 			// Then create a new one
-			$govermentInstance = ObjectFactory::createObjectByConfiguredName('goverment_class', array($this));
+			$governmentInstance = ObjectFactory::createObjectByConfiguredName('government_class', array($this));
 
 			// Store it in registry
-			Registry::getRegistry()->addInstance('goverment', $govermentInstance);
+			Registry::getRegistry()->addInstance('government', $governmentInstance);
 		} // END - if
 
-		// Then ask the goverment if they want to pay a "startup help" to the user
-		if ($govermentInstance->ifGovernmentPayedMaxmimumStartupHelp()) {
+		// Then ask the government if they want to pay a "startup help" to the user
+		if ($governmentInstance->ifGovernmentPayedMaxmimumStartupHelp()) {
 			// They can't pay anymore to the user (excited amount)
 			$ifGovHelps = false;
 		} // END - if