generateUniqueId() and more useless/deprecated methods removed, code speed-up, link...

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

diff --git a/application/ship-simu/main/user/class_ShipSimuBaseUser.php b/application/ship-simu/main/user/class_ShipSimuBaseUser.php
index 911e91eab370a57f27f497bda8da9854042339af..020d0350474def0827b4622c098a4b93de696e53 100644 (file)
--- a/application/ship-simu/main/user/class_ShipSimuBaseUser.php
+++ b/application/ship-simu/main/user/class_ShipSimuBaseUser.php
@@ -42,14 +42,14 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
                // Get max allowed companies to found
                $maxFound = $this->getConfigInstance()->readConfig('max_allowed_companies_found');
 
-               // Get a company wrapper
-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('company_db_wrapper_class');
-
                // Now get a search criteria and set the user's name as criteria
                $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
                $criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUserName());
                $criteriaInstance->setLimit($maxFound);
 
+               // Get a company wrapper
+               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('company_db_wrapper_class');
+
                // Do the count-select by criteria
                $totalRows = $wrapperInstance->doSelectCountByCriteria($criteriaInstance);
 
@@ -83,7 +83,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
                } // END - if
 
                // Just forward this request to the user points class
-               $hasRequired = $pointsInstance->ifUserHasRequiredPoints ($action);
+               $hasRequired = $pointsInstance->ifUserHasRequiredPoints($action);
 
                // Return the result
                return $hasRequired;
@@ -125,7 +125,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
         *
         * @return      $bankLends      Wether the money bank is able to lend money
         */
-       public function ifUserAllowTakeCreditsFromMoneyBank () {
+       public function ifUserAllowedTakeCreditsFromMoneyBank () {
                // Per default the money bank cannot pay
                $bankLends = false;
 
@@ -142,10 +142,12 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
                } // END - if
 
                // Does the money bank lend more money?
+               /** UNFINISHED PART!
                if ($bankInstance->ifBankLendsMoreMoney()) {
                        // Okay, that they will do
                        $bankLends = true;
                } // END - if
+               */
 
                // Return result
                return $bankLends;
@@ -175,10 +177,12 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
                } // END - if
 
                // Now check if the user has maximum credits
+               /** UNFINISHED PART!
                if ($bankInstance->ifUserHasMaxCredits()) {
                        // Yes, he does!
                        $hasMaxCredits = true;
                } // END - if
+               */
 
                // Return the result
                return $hasMaxCredits;