More renamed

[shipsimu.git] / application / ship-simu / main / class_BasePersonell.php

diff --git a/application/ship-simu/main/class_BasePersonell.php b/application/ship-simu/main/class_BasePersonell.php
index d77fbaa05d9ff95e78bd3ac385beef1e6e05cd14..8e08ec3556f335fd2f075b53b91c117134c0484f 100644 (file)
--- a/application/ship-simu/main/class_BasePersonell.php
+++ b/application/ship-simu/main/class_BasePersonell.php
@@ -2,11 +2,11 @@
 /**
  * A general class for personell
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.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
+ * @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
@@ -19,7 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class BasePersonell extends BaseFrameworkSystem implements Personellizer {
        // Maximum/minimum age
@@ -48,28 +48,13 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer {
        private $salary     = 0.00;
 
        // Constructor
-       private function __construct ($class) {
+       protected function __construct ($className) {
                // Call parent constructor
-               parent::constructor($class);
-
-               // Debug message
-               if ((defined('DEBUG_PERSONELL')) && (defined('DEBUG_CONSTRUCT'))) $this->getDebugInstance()->output("[PersonellBase:] Konstruktor erreicht.<br />\n");
-
-               // Set description
-               $this->setPartDescr("Personal");
-       }
-
-       // Calls the constructor
-       public function constructor ($class) {
-               $this->__construct($class);
+               parent::__construct($className);
        }
 
        // 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);
        }
@@ -86,7 +71,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:
@@ -115,8 +100,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);