X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fmain%2Fclass_BasePersonell.php;h=f59e8cfe9e46dada873e857e7ecb270dd37d0bf4;hb=b42af148ba24a4e22bb54d596635a9e4e59260da;hp=744c160f7bd0c99505692b2d6f611d2b2e1c3dc1;hpb=1d128d8532290e84885d09d2d3f0060abd08e49e;p=shipsimu.git

diff --git a/application/ship-simu/main/class_BasePersonell.php b/application/ship-simu/main/class_BasePersonell.php
index 744c160..f59e8cf 100644
--- a/application/ship-simu/main/class_BasePersonell.php
+++ b/application/ship-simu/main/class_BasePersonell.php
@@ -4,9 +4,9 @@
  *
  * @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, this is free software
  * @license		GNU GPL 3.0 or any newer version
- * @link 		http://www.ship-simu.org
+ * @link		http://www.ship-simu.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
@@ -48,23 +48,17 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer {
 	private $salary     = 0.00;
 
 	// Constructor
-	protected function __construct ($class) {
+	protected function __construct ($className) {
 		// Call parent constructor
-		parent::__construct($class);
+		parent::__construct($className);
 
-		// Debug message
-		if ((defined('DEBUG_PERSONELL')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[PersonellBase:] Konstruktor erreicht.<br />\n");
-
-		// Set description
-		$this->setObjectDescription("Personal");
+		// Tidy up a little
+		$this->removeSystemArray();
+		$this->removeNumberFormaters();
 	}
 
 	// Remove min/max ages
 	public final function removeMinMaxAge () {
-		if (defined('DEBUG_PERSONELL')) $this->getDebugInstance()->output(sprintf("[%s:%d] Minimum-/Maximum-Alter entfernt.<br />\n",
-			__CLASS__,
-			__LINE__
-		));
 		unset($this->MIN_AGE);
 		unset($this->MAX_AGE);
 	}
@@ -81,7 +75,7 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer {
 		$year = mt_rand(($currYear - $this->MIN_AGE), ($currYear - $this->MAX_AGE));
 		$month = 0;
 		$day = 0;
-		while (!$this->isDateValid($year, $month, $day)) {
+		while ($this->isDateValid($year, $month, $day) === false) {
 			$month = mt_rand(1, 12);
 			switch ($month) {
 			case 1:
@@ -110,8 +104,8 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer {
 					$day = mt_rand(1, 28);
 				}
 				break;
-			} // switch - END
-		} // while - END
+			} // END - switch
+		} // END - while
 
 		// Set the new birthday
 		$this->setBirthday($year, $month, $day);