]> git.mxchange.org Git - shipsimu.git/commitdiff
Continued:
authorRoland Häder <roland@mxchange.org>
Sat, 25 Feb 2023 13:23:55 +0000 (14:23 +0100)
committerRoland Häder <roland@mxchange.org>
Thu, 2 Mar 2023 04:24:55 +0000 (05:24 +0100)
- updated a bit old ways (lesser monolithic)
- udpated 'core' framework

38 files changed:
application/selector/class_ApplicationHelper.php
application/selector/class_ApplicationSelector.php
application/selector/exceptions.php
application/shipsimu/classes/bank/money/class_MoneyBank.php
application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php
application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php
application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
application/shipsimu/classes/companies/class_ShippingCompany.php
application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php
application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php
application/shipsimu/classes/filter/page/class_RefillPageFilter.php
application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php
application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php
application/shipsimu/classes/government/class_SimplifiedGovernment.php
application/shipsimu/classes/login/class_ShipSimuGuestLogin.php
application/shipsimu/classes/login/class_ShipSimuUserLogin.php
application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php
application/shipsimu/classes/personell/class_SimulatorPersonell.php
application/shipsimu/classes/personell/company/class_CompanyEmployee.php
application/shipsimu/classes/registration/class_ShipSimuRegistration.php
application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php
application/shipsimu/classes/ships/class_BaseShip.php
application/shipsimu/classes/ships/passenger/class_PassengerShip.php
application/shipsimu/classes/user/class_ShipSimuBaseUser.php
application/shipsimu/classes/user/extended/class_ShipSimuGuest.php
application/shipsimu/classes/user/extended/class_ShipSimuMember.php
application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php
application/shipsimu/exceptions/class_NoShipyardsConstructedException.php
application/shipsimu/templates/de/code/action_ship_simu_login_company.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_government_startup_help.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_government_training.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_profile.ctp
application/shipsimu/templates/de/code/action_ship_simu_login_refill.ctp
application/shipsimu/templates/de/code/government_failed_main.ctp
application/shipsimu/templates/de/code/login_form.ctp
application/shipsimu/templates/de/code/login_main.ctp
application/shipsimu/templates/de/code/register_form.ctp
core

index c3b74dafa5f7b4b0076ea1a1a74b80a1cd90245f..dd4ee5c036e3b2184f01cf6c013167b5c3a44f18 100644 (file)
@@ -78,7 +78,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                // Is the instance there?
                if (is_null(self::$selfInstance)) {
                        self::$selfInstance = new ApplicationHelper();
-               } // END - if
+               }
 
                // Return the instance
                return self::$selfInstance;
@@ -167,7 +167,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                        // Then use it
                        $response = strtolower($requestInstance->getRequestElement('request'));
                        $responseType = $response;
-               } // END - if
+               }
 
                // ... and a new response object
                $responseClass = sprintf('%sResponse', self::convertToClassName($response));
@@ -186,7 +186,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 
                        // Set it in request
                        $requestInstance->setRequestElement('command', $commandName);
-               } // END - if
+               }
 
                // Get a controller resolver
                $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver');
index 381dd566ffa99600f1c42ee5f10ee18f8edfe587..1a7aa40401dfc3cb6a23a3bee82fe7ffd5cce59a 100644 (file)
@@ -112,7 +112,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
 
                        // Add the current instance to the list
                        $this->foundApps->append($app);
-               } // END - if ((is_file(...
+               } ((is_file(...
        }
 
        /**
@@ -175,7 +175,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
                                // Load the application's data.php script and append the
                                // application to the ArrayObject
                                $this->loadApplicationData($appData, $appName);
-                       } // END - if
+                       }
                } // END - while
 
                // Close directory pointer
index d653e5e23c77f8601f765ec31c203b796cd8cf79..510f7d598bdf44f20e63a2fb48ad808b3568159d 100644 (file)
@@ -63,7 +63,7 @@ function __assertHandler ($file, $line, $code) {
        // Empty code?
        if (empty($code)) {
                $code = '<em>Unknown</em>';
-       } // END - if
+       }
 
        // Create message
        $message = sprintf('File: <span class="debug_file">%s</span>, Line: <span class="debug_line">%s</span>, Code: <span class="debug_code">%s</span>',
index f35e756274a3e9bca6edcacf13fbccff912f7b31..67029da4bfb3abc3834f441e1c2f2cd6abfcdb03 100644 (file)
@@ -55,7 +55,7 @@ class MoneyBank extends BaseBank implements Registerable {
         * @return      $lendsMoreMoney         Wether this bank lends more money to the user
         */
        public function ifBankLendsMoreMoney () {
-               $this->partialStub();
+               DebugMiddleware::getSelfInstance()->partialStub();
        }
 
        /**
@@ -64,7 +64,7 @@ class MoneyBank extends BaseBank implements Registerable {
         * @return      $hasMaximumCredits      Wether the user has maximum allowed credits
         */
        public function ifUserHasMaxCredits () {
-               $this->partialStub();
+               DebugMiddleware::getSelfInstance()->partialStub();
        }
 
        /**
@@ -83,7 +83,7 @@ class MoneyBank extends BaseBank implements Registerable {
 
                        // Then we simply "ask" the opening time instance if the user asks within the opening time
                        $hasOpened = $openingInstance->ifWithinOpeningTimes();
-               } // END - if
+               }
 
                // Return status
                return $hasOpened;
index 37d2c5e2080cee8e4dde5eb60bb943a21e3abbd5..1a2134aea4f2f601ab8ad7e39662f14c5447f663 100644 (file)
@@ -107,7 +107,7 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable {
                unset($this->allowedData);
 
                // Unfinished!
-               $this->partialStub("Unfinished work.");
+               DebugMiddleware::getSelfInstance()->partialStub('Unfinished work.');
                $this->debugBackTrace();
        }
 
index 52824c43cf2da85a0a7aa84b60a54860a1c667a6..ccf4a3e4eeeb88c58d5205d9d410844d74394585 100644 (file)
@@ -66,7 +66,7 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab
                if ($actionInstance instanceof PerformableAction) {
                        // Execute the action (shall not output anything, see below why)
                        $actionInstance->execute($requestInstance, $responseInstance);
-               } // END - if
+               }
 
                // Get the application instance
                $appInstance = $this->getResolverInstance()->getApplicationInstance();
index 4a6bf01d36cd2b17123b3004babacd361e08792e..db2afe84ec0bfa11f93b4cde6c1e13e2f3cb8d9a 100644 (file)
@@ -66,7 +66,7 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda
                if ($actionInstance instanceof PerformableAction) {
                        // Execute the action (shall not output anything, see below why)
                        $actionInstance->execute($requestInstance, $responseInstance);
-               } // END - if
+               }
 
                // Get the application instance
                $appInstance = $this->getResolverInstance()->getApplicationInstance();
index 7263f0baa5b2b1bafbda33a86d95a3cdd7a959bf..9601126fd435af8f8ccb5643eed2eb28ee2e2fbd 100644 (file)
@@ -92,7 +92,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        // Then do some nasty caching here but don't throw an exception
                        // because then you will hurt our web helpers... :/
                        $companyInstance->partialStub("Don&#39;t throw exceptions here.");
-               } // END - if
+               }
 
                // Init all lists
                $companyInstance->initCompanyLists();
@@ -124,7 +124,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                if ($resultInstance instanceof SearchableResult) {
                        // Set the result instance
                        $this->setResultInstance($resultInstance);
-               } // END - if
+               }
 
                // Return result
                return $participates;
@@ -146,8 +146,8 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                // Is it set?
                if ($resultInstance instanceof SearchableResult) {
                        // Result found so analyse it
-                       $this->partialStub("Check if user is company founder.");
-               } // END - if
+                       DebugMiddleware::getSelfInstance()->partialStub('Check if user is company founder.');
+               }
 
                // Return result
                return $isFounder;
@@ -169,8 +169,8 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                // Is it set?
                if ($resultInstance instanceof SearchableResult) {
                        // Result found so analyse it
-                       $this->partialStub("Check if user is company owner.");
-               } // END - if
+                       DebugMiddleware::getSelfInstance()->partialStub('heck if user is company owner.');
+               }
 
                // Return result
                return $isOwner;
@@ -192,7 +192,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                if ($resultInstance instanceof SearchableResult) {
                        // Result found so he is employee
                        $isEmployee = true;
-               } // END - if
+               }
 
                // Return result
                return $isEmployee;
@@ -240,7 +240,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                $dummy = explode(" ", $this->getCompanyName());
                foreach ($dummy as $part) {
                        $this->shortName .= substr($part, 0, 1);
-               } // END - if
+               }
        }
 
        // Reedereien Werften bauen lassen
@@ -304,7 +304,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                if ($totalUnemployed < $amount) {
                        // Reichte nicht aus!
                        throw new ToMuchEmployeesException(array($amount, $personellInstance->getAllUnemployed()), self::EXCEPTION_NOT_ENOUGTH_UNEMPLOYEES);
-               } // END - if
+               }
 
                // Get list for all unemployed people
                $list = $personellInstance->getSpecialPersonellList(false); // Should be cached
@@ -328,7 +328,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                                if ($iterator->valid() === false) {
                                        // Should normally not happen... :(
                                        throw new StructuresOutOfBoundsException($idx, self::EXCEPTION_INDEX_OUT_OF_BOUNDS);
-                               } // END - if
+                               }
 
                                // Get current element
                                $employee = $iterator->current();
@@ -392,7 +392,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                        if ($shipyardIter->valid() === false) {
                                // Rewind to first position
                                $shipyardIter->seek(0);
-                       } // END - if
+                       }
 
                        // Get Shipyard object
                        $shipyard = $shipyardIter->current();
@@ -603,7 +603,7 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner
                if ($partnerInstance->isContractPartner($contractInstance) === false) {
                        // Invalid contract partner!
                        throw new InvalidContractPartnerException($partnerInstance, self::EXCEPTION_CONTRACT_PARTNER_INVALID);
-               } // END - if
+               }
 
                // Determine if company "signs" own contract (must be done) or with an other party
                if ($this->equals($partnerInstance)) {
index f02219dbee77573eff8d078c26146dfd6fe5a125..98e1e237704f7d92b539c53ef69d949a68bdfbb0 100644 (file)
@@ -70,6 +70,6 @@ class ShipSimuGovernmentPaysStartupHelpFilter extends BaseShipSimuFilter impleme
 
                        // Stop processing here
                        exit;
-               } // END - if
+               }
        }
 }
index f90d1b99847e6ff17e128a8df97eb2dbbc4a5b18..c6117fbe029eaa448695bea914b76daa4811799a 100644 (file)
@@ -70,6 +70,6 @@ class ShipSimuGovernmentPaysTrainingFilter extends BaseShipSimuFilter implements
 
                        // Stop processing here
                        exit;
-               } // END - if
+               }
        }
 }
index b114ca07e187012a43f14e71259e6577388e0d28..9badacd1238eddacaf9a271954fa0ef3935d4fff 100644 (file)
@@ -67,6 +67,6 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable {
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
+               }
        }
 }
index 351c643d6a82b4d1a32f96cfc1dd3192116ab165..042fdc5a46890e8b41d2d3cb6d45ff15f0dd533b 100644 (file)
@@ -68,6 +68,6 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - if
+               }
        }
 }
index 06e0996205d4ec9b099b6ebc13f609d4565902c7..eb4315df4b407bcd4bd73c9f43c0c26e9932fe0f 100644 (file)
@@ -71,6 +71,6 @@ class ShipSimuUserStatusGuestFilter extends BaseShipSimuFilter implements Filter
 
                        // Stop processing here
                        exit;
-               } // END - if
+               }
        }
 }
index 89d4a51a6c1b7fc71b05c2363eb7a34bb70f4121..5e44b32f7292dfcce391c670e2e812e905180a00 100644 (file)
@@ -87,7 +87,7 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable {
 
                        // Entry was found so the government can no more pay a training
                        $alreadyPayed = true;
-               } // END - if
+               }
 
                // Return the result
                return $alreadyPayed;
@@ -126,7 +126,7 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable {
 
                        // Entry found, so lets have a look if this government wants to again...
                        $maximumPayed = true;
-               } // END - if
+               }
 
                // Return the result
                return $maximumPayed;
index 802749b4bdb6dc49eb274121513cac9b71e503bd..a30c272685fdbc8fb5150241cfb2efe181190667 100644 (file)
@@ -72,7 +72,7 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser, R
                if ($userInstance->ifPasswordHashMatches($requestInstance) === false) {
                        // Mismatching password
                        throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH);
-               } // END - if
+               }
 
                // Now do the real login. This can be cookie- or session-based login
                // which depends on the admins setting then on the user's taste.
@@ -120,6 +120,6 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser, R
 
                        // Store the hash back in request
                        $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
-               } // END - if
+               }
        }
 }
index 43e7c20cf0fa71a1713a847d03bc6a09900dd1d2..a70bbafe059fe950b98f3c1ada24cbaf9496c9b7 100644 (file)
@@ -75,7 +75,7 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser, Re
                if ($userInstance->ifPasswordHashMatches($requestInstance) === false) {
                        // Mismatching password
                        throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH);
-               } // END - if
+               }
 
                // ToDo place
 
@@ -125,6 +125,6 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser, Re
 
                        // Store the hash back in request
                        $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
-               } // END - if
+               }
        }
 }
index 3a7c66db30609980e4e2537c68853fe5b130ef09..26e10ede73ef22d3806f974c274225b86e2ad866 100644 (file)
@@ -67,7 +67,7 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin {
                if (!$userInstance instanceof ManageableAccount) {
                        // Thrown an exception here
                        throw new UserInstanceMissingException (array($helperInstance, 'user'), self::EXCEPTION_INVALID_USER_INSTANCE);
-               } // END - if
+               }
 
                // Set default login method from config
                $helperInstance->setDefaultAuthMethod();
index a0d0206a83787fcde0ed2295578c6c18cbd282ba..27b6202e812965af5020d0055698ee27a210de3c 100644 (file)
@@ -129,10 +129,10 @@ class SimulatorPersonell extends BasePersonell {
                if ($this->personelllList instanceof FrameworkArrayObject) {
                        // Throw an exception
                        throw new PersonellListAlreadyCreatedException($this, self::EXCEPTION_DIMENSION_ARRAY_INVALID);
-               } // END - if
+               }
 
                // Initialize the array
-               $this->personellList = new FrameworkArrayObject("FakedPersonellList");
+               $this->personellList = new FrameworkArrayObject('FakedPersonellList');
        }
 
        // Remove the personell list
@@ -171,7 +171,7 @@ class SimulatorPersonell extends BasePersonell {
         *
         * @return      $cacheList      A list of cached personells
         */
-       function getSpecialPersonellList ($isEmployed = null, $isMarried = null, $hasGender = "") {
+       function getSpecialPersonellList ($isEmployed = null, $isMarried = null, $hasGender = '') {
                // Serialize the conditions for checking if we can take the cache
                $serialized = serialize(array($isEmployed, $isMarried, $hasGender));
 
@@ -295,7 +295,7 @@ class SimulatorPersonell extends BasePersonell {
 
                        // Set typical family name
                        parent::setFamily("Smith");
-               } // END - if
+               }
 
                // Return surname
                return $surname;
index a376c00f2cb85fe877e79f03d9d6752cc387580f..300c936f09ba0dea27b33b620cd7562bea675495 100644 (file)
@@ -50,7 +50,7 @@ class CompanyEmployee extends SimulatorPersonell {
                if ($personellInstance->isDateValid($year, $month, $day) === false) {
                        // Something is wrong ...
                        throw new BirthdayInvalidException(array($year, $month, $day), self::EXCEPTION_BIRTH_DATE_IS_INVALID);
-               } // END - if
+               }
 
                // Set birthday
                $personellInstance->setBirthday($year, $month, $day);
index 64c34d5c294b3c9af6a9fa6295c5923e39a839ad..aa13a2bfd37df5bd9b4a0d287685a4eeb1a1b922 100644 (file)
@@ -166,7 +166,7 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister {
                if ($this->getConfigInstance()->getConfigEntry('confirm_email_enabled') === 'N') {
                        // No confirmation of email needed
                        $configEntry = 'user_status_confirmed';
-               } // END - if
+               }
 
                // Add a lot elements to the dataset criteria
                foreach ($this->criteriaElements as $alias => $element) {
@@ -189,7 +189,7 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister {
                        if ((($element == 'username') || ($alias == 'username')) && ($this->getRequestInstance()->getRequestElement($element) == $this->getConfigInstance()->getConfigEntry('guest_login_user'))) {
                                // Yes, then set the config entry to guest status
                                $configEntry = 'user_status_guest';
-                       } // END - if
+                       }
                } // END - foreach
 
                // Mark the username as unique key
index 6e4d3b95d4edcf44b611defbc30097d68cd69268..24a7a3b3d1d3779a694f193f3595ca4e9d4cd5c1 100644 (file)
@@ -90,7 +90,7 @@ class ShipSimuHtmlControllerResolver extends BaseControllerResolver implements C
                if ((!is_object($controllerInstance)) || (!$controllerInstance instanceof Controller)) {
                        // This command has an invalid instance!
                        throw new InvalidControllerInstanceException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
-               } // END - if
+               }
 
                // Set last controller
                $this->setResolvedInstance($controllerInstance);
index 73ab63ddcd62f90bb851d0704fb86f04f087a265..796d9dc8f126d4bb91aa8c1294e1bdca4b95e5bb 100644 (file)
@@ -69,7 +69,7 @@ class BaseShip extends BaseSimulator {
                if (!class_exists($partClass)) {
                        // Nicht vorhanden, dann Ausnahme werfen!
                        throw new NoClassException($partClass, self::EXCEPTION_CLASS_NOT_FOUND);
-               } // END - if
+               }
 
                // Get an instance back from our object factory
                $partInstance = ObjectFactory::createObjectByName($partClass);
@@ -134,7 +134,7 @@ class BaseShip extends BaseSimulator {
 
        // STUB: Getter-Methode Anzahl Betten
        public function calcTotalBeds () {
-               $this->partialStub("Please implement this stub in your ship!");
+               DebugMiddleware::getSelfInstance()->partialStub('Please implement this stub in your ship!');
        }
 
        // Setter-Methode fuer Schiffsnamen
index a1e3d5b17537659bc9c5771276e74edcb89984a1..da9b0b640896f32f430d864bf104694f3d0e4633 100644 (file)
@@ -49,7 +49,7 @@ class PassengerShip extends BaseShip implements ConstructableShip {
                if (is_null($struct)) {
                        // Empty structures list!
                        throw new EmptyStructuresListException($this, self::EXCEPTION_EMPTY_STRUCTURES_ARRAY);
-               } // END - if
+               }
 
                // Anzahl Betten auf 0 setzen
                $numBeds = 0;
@@ -73,9 +73,9 @@ class PassengerShip extends BaseShip implements ConstructableShip {
                                        if (!is_null($cab)) {
                                                // Kabinenbeschreibung holen
                                                $cabType = $cab->getObjectDescription();
-                                       } // END - if
-                               } // END - if
-                       } // END - if
+                                       }
+                               }
+                       }
                } // END - for
 
                // Anzahl zurueckliefern
index 6795a873835114c2d78ec598200fc9bc395b032d..d6764ee5d9e90459ab67ee18dbb6ec383597bb09 100644 (file)
@@ -57,7 +57,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
 
                        // Store it in registry
                        Registry::getRegistry()->addInstance('money_bank', $bankInstance);
-               } // END - if
+               }
 
                // Return the instance
                return $bankInstance;
@@ -87,7 +87,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
 
                        // Store it in registry
                        Registry::getRegistry()->addInstance('government', $governmentInstance);
-               } // END - if
+               }
 
                // Return the prepared instance
                return $governmentInstance;
@@ -148,7 +148,7 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable {
 
                        // And store it in registry
                        Registry::getRegistry()->addInstance('points', $pointsInstance);
-               } // END - if
+               }
 
                // Just forward this request to the user points class
                $hasRequired = $pointsInstance->ifUserHasRequiredPoints($action);
index ca2d531cc0284096d10c6c565dd38c941d752217..dc09b0aba1f6a674b88fec72b90ee6ef54d7ed6a 100644 (file)
@@ -58,7 +58,7 @@ class ShipSimuGuest extends ShipSimuBaseUser implements ManageableGuest {
                if ($userInstance->ifUsernameExists() === false) {
                        // Throw an exception here
                        throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND);
-               } // END - if
+               }
 
                // Return the instance
                return $userInstance;
index 0f425fa2cd6c9d7176fd5c150b4cbdf433f1247a..64a5afa1833acb8e23b5bf4493a33969032e1cae 100644 (file)
@@ -66,7 +66,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
                if ($userInstance->ifUsernameExists() === false) {
                        // Throw an exception here
                        throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND);
-               } // END - if
+               }
 
                // Return the instance
                return $userInstance;
@@ -132,7 +132,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
                // If there is no action use the default on
                if (is_null($lastAction)) {
                        $lastAction = $this->getConfigInstance()->getConfigEntry('login_default_action');
-               } // END - if
+               }
 
                // Get a critieria instance
                $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
@@ -184,7 +184,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
 
                        // And store it in registry
                        Registry::getRegistry()->addInstance('points', $pointsInstance);
-               } // END - if
+               }
 
                // Get the amount
                $amount = $requestInstance->getRequestElement('amount');
@@ -203,7 +203,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
                if (!$this->getResultInstance() instanceof SearchableResult) {
                        // Abort here
                        return;
-               } // END - if
+               }
 
                // Do we have data to update?
                if ($this->getResultInstance()->ifDataNeedsFlush()) {
@@ -212,6 +212,6 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka
 
                        // Yes, then send the whole result to the database layer
                        $wrapperInstance->doUpdateByResult($this->getResultInstance());
-               } // END - if
+               }
        }
 }
index 28257b130e8c2b08d2748606d70c62906b80bbfa..a9f906532010b390dc0e9e0c49c4d518d54ad8da 100644 (file)
@@ -61,7 +61,7 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper {
                // Set the company instance if not null
                if (!is_null($companyInstance)) {
                        $wrapperInstance->setCompanyInstance($companyInstance);
-               } // END - if
+               }
 
                // Return the instance
                return $wrapperInstance;
@@ -97,7 +97,7 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper {
 
                        // Entry found for further analysis/processing
                        $participates = true;
-               } // END - if
+               }
 
                // Return the result
                return $participates;
index b7679939b6364fc019f7b083741dc1a6c92eff8d..0449ea6aad67c3f1a44fe4ac25b93ec75ca116b9 100644 (file)
@@ -30,7 +30,7 @@ class NoShipyardsConstructedException extends FrameworkException {
                        $message = sprintf("[%s:] Keine Werften gefunden!",
                                $class->__toString()
                        );
-               } // END - if
+               }
 
                // Call parent constructor
                parent::__construct($message, $code);
index ebe2fbd3d5481d02401040f96a4e3c91205c008b..c90759587043ca5cbbfc2eebcddfae181eabbf73 100644 (file)
@@ -34,7 +34,7 @@ if ($linkInstance->getValueInstance()->ifUserHasRequiredPoints('write_applicatio
 
                // Display link to government for startup help
                $linkInstance->addActionLinkById('government_startup_help', 'apply_startup_help_government');
-       } // END - if
+       }
 } elseif ($linkInstance->getValueInstance()->ifGovernmentPaysStartupHelp()) {
        // Display link to government for startup help
        $linkInstance->addActionLinkById('government_startup_help', 'apply_startup_help_government');
index 99c68f7e39c8d0d4a202abf9395574d5a16095cd..2f77d1ae63a1d02a31f9f351dfe539697238fe34 100644 (file)
@@ -29,7 +29,7 @@ $helperInstance->addInputPasswordField('password');
 if ($helperInstance->ifFormSecuredWithCaptcha()) {
        $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung von Starthilfe ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du die Starthilfe beantragen kannst.");
        $helperInstance->addCaptcha();
-} // END - if
+}
 
 // Final notices
 $helperInstance->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!");
index 555c0360cc36d6e8ff5c560d043d6919e0e2a534..9c41efd32c95338a3c19867ccb1c0d7cd5a64261 100644 (file)
@@ -29,7 +29,7 @@ $helperInstance->addFormNote('profile', "Stimmen die Daten noch? {?shipsimu_prof
 if ($helperInstance->ifFormSecuredWithCaptcha()) {
        $helperInstance->addFormGroup('captcha_user', "Die virtuelle Beantragung eines Trainingkursus ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, um den Trainingskursus zu beantragen.");
        $helperInstance->addCaptcha();
-} // END - if
+}
 
 // Final notices
 $helperInstance->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!");
index e4ec93cd828a5264ba682ab9b8657a41ab54562b..083dd300d9fb603b163105596deda97b8e7022a4 100644 (file)
@@ -29,12 +29,12 @@ if ($helperInstance->ifEmailChangeAllowed()) {
 
        if ($helperInstance->ifEmailMustBeUnique()) {
                $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein.");
-       } // END - if
+       }
 
        if ($helperInstance->ifEmailChangeRequireConfirmation()) {
                $helperInstance->addFormNote('confirm', "Es wird ein Best&auml;tigungslink an deine neue Email-Adresse gesendet. Bitte klicke diesen dann m&ouml;glichst schnell an.");
-       } // END - if
-} // END - if
+       }
+}
 
 // Add form group for user profile
 $helperInstance->addFormGroup('profile', "Hier kannst du deine Profildaten &auml;ndern.");
@@ -59,8 +59,8 @@ if ($helperInstance->ifRegisterIncludesPersonaData()) {
                $helperInstance->addInputTextField('birth_month');
                $helperInstance->addFieldText('birth_day', ".");
                $helperInstance->addInputTextField('birth_year');
-       } // END - if
-} // END - if
+       }
+}
 
 // Add sub group for zip code
 $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
@@ -74,35 +74,35 @@ $helperInstance->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern
 if ($helperInstance->ifChatEnabled('icq')) {
        $helperInstance->addFieldText('icq', "ICQ-Nummer:");
        $helperInstance->addInputTextFieldWithDefault('icq');
-} // END - if
+}
 
 // Add Jabber chat?
 if ($helperInstance->ifChatEnabled('jabber')) {
        $helperInstance->addFieldText('jabber', "Jabber:");
        $helperInstance->addInputTextFieldWithDefault('jabber');
-} // END - if
+}
 
 // Add Yahoo! chat?
 if ($helperInstance->ifChatEnabled('yahoo')) {
        $helperInstance->addFieldText('yahoo', "Yahoo!:");
        $helperInstance->addInputTextFieldWithDefault('yahoo');
-} // END - if
+}
 
 // Add AOL chat?
 if ($helperInstance->ifChatEnabled('aol')) {
        $helperInstance->addFieldText('aol', "AOL-Screenname:");
        $helperInstance->addInputTextFieldWithDefault('aol');
-} // END - if
+}
 
 // Add MSN chat?
 if ($helperInstance->ifChatEnabled('msn')) {
        $helperInstance->addFieldText('msn', "MSN:");
        $helperInstance->addInputTextFieldWithDefault('msn');
-} // END - if
+}
 
 if (!$helperInstance->ifRegisterRequiresEmailVerification()) {
        $helperInstance->addFormExtraNote(1, "Die Benachrichtigungen per Email sind im Loginbereich verfeinerbar, welche du genau haben willst.");
-} // END - if
+}
 
 // Rules already accepted?
 if ($helperInstance->ifRulesHaveChanged()) {
@@ -118,7 +118,7 @@ if ($helperInstance->ifRulesHaveChanged()) {
 if ($helperInstance->ifFormSecuredWithCaptcha()) {
        $helperInstance->addFormGroup('captcha_user', "Das &Auml;ndern von Profildaten ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit deine &Auml;nderungen gespeichert werden k&ouml;nnen.");
        $helperInstance->addCaptcha();
-} // END - if
+}
 
 // Ask again for current account password
 $helperInstance->addFormGroup('pass_old', "Bitte gebe zur Best&auml;tigung der &Auml;nderungen dein derzeitiges Passwort ein.");
index 04812647969b65726ae93e58730fc1b0a5417965..3dd4548f1c475e6944d9beb8ff4b808a9b7e5804 100644 (file)
@@ -40,7 +40,7 @@ $helperInstance->addInputPasswordField('pass_old');
 if ($helperInstance->ifFormSecuredWithCaptcha()) {
        $helperInstance->addFormGroup('captcha_refill', "Bitte wiederhole den angezeigten Code:");
        $helperInstance->addCaptcha();
-} // END - if
+}
 
 // Submit button
 $helperInstance->addFormGroup('buttons_refill', "Mit Absenden des Formulars wird deine Nachbestellung verbindlich!");
index 6411bfb350390054307b8b60f4f19c4ce92fcd9f..078f035e66812f5e57857335b5e27526ce81eafb 100644 (file)
@@ -17,7 +17,7 @@ $blockInstance->assignFieldWithFilter('user_status', "user_status_translator");
 if ($blockInstance->ifIncludeRegistrationStamp()) {
        // Then assign it as well!
        $blockInstance->assignFieldWithFilter('registered', 'formatTimestamp');
-} // END - if
+}
 
 // Flush the content out to a template variable
 $blockInstance->flushContent();
index b8a52e2aa89b7ae1771d4d97b0b9fd90e5f70e6c..4f48dbd353317eb4f5208b5d7949e0c84877e77d 100644 (file)
@@ -36,7 +36,7 @@ if ($helperInstance->ifLoginIsEnabled()) {
        if ($helperInstance->ifFormSecuredWithCaptcha()) {
                $helperInstance->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
                $helperInstance->addCaptcha();
-       } // END - if
+       }
 
        // Submit buttons
        $helperInstance->addFormGroup('buttons_user', "Alles richtig eingegeben?");
@@ -62,7 +62,7 @@ if ($helperInstance->ifGuestLoginAllowed()) {
        if ($helperInstance->ifFormSecuredWithCaptcha()) {
                $helperInstance->addFormGroup('captcha_guest', "Unser Gast-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
                $helperInstance->addCaptcha();
-       } // END - if
+       }
 
        // Submit button
        $helperInstance->addFormGroup('buttons_guest', "Gastlogins sind in der Funkionsweise eingeschr&auml;nkt. Mehr dazu unter &quot;Gastlogin&quot;.");
index 8c1745921c6e9074b13040f7e1780ea6d07a4ccc..efff9d9c77b243472aa1bc8bfd41872032311d4d 100644 (file)
@@ -18,7 +18,7 @@ $blockInstance->assignFieldWithFilter('points', 'format_number');
 if ($blockInstance->ifIncludeRegistrationStamp()) {
        // Then assign it as well!
        $blockInstance->assignFieldWithFilter('registered', 'format_timestamp');
-} // END - if
+}
 
 // Flush the content out to a template variable
 $blockInstance->flushContent();
index 738b3b84a96fd0c1bbdbab0ca5a72806106983e3..86812b838edeff03aa3d47cc356cd4f7708a332d 100644 (file)
@@ -26,8 +26,8 @@ if ($helperInstance->ifRegisterRequiresEmailVerification()) {
        // Must the email address be unique in this system?
        if ($helperInstance->ifEmailMustBeUnique()) {
                $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein.");
-       } // END - if
-} // END - if
+       }
+}
 
 // Shall we also ask some personal data to complete the profile?
 if ($helperInstance->ifRegisterIncludesProfile()) {
@@ -41,8 +41,8 @@ if ($helperInstance->ifRegisterIncludesProfile()) {
                // Must the email address be unique in this system?
                if ($helperInstance->ifEmailMustBeUnique()) {
                        $helperInstance->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Spiel verwendet worden sein.");
-               } // END - if
-       } // END - if
+               }
+       }
 
        // Persoenliche Daten mit in der Anmeldung abfragen?
        if ($helperInstance->ifRegisterIncludesPersonaData()) {
@@ -64,8 +64,8 @@ if ($helperInstance->ifRegisterIncludesProfile()) {
                        $helperInstance->addInputTextField('birth_month');
                        $helperInstance->addFieldText('birth_day', ".");
                        $helperInstance->addInputTextField('birth_year');
-               } // END - if
-       } // END - if
+               }
+       }
 
        $helperInstance->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
        $helperInstance->addFieldText('zip', "Postleitzahl:");
@@ -76,27 +76,27 @@ if ($helperInstance->ifRegisterIncludesProfile()) {
        if ($helperInstance->ifChatEnabled('icq')) {
                $helperInstance->addFieldText('icq', "ICQ-Nummer:");
                $helperInstance->addInputTextField('icq');
-       } // END - if
+       }
 
        if ($helperInstance->ifChatEnabled('jabber')) {
                $helperInstance->addFieldText('jabber', "Jabber:");
                $helperInstance->addInputTextField('jabber');
-       } // END - if
+       }
 
        if ($helperInstance->ifChatEnabled('yahoo')) {
                $helperInstance->addFieldText('yahoo', "Yahoo!:");
                $helperInstance->addInputTextField('yahoo');
-       } // END - if
+       }
 
        if ($helperInstance->ifChatEnabled('aol')) {
                $helperInstance->addFieldText('aol', "AOL-Screenname:");
                $helperInstance->addInputTextField('aol');
-       } // END - if
+       }
 
        if ($helperInstance->ifChatEnabled('msn')) {
                $helperInstance->addFieldText('msn', "MSN:");
                $helperInstance->addInputTextField('msn');
-       } // END - if
+       }
 
        if (!$helperInstance->ifRegisterRequiresEmailVerification()) {
                $helperInstance->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst.");
@@ -113,7 +113,7 @@ $helperInstance->addInputCheckboxField('rules', false);
 if ($helperInstance->ifFormSecuredWithCaptcha()) {
        $helperInstance->addFormGroup('captcha', "Bitte wiederhole den angezeigten Code damit die Anmeldung abgeschlossen werden kann.");
        $helperInstance->addCaptcha();
-} // END - if
+}
 
 // Final note and submit buttons
 $helperInstance->addFormGroup('buttons', "Wenn du alle ben&ouml;tigten Felder korrekt ausgef&uuml;t hast, kannst du die Anmeldung abschliessen.");
diff --git a/core b/core
index ba76f1380ebef3021b78d122cbabd6fe3173cd47..3e492b83a49b96805aff4f46882773f2bcf1fad9 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit ba76f1380ebef3021b78d122cbabd6fe3173cd47
+Subproject commit 3e492b83a49b96805aff4f46882773f2bcf1fad9