Method redirectToConfiguredUrl() does now append the suffix '_url' to all config...

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php
index 80e4a5d00423ce0fdee92fe574dc735b070e13ee..6d5f7f8038e9c0b125825d198c13bc3f2122eec0 100644 (file)
--- 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 fa7aff5322642ec7f0e8db382426c9709d896b04..300a6e801d816bcb570fd0f1ef1facf29f0b1cb6 100644 (file)
--- 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 e554d9ac6fb46d2bd18f2c571d7da9fc60507e8e..37cc02c7d51a9d166e8c1583178acfa15709a0de 100644 (file)
--- 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 806fb4099d5b7f8e42e8463a52b2490ab1f22684..078e2c8447f4aa7a9f04bc6f48ebd6ce92f39013 100644 (file)
--- 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 6daa67fa3a7ba90e30b843fe7dee96aca2eed66a..9fb21e7ec9a8a4ffbd6a147bb5c3e3fc0f1befa5 100644 (file)
--- 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 50a2b1fa528c5b30325be34b21278b5cbf0d57da..9d548c8d061d0f9b9fa1d0339f5cacd50d7d290f 100644 (file)
--- 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();