From a18a575e949c09eb7bf7eadd8959ba2963420d35 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 21 Dec 2008 04:24:48 +0000 Subject: [PATCH] Method redirectToConfiguredUrl() does now append the suffix '_url' to all config entries --- .../commands/web/class_WebShipsimuGuestLoginCommand.php | 2 +- .../main/commands/web/class_WebShipsimuRefillCommand.php | 6 +++--- .../main/commands/web/class_WebShipsimuUserLoginCommand.php | 2 +- .../controller/web/class_WebGovernmentFailedController.php | 2 +- .../class_ShipSimuGovernmentPaysStartupHelpFilter.php | 2 +- .../class_ShipSimuGovernmentPaysTrainingFilter.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php index 80e4a5d..6d5f7f8 100644 --- a/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php +++ b/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php @@ -78,7 +78,7 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable { // Try to redirect here try { // Redirect... - $responseInstance->redirectToConfiguredUrl('app_login_url'); + $responseInstance->redirectToConfiguredUrl('app_login'); // Exit here exit(); diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuRefillCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuRefillCommand.php index fa7aff5..300a6e8 100644 --- a/application/ship-simu/main/commands/web/class_WebShipsimuRefillCommand.php +++ b/application/ship-simu/main/commands/web/class_WebShipsimuRefillCommand.php @@ -59,10 +59,10 @@ class WebShipsimuRefillCommand extends BaseCommand implements Commandable { * @param $requestInstance An instance of a class with an Requestable interface * @param $responseInstance An instance of a class with an Responseable interface * @return void - * @todo We should add something like payment discovery here (where to withdraw, e.g. external API) */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { - // Unfinished method + // This method does currently redirect if all goes right + $responseInstance->redirectToConfiguredUrl('refill_page_done'); } /** @@ -101,7 +101,7 @@ class WebShipsimuRefillCommand extends BaseCommand implements Commandable { ); // Now, try to load that filter - $controllerInstance->addPostFilter(ObjectFactory::createObjectByConfiguredName($filterName)); + $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName($filterName)); } } diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php index e554d9a..37cc02c 100644 --- a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php +++ b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php @@ -78,7 +78,7 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable { // Try to redirect here try { // Redirect... - $responseInstance->redirectToConfiguredUrl('app_login_url'); + $responseInstance->redirectToConfiguredUrl('app_login'); // Exit here exit(); diff --git a/application/ship-simu/main/controller/web/class_WebGovernmentFailedController.php b/application/ship-simu/main/controller/web/class_WebGovernmentFailedController.php index 806fb40..078e2c8 100644 --- a/application/ship-simu/main/controller/web/class_WebGovernmentFailedController.php +++ b/application/ship-simu/main/controller/web/class_WebGovernmentFailedController.php @@ -82,7 +82,7 @@ class WebGovernmentFailedController extends BaseController implements Controller $this->executePreFilters($requestInstance, $responseInstance); } catch (UserAuthorizationException $e) { // Redirect to main page - $responseInstance->redirectToConfiguredUrl('login_failed_url'); + $responseInstance->redirectToConfiguredUrl('login_failed'); // Exit here exit(); diff --git a/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php b/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php index 6daa67f..9fb21e7 100644 --- a/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php +++ b/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysStartupHelpFilter.php @@ -66,7 +66,7 @@ class ShipSimuGovernmentPaysStartupHelpFilter extends BaseShipSimuFilter impleme $requestInstance->requestIsValid(false); // Redirect to configured URL - $responseInstance->redirectToConfiguredUrl('login_government_startup_failed_url'); + $responseInstance->redirectToConfiguredUrl('login_government_startup_failed'); // Stop processing here exit(); diff --git a/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php b/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php index 50a2b1f..9d548c8 100644 --- a/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php +++ b/application/ship-simu/main/filter/government/class_ShipSimuGovernmentPaysTrainingFilter.php @@ -66,7 +66,7 @@ class ShipSimuGovernmentPaysTrainingFilter extends BaseShipSimuFilter implements $requestInstance->requestIsValid(false); // Redirect to configured URL - $responseInstance->redirectToConfiguredUrl('login_government_training_failed_url'); + $responseInstance->redirectToConfiguredUrl('login_government_training_failed'); // Stop processing here exit(); -- 2.39.2