From 3b54f8e7ee46f111f4f8058221fa8e23112f4e54 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 17 Feb 2023 09:23:34 +0100 Subject: [PATCH] Continued: - requestIsValid() is now renamed to a propper setter setIsRequestValid() and with no default (setters don't have default values) - removed deprecated closing tag ?> - updated 'core' framework --- application/selector/class_ApplicationHelper.php | 3 --- application/selector/class_ApplicationSelector.php | 3 --- application/selector/config.php | 3 --- application/selector/data.php | 3 --- application/selector/debug.php | 3 --- application/selector/exceptions.php | 3 --- application/selector/init.php | 5 +---- application/selector/loader.php | 3 --- application/selector/starter.php | 3 --- .../shipsimu/classes/actions/class_BaseShipSimuAction.php | 3 --- .../actions/ship-simu/class_ShipSimuLoginAction.php | 3 --- .../actions/ship-simu/class_ShipSimuProfileAction.php | 3 --- .../actions/web/class_WebShipSimuLoginCompanyAction.php | 3 --- .../class_WebShipSimuLoginGovernmentStartupHelpAction.php | 3 --- .../web/class_WebShipSimuLoginGovernmentTrainingAction.php | 3 --- .../actions/web/class_WebShipSimuLoginLogoutAction.php | 3 --- .../actions/web/class_WebShipSimuLoginProfileAction.php | 3 --- .../actions/web/class_WebShipSimuLoginRefillAction.php | 3 --- .../web/class_WebShipSimuLoginStatusProblemAction.php | 3 --- .../actions/web/class_WebShipSimuLoginWelcomeAction.php | 3 --- application/shipsimu/classes/bank/class_BaseBank.php | 3 --- .../shipsimu/classes/bank/money/class_MoneyBank.php | 3 --- application/shipsimu/classes/class_BasePersonell.php | 3 --- application/shipsimu/classes/class_BaseSimulator.php | 3 --- application/shipsimu/classes/class_Merchant.php | 3 --- application/shipsimu/classes/class_WorksContract.php | 3 --- .../commands/web/class_WebShipsimuGuestLoginCommand.php | 5 +---- .../commands/web/class_WebShipsimuProfileCommand.php | 3 --- .../commands/web/class_WebShipsimuRefillCommand.php | 3 --- .../commands/web/class_WebShipsimuRegisterCommand.php | 3 --- .../commands/web/class_WebShipsimuUserLoginCommand.php | 5 +---- .../web/company/class_WebShipSimuCompanyCommand.php | 3 --- .../government/class_WebGovernmentFailedStartupCommand.php | 3 --- .../class_WebGovernmentFailedTrainingCommand.php | 3 --- .../class_WebShipsimuGovernmentStartupCommand.php | 3 --- .../class_WebShipsimuGovernmentTrainingCommand.php | 3 --- .../shipsimu/classes/companies/class_ShippingCompany.php | 3 --- .../shipsimu/classes/constructions/berths/class_Berth.php | 3 --- .../classes/constructions/class_BaseConstruction.php | 3 --- .../shipsimu/classes/constructions/docks/class_DryDock.php | 3 --- .../classes/constructions/harbors/class_Harbor.php | 3 --- .../classes/constructions/terminals/class_Terminal.php | 3 --- .../classes/constructions/yards/class_Shipyard.php | 3 --- .../controller/html/class_HtmlCompanyController.php | 7 ++----- .../html/class_HtmlGovernmentFailedController.php | 7 ++----- application/shipsimu/classes/drives/class_BaseDrive.php | 3 --- application/shipsimu/classes/drives/motor/class_Motor.php | 3 --- .../classes/factories/class_ShipSimuWebNewsFactory.php | 3 --- .../refill/class_RefillRequestCurrencyTestBookFilter.php | 3 --- .../shipsimu/classes/filter/class_BaseShipSimuFilter.php | 3 --- .../class_ShipSimuGovernmentPaysStartupHelpFilter.php | 7 ++----- .../class_ShipSimuGovernmentPaysTrainingFilter.php | 7 ++----- .../classes/filter/page/class_RefillPageFilter.php | 5 +---- .../validator/class_RefillRequestValidatorFilter.php | 5 +---- .../validator/class_ShipSimuUserStatusGuestFilter.php | 7 ++----- .../classes/government/class_SimplifiedGovernment.php | 3 --- .../shipsimu/classes/login/class_ShipSimuGuestLogin.php | 3 --- .../shipsimu/classes/login/class_ShipSimuUserLogin.php | 3 --- .../classes/login/helper/class_ShipSimuLoginHelper.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuConfirmMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuHomeMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php | 3 --- .../classes/menu/class_ShipSimuLoginFailedMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuLoginMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuLogoutMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuRegisterMenu.php | 3 --- .../shipsimu/classes/menu/class_ShipSimuStatusMenu.php | 3 --- .../government/class_ShipSimuGovernmentFailedAreaMenu.php | 3 --- .../opening/bank/class_MoneyBankRealtimeOpening.php | 3 --- application/shipsimu/classes/opening/class_BaseOpening.php | 2 -- application/shipsimu/classes/parts/class_BaseShipPart.php | 3 --- .../classes/parts/maschineroom/class_MaschineRoom.php | 3 --- .../classes/personell/class_SimulatorPersonell.php | 3 --- .../classes/personell/company/class_CompanyEmployee.php | 3 --- .../classes/registration/class_ShipSimuRegistration.php | 3 --- .../command/html/class_HtmlCompanyCommandResolver.php | 3 --- .../html/class_HtmlGovernmentFailedCommandResolver.php | 3 --- .../html/class_ShipSimuHtmlControllerResolver.php | 3 --- application/shipsimu/classes/ships/class_BaseShip.php | 3 --- .../classes/ships/passenger/class_PassengerShip.php | 3 --- .../shipsimu/classes/structures/class_BaseStructure.php | 3 --- .../structures/extended/cabines/class_BaseCabin.php | 3 --- .../extended/cabines/ship/class_EconomyCabin.php | 3 --- .../structures/extended/cabines/ship/class_LowCabin.php | 3 --- .../structures/extended/cabines/ship/class_LuxuryCabin.php | 3 --- .../extended/cabines/ship/class_PremierCabin.php | 3 --- .../structures/extended/class_BaseCabinStructure.php | 3 --- .../structures/extended/class_BaseDeckStructure.php | 3 --- .../structures/extended/class_BaseUpperStructure.php | 3 --- .../structures/extended/decks/cargo/class_CarDeck.php | 3 --- .../structures/extended/decks/cargo/class_TrainDeck.php | 3 --- .../structures/extended/decks/cargo/class_TruckDeck.php | 3 --- .../classes/structures/extended/decks/class_BaseDeck.php | 3 --- .../classes/structures/extended/upper/class_Bridge.php | 3 --- .../shipsimu/classes/user/class_ShipSimuBaseUser.php | 3 --- .../shipsimu/classes/user/extended/class_ShipSimuGuest.php | 3 --- .../classes/user/extended/class_ShipSimuMember.php | 5 +---- .../classes/wrapper/class_CompanyDatabaseWrapper.php | 3 --- .../wrapper/class_UserGovernmentDatabaseWrapper.php | 3 --- application/shipsimu/config.php | 3 --- application/shipsimu/debug.php | 3 --- .../shipsimu/exceptions/class_BirthdayInvalidException.php | 3 --- .../exceptions/class_CabinShipMismatchException.php | 3 --- .../exceptions/class_ContractAllreadySignedException.php | 3 --- .../exceptions/class_ContractPartnerMismatchException.php | 3 --- .../exceptions/class_DeckShipMismatchException.php | 3 --- .../exceptions/class_EmptyStructuresListException.php | 3 --- .../exceptions/class_InvalidContractPartnerException.php | 3 --- .../shipsimu/exceptions/class_InvalidIDFormatException.php | 3 --- .../exceptions/class_ItemNotInPriceListException.php | 3 --- .../exceptions/class_ItemNotTradeableException.php | 3 --- .../exceptions/class_MissingSimulatorIdException.php | 3 --- .../exceptions/class_MotorShipMismatchException.php | 3 --- .../exceptions/class_NoShippingCompanyOwnedException.php | 3 --- .../exceptions/class_NoShipyardsConstructedException.php | 3 --- .../class_PersonellListAlreadyCreatedException.php | 3 --- .../exceptions/class_RoomShipMismatchException.php | 3 --- .../exceptions/class_ShipNotConstructedException.php | 3 --- .../exceptions/class_ShipPartNotConstructableException.php | 3 --- .../exceptions/class_StructureShipMismatchException.php | 3 --- .../exceptions/class_StructuresOutOfBoundsException.php | 3 --- .../shipsimu/exceptions/class_ToMuchEmployeesException.php | 3 --- .../exceptions/class_TotalPriceNotCalculatedException.php | 3 --- .../class_UnsupportedLimitationPartException.php | 3 --- .../exceptions/class_WrongGenderSpecifiedException.php | 3 --- application/shipsimu/interfaces/class_BookableAccount.php | 3 --- .../shipsimu/interfaces/class_ConstructableShip.php | 3 --- .../shipsimu/interfaces/class_ConstructableShipPart.php | 3 --- application/shipsimu/interfaces/class_ContractPartner.php | 3 --- application/shipsimu/interfaces/class_Customer.php | 3 --- application/shipsimu/interfaces/class_Personellizer.php | 3 --- application/shipsimu/interfaces/class_SignableContract.php | 3 --- application/shipsimu/interfaces/class_TradeableItem.php | 3 --- core | 2 +- 134 files changed, 17 insertions(+), 415 deletions(-) diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php index 204800f..c3b74da 100644 --- a/application/selector/class_ApplicationHelper.php +++ b/application/selector/class_ApplicationHelper.php @@ -238,6 +238,3 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica return 'node_main'; } } - -// [EOF] -?> diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php index 8dd0648..381dd56 100644 --- a/application/selector/class_ApplicationSelector.php +++ b/application/selector/class_ApplicationSelector.php @@ -280,6 +280,3 @@ class ApplicationSelector extends BaseFrameworkSystem { } // END - for } } - -// [EOF] -?> diff --git a/application/selector/config.php b/application/selector/config.php index 49fe491..b5a704b 100644 --- a/application/selector/config.php +++ b/application/selector/config.php @@ -54,6 +54,3 @@ $cfg->setConfigEntry('news_reader_home_class', 'DefaultNewsReader'); // CFG: NEWS-HOME-LIMIT $cfg->setConfigEntry('news_home_limit', 10); - -// [EOF] -?> diff --git a/application/selector/data.php b/application/selector/data.php index 6e63348..a1f07eb 100644 --- a/application/selector/data.php +++ b/application/selector/data.php @@ -38,6 +38,3 @@ $app = call_user_func_array( $app->setAppName('Applikationsauswähler'); $app->setAppVersion('0.1a'); $app->setAppShortName($cfg->getConfigEntry('selector_name')); - -// [EOF] -?> diff --git a/application/selector/debug.php b/application/selector/debug.php index 077d378..f735e72 100644 --- a/application/selector/debug.php +++ b/application/selector/debug.php @@ -21,6 +21,3 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -// [EOF] -?> diff --git a/application/selector/exceptions.php b/application/selector/exceptions.php index 1a93fc0..d653e5e 100644 --- a/application/selector/exceptions.php +++ b/application/selector/exceptions.php @@ -82,6 +82,3 @@ assert_options(ASSERT_WARNING, 0); assert_options(ASSERT_BAIL, 0); assert_options(ASSERT_QUIET_EVAL, 0); assert_options(ASSERT_CALLBACK, '__assertHandler'); - -// [EOF] -?> diff --git a/application/selector/init.php b/application/selector/init.php index 9a0bd10..9aeb9b1 100644 --- a/application/selector/init.php +++ b/application/selector/init.php @@ -33,7 +33,4 @@ ApplicationHelper::createDebugInstance('ApplicationHelper'); // This application needs a database connection then we have to simply include // the inc/database.php script -require($cfg->getConfigEntry('base_path') . 'inc/database.php'); - -// [EOF] -?> +require $cfg->getConfigEntry('base_path') . 'inc/database.php'; diff --git a/application/selector/loader.php b/application/selector/loader.php index bcb574f..6a91215 100644 --- a/application/selector/loader.php +++ b/application/selector/loader.php @@ -24,6 +24,3 @@ // Scan for application's classes, exceptions and interfaces ClassLoader::scanApplicationClasses(); - -// [EOF] -?> diff --git a/application/selector/starter.php b/application/selector/starter.php index b6f4c45..7ba4259 100644 --- a/application/selector/starter.php +++ b/application/selector/starter.php @@ -48,6 +48,3 @@ if ((empty($app)) || (is_null($app))) { // Call user function call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array()); - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/class_BaseShipSimuAction.php b/application/shipsimu/classes/actions/class_BaseShipSimuAction.php index 41dcce0..186c151 100644 --- a/application/shipsimu/classes/actions/class_BaseShipSimuAction.php +++ b/application/shipsimu/classes/actions/class_BaseShipSimuAction.php @@ -57,6 +57,3 @@ class BaseShipSimuAction extends BaseAction { // Unfinished method } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php index 2fbee37..962faf5 100644 --- a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php +++ b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuLoginAction.php @@ -60,6 +60,3 @@ class ShipSimuLoginAction extends BaseShipSimuAction implements PerformableActio // Add your code here } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php index 56090bf..e1d47a2 100644 --- a/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php +++ b/application/shipsimu/classes/actions/ship-simu/class_ShipSimuProfileAction.php @@ -60,6 +60,3 @@ class ShipSimuProfileAction extends BaseShipSimuAction implements PerformableAct // Add your code here... } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php index 842d6cb..1d51201 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginCompanyAction.php @@ -77,6 +77,3 @@ class WebShipSimuLoginCompanyAction extends BaseShipSimuAction implements Comman $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php index fa62481..bb22691 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentStartupHelpAction.php @@ -80,6 +80,3 @@ class WebShipSimuLoginGovernmentStartupHelpAction extends BaseShipSimuAction imp $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_startup_help_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php index fcbc711..1e414b7 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginGovernmentTrainingAction.php @@ -80,6 +80,3 @@ class WebShipSimuLoginGovernmentTrainingAction extends BaseShipSimuAction implem $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('government_pays_training_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php index 9b066a9..c546241 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginLogoutAction.php @@ -76,6 +76,3 @@ class WebShipSimuLoginLogoutAction extends BaseShipSimuAction implements Command $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php index 58d6745..b0f13ed 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginProfileAction.php @@ -77,6 +77,3 @@ class WebShipSimuLoginProfileAction extends BaseShipSimuAction implements Comman $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php index 31c7337..42a2690 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginRefillAction.php @@ -82,6 +82,3 @@ class WebShipSimuLoginRefillAction extends BaseShipSimuAction implements Command $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('payment_discovery_filter', array($this))); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php index 8b26b8f..fc0eb31 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginStatusProblemAction.php @@ -77,6 +77,3 @@ class WebShipSimuLoginStatusProblemAction extends BaseShipSimuAction implements $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php index d839bd1..b363012 100644 --- a/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php +++ b/application/shipsimu/classes/actions/web/class_WebShipSimuLoginWelcomeAction.php @@ -76,6 +76,3 @@ class WebShipSimuLoginWelcomeAction extends BaseShipSimuAction implements Comman // Unfinished method } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/bank/class_BaseBank.php b/application/shipsimu/classes/bank/class_BaseBank.php index 21ae0d5..29bc895 100644 --- a/application/shipsimu/classes/bank/class_BaseBank.php +++ b/application/shipsimu/classes/bank/class_BaseBank.php @@ -55,6 +55,3 @@ abstract class BaseBank extends BaseFrameworkSystem { */ public abstract function ifMoneyBankHasOpened (); } - -// [EOF] -?> diff --git a/application/shipsimu/classes/bank/money/class_MoneyBank.php b/application/shipsimu/classes/bank/money/class_MoneyBank.php index 11d4d9e..f35e756 100644 --- a/application/shipsimu/classes/bank/money/class_MoneyBank.php +++ b/application/shipsimu/classes/bank/money/class_MoneyBank.php @@ -89,6 +89,3 @@ class MoneyBank extends BaseBank implements Registerable { return $hasOpened; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_BasePersonell.php b/application/shipsimu/classes/class_BasePersonell.php index 8e08ec3..7eecf8d 100644 --- a/application/shipsimu/classes/class_BasePersonell.php +++ b/application/shipsimu/classes/class_BasePersonell.php @@ -241,6 +241,3 @@ class BasePersonell extends BaseFrameworkSystem implements Personellizer { unset($this->married); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_BaseSimulator.php b/application/shipsimu/classes/class_BaseSimulator.php index e460013..a54ae22 100644 --- a/application/shipsimu/classes/class_BaseSimulator.php +++ b/application/shipsimu/classes/class_BaseSimulator.php @@ -297,6 +297,3 @@ class BaseSimulator extends BaseFrameworkSystem { return $this->currPart; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_Merchant.php b/application/shipsimu/classes/class_Merchant.php index 648e299..25d0220 100644 --- a/application/shipsimu/classes/class_Merchant.php +++ b/application/shipsimu/classes/class_Merchant.php @@ -104,6 +104,3 @@ class Merchant extends BaseFrameworkSystem { $this->makeDeprecated(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/class_WorksContract.php b/application/shipsimu/classes/class_WorksContract.php index bbe2f35..d22fc75 100644 --- a/application/shipsimu/classes/class_WorksContract.php +++ b/application/shipsimu/classes/class_WorksContract.php @@ -324,6 +324,3 @@ class WorksContract extends BaseFrameworkSystem implements SignableContract { return $totalPrice; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php index 14015a3..1b1fe8a 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuGuestLoginCommand.php @@ -77,7 +77,7 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable { $responseInstance->redirectToConfiguredUrl('app_login'); // Exit here - exit(); + exit; } catch (FrameworkException $e) { // Something went wrong here! $responseInstance->addFatalMessage($e->getMessage()); @@ -107,6 +107,3 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php index a266f26..37d2c5e 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuProfileCommand.php @@ -148,6 +148,3 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_change_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php index 1c9bd8e..6fdf3d4 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuRefillCommand.php @@ -107,6 +107,3 @@ class WebShipsimuRefillCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName($filterName)); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php index 181ce2f..3d4ade4 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuRegisterCommand.php @@ -112,6 +112,3 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('birthday_register_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php b/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php index 2a33a8f..72486ee 100644 --- a/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php +++ b/application/shipsimu/classes/commands/web/class_WebShipsimuUserLoginCommand.php @@ -77,7 +77,7 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable { $responseInstance->redirectToConfiguredUrl('app_login'); // Exit here - exit(); + exit; } catch (FrameworkException $e) { // Something went wrong here! $responseInstance->addFatalMessage($e->getMessage()); @@ -119,6 +119,3 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php b/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php index 7fed46f..85d616e 100644 --- a/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php +++ b/application/shipsimu/classes/commands/web/company/class_WebShipSimuCompanyCommand.php @@ -83,6 +83,3 @@ class WebShipSimuCompanyCommand extends BaseCommand implements Commandable { $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php index 54ddb05..52824c4 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedStartupCommand.php @@ -141,6 +141,3 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab // Empty for now } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php index 7119196..4a6bf01 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebGovernmentFailedTrainingCommand.php @@ -141,6 +141,3 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda // Empty for now } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php index 3153962..3715dc7 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php @@ -91,6 +91,3 @@ class WebShipsimuGovernmentStartupCommand extends BaseCommand implements Command $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_government_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php index 035e5e8..8d2eecd 100644 --- a/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php +++ b/application/shipsimu/classes/commands/web/government/class_WebShipsimuGovernmentTrainingCommand.php @@ -89,6 +89,3 @@ class WebShipsimuGovernmentTrainingCommand extends BaseCommand implements Comman $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_refill_verifier_filter')); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/companies/class_ShippingCompany.php b/application/shipsimu/classes/companies/class_ShippingCompany.php index cee5ccc..7263f0b 100644 --- a/application/shipsimu/classes/companies/class_ShippingCompany.php +++ b/application/shipsimu/classes/companies/class_ShippingCompany.php @@ -661,6 +661,3 @@ class ShippingCompany extends BaseSimulator implements Customer, ContractPartner $contractInstance->setMerchantInstance($merchantInstance); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/berths/class_Berth.php b/application/shipsimu/classes/constructions/berths/class_Berth.php index c96ba10..6535ce0 100644 --- a/application/shipsimu/classes/constructions/berths/class_Berth.php +++ b/application/shipsimu/classes/constructions/berths/class_Berth.php @@ -34,6 +34,3 @@ class Berth extends BaseConstruction { parent::__construct(__CLASS__); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/class_BaseConstruction.php b/application/shipsimu/classes/constructions/class_BaseConstruction.php index af08a39..4e6947d 100644 --- a/application/shipsimu/classes/constructions/class_BaseConstruction.php +++ b/application/shipsimu/classes/constructions/class_BaseConstruction.php @@ -31,6 +31,3 @@ class BaseConstruction extends BaseSimulator { parent::__construct($className); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/docks/class_DryDock.php b/application/shipsimu/classes/constructions/docks/class_DryDock.php index c9d6f8e..c3e07fa 100644 --- a/application/shipsimu/classes/constructions/docks/class_DryDock.php +++ b/application/shipsimu/classes/constructions/docks/class_DryDock.php @@ -31,6 +31,3 @@ class DryDock extends BaseConstruction { parent::__construct(__CLASS__); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/harbors/class_Harbor.php b/application/shipsimu/classes/constructions/harbors/class_Harbor.php index cf350ce..0d2af38 100644 --- a/application/shipsimu/classes/constructions/harbors/class_Harbor.php +++ b/application/shipsimu/classes/constructions/harbors/class_Harbor.php @@ -82,6 +82,3 @@ class Harbor extends BaseConstruction { $this->shipyardList->append(Shipyard::createShipyard($this, $shipyardName)); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/terminals/class_Terminal.php b/application/shipsimu/classes/constructions/terminals/class_Terminal.php index 9ae9985..3de0219 100644 --- a/application/shipsimu/classes/constructions/terminals/class_Terminal.php +++ b/application/shipsimu/classes/constructions/terminals/class_Terminal.php @@ -31,6 +31,3 @@ class Terminal extends BaseConstruction { parent::__construct(__CLASS__); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/constructions/yards/class_Shipyard.php b/application/shipsimu/classes/constructions/yards/class_Shipyard.php index 1959f83..630a09b 100644 --- a/application/shipsimu/classes/constructions/yards/class_Shipyard.php +++ b/application/shipsimu/classes/constructions/yards/class_Shipyard.php @@ -210,6 +210,3 @@ class Shipyard extends BaseConstruction { return $result; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php b/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php index 741cc5a..fd4b6bf 100644 --- a/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php +++ b/application/shipsimu/classes/controller/html/class_HtmlCompanyController.php @@ -85,11 +85,11 @@ class HtmlCompanyController extends BaseController implements Controller { $responseInstance->redirectToConfiguredUrl('login_failed'); // Exit here - exit(); + exit; } // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); @@ -101,6 +101,3 @@ class HtmlCompanyController extends BaseController implements Controller { $responseInstance->flushBuffer(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php b/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php index 217b6b5..65d7865 100644 --- a/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php +++ b/application/shipsimu/classes/controller/html/class_HtmlGovernmentFailedController.php @@ -85,11 +85,11 @@ class HtmlGovernmentFailedController extends BaseController implements Controlle $responseInstance->redirectToConfiguredUrl('login_failed'); // Exit here - exit(); + exit; } // This request was valid! :-D - $requestInstance->requestIsValid(); + $requestInstance->setIsRequestValid(TRUE); // Execute the command $commandInstance->execute($requestInstance, $responseInstance); @@ -101,6 +101,3 @@ class HtmlGovernmentFailedController extends BaseController implements Controlle $responseInstance->flushBuffer(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/drives/class_BaseDrive.php b/application/shipsimu/classes/drives/class_BaseDrive.php index 56f9802..9968f8e 100644 --- a/application/shipsimu/classes/drives/class_BaseDrive.php +++ b/application/shipsimu/classes/drives/class_BaseDrive.php @@ -59,6 +59,3 @@ class BaseDrive extends BaseSimulator { unset($this->price); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/drives/motor/class_Motor.php b/application/shipsimu/classes/drives/motor/class_Motor.php index 2f3479e..708ab69 100644 --- a/application/shipsimu/classes/drives/motor/class_Motor.php +++ b/application/shipsimu/classes/drives/motor/class_Motor.php @@ -51,6 +51,3 @@ class Motor extends BaseDrive implements TradeableItem, ConstructableShipPart { return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php b/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php index e42b021..c60563a 100644 --- a/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php +++ b/application/shipsimu/classes/factories/class_ShipSimuWebNewsFactory.php @@ -55,6 +55,3 @@ class ShipSimuWebNewsFactory extends BaseFrameworkSystem { // Do some stuff here } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php b/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php index b7ff113..3e120ef 100644 --- a/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php +++ b/application/shipsimu/classes/filter/book/refill/class_RefillRequestCurrencyTestBookFilter.php @@ -67,6 +67,3 @@ class RefillRequestCurrencyTestBookFilter extends BaseShipSimuFilter implements $userInstance->bookAmountDirectly($requestInstance); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php b/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php index 7a80cf2..afb6ce4 100644 --- a/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php +++ b/application/shipsimu/classes/filter/class_BaseShipSimuFilter.php @@ -45,6 +45,3 @@ class BaseShipSimuFilter extends BaseFilter { // Add something to do on every filter } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php index 7becf12..f02219d 100644 --- a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php +++ b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php @@ -63,16 +63,13 @@ class ShipSimuGovernmentPaysStartupHelpFilter extends BaseShipSimuFilter impleme // Now simply check for it if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovernmentPaysStartupHelp() === false)) { // Request is invalid - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Redirect to configured URL $responseInstance->redirectToConfiguredUrl('login_government_startup_failed'); // Stop processing here - exit(); + exit; } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php index 75eb1cc..f90d1b9 100644 --- a/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php +++ b/application/shipsimu/classes/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php @@ -63,16 +63,13 @@ class ShipSimuGovernmentPaysTrainingFilter extends BaseShipSimuFilter implements // Now simply check for it if ((!$userInstance instanceof ManageableMember) || ($userInstance->ifGovernmentPaysTraining() === false)) { // Request is invalid - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Redirect to configured URL $responseInstance->redirectToConfiguredUrl('login_government_training_failed'); // Stop processing here - exit(); + exit; } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/page/class_RefillPageFilter.php b/application/shipsimu/classes/filter/page/class_RefillPageFilter.php index d4680ba..b114ca0 100644 --- a/application/shipsimu/classes/filter/page/class_RefillPageFilter.php +++ b/application/shipsimu/classes/filter/page/class_RefillPageFilter.php @@ -60,7 +60,7 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable { // Is the configuration variable set? if ($this->getConfigInstance()->getConfigEntry('refill_page_active') === "N") { // Password is empty - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Add a message to the response $responseInstance->addFatalMessage('refill_page_not_active'); @@ -70,6 +70,3 @@ class RefillPageFilter extends BaseShipSimuFilter implements Filterable { } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php b/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php index 3abd7ba..351c643 100644 --- a/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php +++ b/application/shipsimu/classes/filter/validator/class_RefillRequestValidatorFilter.php @@ -61,7 +61,7 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera // Are all required request fields set? if (($requestInstance->isRequestElementSet('type') === false) || ($requestInstance->isRequestElementSet('amount') === false)) { // Something important is missing - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Add a message to the response $responseInstance->addFatalMessage('refill_page_required_fields_missing'); @@ -71,6 +71,3 @@ class RefillRequestValidatorFilter extends BaseShipSimuFilter implements Filtera } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php b/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php index 989e1d4..06e0996 100644 --- a/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php +++ b/application/shipsimu/classes/filter/validator/class_ShipSimuUserStatusGuestFilter.php @@ -64,16 +64,13 @@ class ShipSimuUserStatusGuestFilter extends BaseShipSimuFilter implements Filter // Is the user account confirmed? if ($userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USER_STATUS) == $this->getConfigInstance()->getConfigEntry('user_status_guest')) { // Request is invalid! - $requestInstance->requestIsValid(false); + $requestInstance->setIsRequestValid(FALSE); // Redirect to configured URL $responseInstance->redirectToConfiguredUrl('login_user_status_guest'); // Stop processing here - exit(); + exit; } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/government/class_SimplifiedGovernment.php b/application/shipsimu/classes/government/class_SimplifiedGovernment.php index 8999153..89d4a51 100644 --- a/application/shipsimu/classes/government/class_SimplifiedGovernment.php +++ b/application/shipsimu/classes/government/class_SimplifiedGovernment.php @@ -132,6 +132,3 @@ class SimplifiedGovernment extends BaseFrameworkSystem implements Registerable { return $maximumPayed; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php b/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php index 9725449..802749b 100644 --- a/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php +++ b/application/shipsimu/classes/login/class_ShipSimuGuestLogin.php @@ -123,6 +123,3 @@ class ShipSimuGuestLogin extends BaseFrameworkSystem implements LoginableUser, R } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/login/class_ShipSimuUserLogin.php b/application/shipsimu/classes/login/class_ShipSimuUserLogin.php index 0b3cf7c..43e7c20 100644 --- a/application/shipsimu/classes/login/class_ShipSimuUserLogin.php +++ b/application/shipsimu/classes/login/class_ShipSimuUserLogin.php @@ -128,6 +128,3 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser, Re } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php b/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php index b5c125e..3a7c66d 100644 --- a/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php +++ b/application/shipsimu/classes/login/helper/class_ShipSimuLoginHelper.php @@ -109,6 +109,3 @@ class ShipSimuLoginHelper extends BaseLoginHelper implements HelpableLogin { Registry::getRegistry()->addInstance('login', $loginInstance); } } - -// -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php b/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php index 1dc56b7..a96ef03 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuConfirmMenu.php @@ -45,6 +45,3 @@ class ShipSimuConfirmMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php b/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php index ef01389..93e9e49 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuHomeMenu.php @@ -45,6 +45,3 @@ class ShipSimuHomeMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php index 038b123..a4e2ce5 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLoginAreaMenu.php @@ -45,6 +45,3 @@ class ShipSimuLoginAreaMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php index 6978654..e98e8e5 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLoginFailedMenu.php @@ -45,6 +45,3 @@ class ShipSimuLoginFailedMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php index 7aa83e9..a51e7e8 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLoginMenu.php @@ -45,6 +45,3 @@ class ShipSimuLoginMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php b/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php index 76b6c68..f08884b 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuLogoutMenu.php @@ -45,6 +45,3 @@ class ShipSimuLogoutMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php b/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php index d2438f2..0208c37 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuRegisterMenu.php @@ -45,6 +45,3 @@ class ShipSimuRegisterMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php b/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php index fbc0434..876cf3c 100644 --- a/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php +++ b/application/shipsimu/classes/menu/class_ShipSimuStatusMenu.php @@ -45,6 +45,3 @@ class ShipSimuStatusMenu extends BaseMenu implements RenderableMenu { return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php b/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php index 0d2112c..6a301af 100644 --- a/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php +++ b/application/shipsimu/classes/menu/government/class_ShipSimuGovernmentFailedAreaMenu.php @@ -45,6 +45,3 @@ class ShipSimuGovernmentFailedAreaMenu extends BaseMenu implements RenderableMen return $menuInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php b/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php index 5136767..2bc503f 100644 --- a/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php +++ b/application/shipsimu/classes/opening/bank/class_MoneyBankRealtimeOpening.php @@ -58,6 +58,3 @@ class MoneyBankRealtimeOpening extends BaseOpening { $this->partialStub(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/opening/class_BaseOpening.php b/application/shipsimu/classes/opening/class_BaseOpening.php index 78f8983..e8f886a 100644 --- a/application/shipsimu/classes/opening/class_BaseOpening.php +++ b/application/shipsimu/classes/opening/class_BaseOpening.php @@ -56,5 +56,3 @@ abstract class BaseOpening extends BaseFrameworkSystem { public abstract function ifWithinOpeningTimes (); } -// [EOF] -?> diff --git a/application/shipsimu/classes/parts/class_BaseShipPart.php b/application/shipsimu/classes/parts/class_BaseShipPart.php index aca83a9..8d476bb 100644 --- a/application/shipsimu/classes/parts/class_BaseShipPart.php +++ b/application/shipsimu/classes/parts/class_BaseShipPart.php @@ -46,6 +46,3 @@ class BaseShipPart extends BaseSimulator { unset($this->price); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php b/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php index bcd7b30..ea31cce 100644 --- a/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php +++ b/application/shipsimu/classes/parts/maschineroom/class_MaschineRoom.php @@ -42,6 +42,3 @@ class MaschineRoom extends BaseShipPart { return $roomInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/personell/class_SimulatorPersonell.php b/application/shipsimu/classes/personell/class_SimulatorPersonell.php index 8ff01e7..a0d0206 100644 --- a/application/shipsimu/classes/personell/class_SimulatorPersonell.php +++ b/application/shipsimu/classes/personell/class_SimulatorPersonell.php @@ -322,6 +322,3 @@ class SimulatorPersonell extends BasePersonell { $this->makeDeprecated(); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/personell/company/class_CompanyEmployee.php b/application/shipsimu/classes/personell/company/class_CompanyEmployee.php index 472692e..a376c00 100644 --- a/application/shipsimu/classes/personell/company/class_CompanyEmployee.php +++ b/application/shipsimu/classes/personell/company/class_CompanyEmployee.php @@ -80,6 +80,3 @@ class CompanyEmployee extends SimulatorPersonell { unset($this->employeeList); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/registration/class_ShipSimuRegistration.php b/application/shipsimu/classes/registration/class_ShipSimuRegistration.php index 674d189..64c34d5 100644 --- a/application/shipsimu/classes/registration/class_ShipSimuRegistration.php +++ b/application/shipsimu/classes/registration/class_ShipSimuRegistration.php @@ -202,6 +202,3 @@ class ShipSimuRegistration extends BaseRegistration implements UserRegister { $criteriaInstance->addCriteria('registered', date('Y-m-d H:i:s', time())); } } - -// -?> diff --git a/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php b/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php index 5b5fd9c..112ea35 100644 --- a/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php +++ b/application/shipsimu/classes/resolver/command/html/class_HtmlCompanyCommandResolver.php @@ -72,6 +72,3 @@ class HtmlCompanyCommandResolver extends BaseCommandResolver implements CommandR return $resolverInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php b/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php index 16edb50..6aa841e 100644 --- a/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php +++ b/application/shipsimu/classes/resolver/command/html/class_HtmlGovernmentFailedCommandResolver.php @@ -72,6 +72,3 @@ class HtmlGovernmentFailedCommandResolver extends BaseCommandResolver implements return $resolverInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php b/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php index dc57483..6e4d3b9 100644 --- a/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php +++ b/application/shipsimu/classes/resolver/controller/html/class_ShipSimuHtmlControllerResolver.php @@ -99,6 +99,3 @@ class ShipSimuHtmlControllerResolver extends BaseControllerResolver implements C return $controllerInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/ships/class_BaseShip.php b/application/shipsimu/classes/ships/class_BaseShip.php index ae22ca3..73ab63d 100644 --- a/application/shipsimu/classes/ships/class_BaseShip.php +++ b/application/shipsimu/classes/ships/class_BaseShip.php @@ -162,6 +162,3 @@ class BaseShip extends BaseSimulator { $this->numAnchor = (int) $numAnchor; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/ships/passenger/class_PassengerShip.php b/application/shipsimu/classes/ships/passenger/class_PassengerShip.php index 70fa5ed..a1e3d5b 100644 --- a/application/shipsimu/classes/ships/passenger/class_PassengerShip.php +++ b/application/shipsimu/classes/ships/passenger/class_PassengerShip.php @@ -82,6 +82,3 @@ class PassengerShip extends BaseShip implements ConstructableShip { return $numBeds; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/class_BaseStructure.php b/application/shipsimu/classes/structures/class_BaseStructure.php index 59318cb..81943ec 100644 --- a/application/shipsimu/classes/structures/class_BaseStructure.php +++ b/application/shipsimu/classes/structures/class_BaseStructure.php @@ -46,6 +46,3 @@ class BaseStructure extends BaseSimulator { unset($this->price); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php b/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php index b513944..5c178f6 100644 --- a/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/class_BaseCabin.php @@ -33,6 +33,3 @@ class BaseCabin extends BaseCabinStructure { return ($this->isClass("BaseCabin")); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php index beceae8..84f9091 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_EconomyCabin.php @@ -53,6 +53,3 @@ class EconomyCabin extends BaseCabin implements TradeableItem, ConstructableShip return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php index 23b877c..8d8a3aa 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_LowCabin.php @@ -53,6 +53,3 @@ class LowCabin extends BaseCabin implements TradeableItem, ConstructableShipPart return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php index 78cb9c4..fc6d8a9 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_LuxuryCabin.php @@ -53,6 +53,3 @@ class LuxuryCabin extends BaseCabin implements TradeableItem, ConstructableShipP return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php b/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php index 522e301..f57329c 100644 --- a/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php +++ b/application/shipsimu/classes/structures/extended/cabines/ship/class_PremierCabin.php @@ -53,6 +53,3 @@ class PremierCabin extends BaseCabin implements TradeableItem, ConstructableShip return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php b/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php index 77a81ae..b6300f0 100644 --- a/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php +++ b/application/shipsimu/classes/structures/extended/class_BaseCabinStructure.php @@ -130,6 +130,3 @@ class BaseCabinStructure extends BaseStructure { return $cabinBeds; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php b/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php index 0f44a55..86b4245 100644 --- a/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php +++ b/application/shipsimu/classes/structures/extended/class_BaseDeckStructure.php @@ -56,6 +56,3 @@ class BaseDeckStructure extends BaseStructure { return $this->numDecks; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php b/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php index dd6934c..b6eacc7 100644 --- a/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php +++ b/application/shipsimu/classes/structures/extended/class_BaseUpperStructure.php @@ -32,6 +32,3 @@ class BaseUpperStructure extends BaseStructure { parent::__construct($className); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php b/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php index d87dd09..b6191e9 100644 --- a/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/cargo/class_CarDeck.php @@ -51,6 +51,3 @@ class CarDeck extends BaseDeck implements TradeableItem, ConstructableShipPart { return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php b/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php index 07410ea..296114e 100644 --- a/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/cargo/class_TrainDeck.php @@ -51,6 +51,3 @@ class TrainDeck extends BaseDeck implements TradeableItem, ConstructableShipPart return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php b/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php index 6a87d85..c435caf 100644 --- a/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/cargo/class_TruckDeck.php @@ -52,6 +52,3 @@ class TruckDeck extends BaseDeck implements TradeableItem, ConstructableShipPart return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php b/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php index 7b92d68..d31a40d 100644 --- a/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php +++ b/application/shipsimu/classes/structures/extended/decks/class_BaseDeck.php @@ -32,6 +32,3 @@ class BaseDeck extends BaseDeckStructure { parent::__construct($className); } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/structures/extended/upper/class_Bridge.php b/application/shipsimu/classes/structures/extended/upper/class_Bridge.php index 1c3b674..43f41cd 100644 --- a/application/shipsimu/classes/structures/extended/upper/class_Bridge.php +++ b/application/shipsimu/classes/structures/extended/upper/class_Bridge.php @@ -50,6 +50,3 @@ class Bridge extends BaseUpperStructure implements TradeableItem, ConstructableS return true; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/user/class_ShipSimuBaseUser.php b/application/shipsimu/classes/user/class_ShipSimuBaseUser.php index 75de2c7..6795a87 100644 --- a/application/shipsimu/classes/user/class_ShipSimuBaseUser.php +++ b/application/shipsimu/classes/user/class_ShipSimuBaseUser.php @@ -256,6 +256,3 @@ class ShipSimuBaseUser extends BaseUser implements Registerable, Updateable { return $hasOpened; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php b/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php index a66de18..ca2d531 100644 --- a/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php +++ b/application/shipsimu/classes/user/extended/class_ShipSimuGuest.php @@ -103,6 +103,3 @@ class ShipSimuGuest extends ShipSimuBaseUser implements ManageableGuest { // No updates will be flushed to database! } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/user/extended/class_ShipSimuMember.php b/application/shipsimu/classes/user/extended/class_ShipSimuMember.php index a37ef16..0f425fa 100644 --- a/application/shipsimu/classes/user/extended/class_ShipSimuMember.php +++ b/application/shipsimu/classes/user/extended/class_ShipSimuMember.php @@ -110,7 +110,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka $userInstance = new ShipSimuMember(); $userInstance->partialStub("We need to add more ways of creating user classes here."); $userInstance->debugBackTrace(); - exit(); + exit; } // Return the prepared instance @@ -215,6 +215,3 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, Booka } // END - if } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php b/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php index 1552e67..28257b1 100644 --- a/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php +++ b/application/shipsimu/classes/wrapper/class_CompanyDatabaseWrapper.php @@ -124,6 +124,3 @@ class CompanyDatabaseWrapper extends BaseDatabaseWrapper { return $this->companyInstance; } } - -// [EOF] -?> diff --git a/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php b/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php index 6392d6b..294ebc3 100644 --- a/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php +++ b/application/shipsimu/classes/wrapper/class_UserGovernmentDatabaseWrapper.php @@ -65,6 +65,3 @@ class UserGovernmentDatabaseWrapper extends BaseDatabaseWrapper { $requestInstance->debugInstance(); } } - -// [EOF] -?> diff --git a/application/shipsimu/config.php b/application/shipsimu/config.php index 72cccec..266c54c 100644 --- a/application/shipsimu/config.php +++ b/application/shipsimu/config.php @@ -537,6 +537,3 @@ $cfg->setConfigEntry('moneybank_activated', 'Y'); // CFG: MONEYBANK-OPENING-CLASS $cfg->setConfigEntry('moneybank_opening_class', 'MoneyBankRealtimeOpening'); - -// [EOF] -?> diff --git a/application/shipsimu/debug.php b/application/shipsimu/debug.php index 11bf631..832b744 100644 --- a/application/shipsimu/debug.php +++ b/application/shipsimu/debug.php @@ -56,6 +56,3 @@ //define('DEBUG_CONTRACT', true); // Haendler debuggen //define('DEBUG_MERCHANT', true); - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_BirthdayInvalidException.php b/application/shipsimu/exceptions/class_BirthdayInvalidException.php index ed8e189..76f9a7b 100644 --- a/application/shipsimu/exceptions/class_BirthdayInvalidException.php +++ b/application/shipsimu/exceptions/class_BirthdayInvalidException.php @@ -37,6 +37,3 @@ class BirthdayInvalidException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_CabinShipMismatchException.php b/application/shipsimu/exceptions/class_CabinShipMismatchException.php index 6b9120b..870a815 100644 --- a/application/shipsimu/exceptions/class_CabinShipMismatchException.php +++ b/application/shipsimu/exceptions/class_CabinShipMismatchException.php @@ -23,6 +23,3 @@ */ class CabinShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ContractAllreadySignedException.php b/application/shipsimu/exceptions/class_ContractAllreadySignedException.php index fc17f64..ab4b9c8 100644 --- a/application/shipsimu/exceptions/class_ContractAllreadySignedException.php +++ b/application/shipsimu/exceptions/class_ContractAllreadySignedException.php @@ -34,6 +34,3 @@ class ContractAllreadySignedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php b/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php index fce9748..f0c9b2a 100644 --- a/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php +++ b/application/shipsimu/exceptions/class_ContractPartnerMismatchException.php @@ -34,6 +34,3 @@ class ContractPartnerMismatchException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_DeckShipMismatchException.php b/application/shipsimu/exceptions/class_DeckShipMismatchException.php index 937cd6e..998cb60 100644 --- a/application/shipsimu/exceptions/class_DeckShipMismatchException.php +++ b/application/shipsimu/exceptions/class_DeckShipMismatchException.php @@ -23,6 +23,3 @@ */ class DeckShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_EmptyStructuresListException.php b/application/shipsimu/exceptions/class_EmptyStructuresListException.php index 9c1eee2..805bd00 100644 --- a/application/shipsimu/exceptions/class_EmptyStructuresListException.php +++ b/application/shipsimu/exceptions/class_EmptyStructuresListException.php @@ -32,6 +32,3 @@ class EmptyStructuresListException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_InvalidContractPartnerException.php b/application/shipsimu/exceptions/class_InvalidContractPartnerException.php index 8f4823e..b298119 100644 --- a/application/shipsimu/exceptions/class_InvalidContractPartnerException.php +++ b/application/shipsimu/exceptions/class_InvalidContractPartnerException.php @@ -32,6 +32,3 @@ class InvalidContractPartnerException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_InvalidIDFormatException.php b/application/shipsimu/exceptions/class_InvalidIDFormatException.php index 78e2e00..f6265fc 100644 --- a/application/shipsimu/exceptions/class_InvalidIDFormatException.php +++ b/application/shipsimu/exceptions/class_InvalidIDFormatException.php @@ -32,6 +32,3 @@ class InvalidIDFormatException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ItemNotInPriceListException.php b/application/shipsimu/exceptions/class_ItemNotInPriceListException.php index 0013e92..6ed0bae 100644 --- a/application/shipsimu/exceptions/class_ItemNotInPriceListException.php +++ b/application/shipsimu/exceptions/class_ItemNotInPriceListException.php @@ -32,6 +32,3 @@ class ItemNotInPriceListException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ItemNotTradeableException.php b/application/shipsimu/exceptions/class_ItemNotTradeableException.php index 074f17e..11d3484 100644 --- a/application/shipsimu/exceptions/class_ItemNotTradeableException.php +++ b/application/shipsimu/exceptions/class_ItemNotTradeableException.php @@ -32,6 +32,3 @@ class ItemNotTradeableException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_MissingSimulatorIdException.php b/application/shipsimu/exceptions/class_MissingSimulatorIdException.php index 09a55f3..6fd3d32 100644 --- a/application/shipsimu/exceptions/class_MissingSimulatorIdException.php +++ b/application/shipsimu/exceptions/class_MissingSimulatorIdException.php @@ -33,6 +33,3 @@ class MissingSimulatorIdException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_MotorShipMismatchException.php b/application/shipsimu/exceptions/class_MotorShipMismatchException.php index 7e688c2..601857e 100644 --- a/application/shipsimu/exceptions/class_MotorShipMismatchException.php +++ b/application/shipsimu/exceptions/class_MotorShipMismatchException.php @@ -23,6 +23,3 @@ */ class MotorShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php b/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php index 848362e..fcd3581 100644 --- a/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php +++ b/application/shipsimu/exceptions/class_NoShippingCompanyOwnedException.php @@ -41,6 +41,3 @@ class NoShippingCompanyOwnedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php b/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php index 52cf913..b767993 100644 --- a/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php +++ b/application/shipsimu/exceptions/class_NoShipyardsConstructedException.php @@ -36,6 +36,3 @@ class NoShipyardsConstructedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php b/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php index c89dc44..7a37133 100644 --- a/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php +++ b/application/shipsimu/exceptions/class_PersonellListAlreadyCreatedException.php @@ -32,6 +32,3 @@ class PersonellListAlreadyCreatedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_RoomShipMismatchException.php b/application/shipsimu/exceptions/class_RoomShipMismatchException.php index d84528c..6870871 100644 --- a/application/shipsimu/exceptions/class_RoomShipMismatchException.php +++ b/application/shipsimu/exceptions/class_RoomShipMismatchException.php @@ -23,6 +23,3 @@ */ class RoomShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ShipNotConstructedException.php b/application/shipsimu/exceptions/class_ShipNotConstructedException.php index 3313c36..7f7905a 100644 --- a/application/shipsimu/exceptions/class_ShipNotConstructedException.php +++ b/application/shipsimu/exceptions/class_ShipNotConstructedException.php @@ -23,6 +23,3 @@ */ class ShipNotConstructedException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php b/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php index 48b4fe7..3d42ff4 100644 --- a/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php +++ b/application/shipsimu/exceptions/class_ShipPartNotConstructableException.php @@ -32,6 +32,3 @@ class ShipPartNotConstructableException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_StructureShipMismatchException.php b/application/shipsimu/exceptions/class_StructureShipMismatchException.php index 62152e8..5495c75 100644 --- a/application/shipsimu/exceptions/class_StructureShipMismatchException.php +++ b/application/shipsimu/exceptions/class_StructureShipMismatchException.php @@ -23,6 +23,3 @@ */ class StructureShipMismatchException extends FrameworkException { } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php b/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php index 916207f..56fcb78 100644 --- a/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php +++ b/application/shipsimu/exceptions/class_StructuresOutOfBoundsException.php @@ -30,6 +30,3 @@ class StructuresOutOfBoundsException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_ToMuchEmployeesException.php b/application/shipsimu/exceptions/class_ToMuchEmployeesException.php index a6bffb0..0c95176 100644 --- a/application/shipsimu/exceptions/class_ToMuchEmployeesException.php +++ b/application/shipsimu/exceptions/class_ToMuchEmployeesException.php @@ -33,6 +33,3 @@ class ToMuchEmployeesException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php b/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php index 7aa57ae..218633a 100644 --- a/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php +++ b/application/shipsimu/exceptions/class_TotalPriceNotCalculatedException.php @@ -32,6 +32,3 @@ class TotalPriceNotCalculatedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php b/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php index ee7aa5a..217aa89 100644 --- a/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php +++ b/application/shipsimu/exceptions/class_UnsupportedLimitationPartException.php @@ -30,6 +30,3 @@ class UnsupportedLimitationPartException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php b/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php index 306a680..cab603e 100644 --- a/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php +++ b/application/shipsimu/exceptions/class_WrongGenderSpecifiedException.php @@ -30,6 +30,3 @@ class WrongGenderSpecifiedException extends FrameworkException { parent::__construct($message, $code); } } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_BookableAccount.php b/application/shipsimu/interfaces/class_BookableAccount.php index 3f3a575..b794268 100644 --- a/application/shipsimu/interfaces/class_BookableAccount.php +++ b/application/shipsimu/interfaces/class_BookableAccount.php @@ -31,6 +31,3 @@ interface BookableAccount extends FrameworkInterface { */ function bookAmountDirectly (Requestable $requestInstance); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_ConstructableShip.php b/application/shipsimu/interfaces/class_ConstructableShip.php index db76fd5..58aca0c 100644 --- a/application/shipsimu/interfaces/class_ConstructableShip.php +++ b/application/shipsimu/interfaces/class_ConstructableShip.php @@ -23,6 +23,3 @@ */ interface ConstructableShip extends FrameworkInterface { } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_ConstructableShipPart.php b/application/shipsimu/interfaces/class_ConstructableShipPart.php index 8135bc3..6797a52 100644 --- a/application/shipsimu/interfaces/class_ConstructableShipPart.php +++ b/application/shipsimu/interfaces/class_ConstructableShipPart.php @@ -23,6 +23,3 @@ */ interface ConstructableShipPart extends FrameworkInterface { } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_ContractPartner.php b/application/shipsimu/interfaces/class_ContractPartner.php index 35b4b6d..2f8053c 100644 --- a/application/shipsimu/interfaces/class_ContractPartner.php +++ b/application/shipsimu/interfaces/class_ContractPartner.php @@ -31,6 +31,3 @@ interface ContractPartner extends FrameworkInterface { */ function isContractPartner (SignableContract $contractInstance); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_Customer.php b/application/shipsimu/interfaces/class_Customer.php index 5de5210..82093e5 100644 --- a/application/shipsimu/interfaces/class_Customer.php +++ b/application/shipsimu/interfaces/class_Customer.php @@ -50,6 +50,3 @@ interface Customer extends FrameworkInterface { */ function withdrawFromContract (SignableContract $contractInstance); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_Personellizer.php b/application/shipsimu/interfaces/class_Personellizer.php index b56df14..e1a7846 100644 --- a/application/shipsimu/interfaces/class_Personellizer.php +++ b/application/shipsimu/interfaces/class_Personellizer.php @@ -195,6 +195,3 @@ interface Personellizer extends FrameworkInterface { */ function decreaseSalary ($sub); } - -// [EOF] -?> diff --git a/application/shipsimu/interfaces/class_SignableContract.php b/application/shipsimu/interfaces/class_SignableContract.php index a8f62ce..8bf4d9c 100644 --- a/application/shipsimu/interfaces/class_SignableContract.php +++ b/application/shipsimu/interfaces/class_SignableContract.php @@ -25,6 +25,3 @@ interface SignableContract extends FrameworkInterface { // Sign the contract function signContract (ContractPartner $partnerInstance, ContractPartner $partyInstance); } - -// [EOF] -?> \ No newline at end of file diff --git a/application/shipsimu/interfaces/class_TradeableItem.php b/application/shipsimu/interfaces/class_TradeableItem.php index f850be2..66756c4 100644 --- a/application/shipsimu/interfaces/class_TradeableItem.php +++ b/application/shipsimu/interfaces/class_TradeableItem.php @@ -30,6 +30,3 @@ interface TradeableItem extends FrameworkInterface { */ function isTradeable (); } - -// [EOF] -?> diff --git a/core b/core index ad17ce1..262f905 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ad17ce1c5fe13f2290e74bec676f23e65c2e9100 +Subproject commit 262f905be8d6f9dc9fd02acc9505cb45ef2a53f6 -- 2.39.2