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

diff --git a/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php b/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php
index 15fd499af9c85d75ec7bc9931f9dbcb35c535212..d10f2a6373acdf1fd455992341d24b2b115fd56b 100644 (file)
--- a/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php
+++ b/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php
@@ -64,7 +64,7 @@ class LoginAfterRegistrationAction extends BaseAction implements PerformableActi
                        // Try to redirect here
                        try {
                                // Redirect...
-                               $responseInstance->redirectToConfiguredUrl('app_login_url');
+                               $responseInstance->redirectToConfiguredUrl('app_login');
 
                                // Stop here
                                exit();

diff --git a/inc/classes/main/commands/web/class_WebLogoutCommand.php b/inc/classes/main/commands/web/class_WebLogoutCommand.php
index 91a9d518d788934d1213bc0fcbd0c076e7107e5d..d82dec023ec8db216d2545a6167beddb38b401f7 100644 (file)
--- a/inc/classes/main/commands/web/class_WebLogoutCommand.php
+++ b/inc/classes/main/commands/web/class_WebLogoutCommand.php
@@ -67,7 +67,7 @@ class WebLogoutCommand extends BaseCommand implements Commandable {
                $authInstance->destroyAuthData();
 
                // Redirect to "logout done" page
-               $responseInstance->redirectToConfiguredUrl('logout_done_url');
+               $responseInstance->redirectToConfiguredUrl('logout_done');
 
                // Exit here
                exit();

diff --git a/inc/classes/main/controller/form/class_WebDoFormController.php b/inc/classes/main/controller/form/class_WebDoFormController.php
index 8691c3d29da2bbf80bb7688278126adc81e14e57..ed67dba82f12778b6110e65d8d8a85768f80cb01 100644 (file)
--- a/inc/classes/main/controller/form/class_WebDoFormController.php
+++ b/inc/classes/main/controller/form/class_WebDoFormController.php
@@ -75,7 +75,7 @@ class WebDoFormController 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/inc/classes/main/controller/login/class_WebLoginAreaController.php b/inc/classes/main/controller/login/class_WebLoginAreaController.php
index 75690eb32a5a6bdb3dd111af8fc1f22769015f13..d2eb1909124702f7f51f80403c38b6bb7eb952d5 100644 (file)
--- a/inc/classes/main/controller/login/class_WebLoginAreaController.php
+++ b/inc/classes/main/controller/login/class_WebLoginAreaController.php
@@ -82,7 +82,7 @@ class WebLoginAreaController 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/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
index e4620cb2dc3735bc5d1f6429c58ff6a30e49be72..0c67b7660e0bedb56d01d25045abf0cf42eb707c 100644 (file)
--- a/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -96,7 +96,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
                        $requestInstance->requestIsValid(false);
 
                        // Redirect to error page
-                       $responseInstance->redirectToConfiguredUrl('confirm_code_invalid_url');
+                       $responseInstance->redirectToConfiguredUrl('confirm_code_invalid');
 
                        // Stop processing here
                        exit();

diff --git a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
index e0c34990c8ec88d66607e4da845ed5c7c8ce7c4a..d994de3b6df4ac952ca8990082902e1d084873a3 100644 (file)
--- a/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserStatusVerifierFilter.php
@@ -62,7 +62,7 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable {
                        $requestInstance->requestIsValid(false);
 
                        // Redirect to configured URL
-                       $responseInstance->redirectToConfiguredUrl('login_user_status_url');
+                       $responseInstance->redirectToConfiguredUrl('login_user_status');
 
                        // Stop processing here
                        exit();

diff --git a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index 7df7795a85b39b6de008151a66a817549579de0d..ff103aa4c5bdef44f3c4de139f6e418c6e9ebda0 100644 (file)
--- a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -65,7 +65,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
                        $requestInstance->requestIsValid(false);
 
                        // Redirect to configured URL
-                       $responseInstance->redirectToConfiguredUrl('user_unconfirmed_email_missing_url');
+                       $responseInstance->redirectToConfiguredUrl('user_unconfirmed_email_missing');
 
                        // Stop processing here
                        exit();
@@ -77,7 +77,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
                        $requestInstance->requestIsValid(false);
 
                        // Redirect to configured URL
-                       $responseInstance->redirectToConfiguredUrl('user_not_unconfirmed_url');
+                       $responseInstance->redirectToConfiguredUrl('user_not_unconfirmed');
 
                        // Stop processing here
                        exit();

diff --git a/inc/classes/main/response/http/class_HttpResponse.php b/inc/classes/main/response/http/class_HttpResponse.php
index 50bf2deb8ea4ecd9b9a154d8c99454c55003dbe4..c553263576a2b0ecb00761e7fc92c1d1bd653b6d 100644 (file)
--- a/inc/classes/main/response/http/class_HttpResponse.php
+++ b/inc/classes/main/response/http/class_HttpResponse.php
@@ -135,7 +135,7 @@ class HttpResponse extends BaseResponse implements Responseable {
                $this->getTemplateInstance()->assignApplicationData($this->getApplicationInstance());
 
                // Get the url from config
-               $url = $this->getConfigInstance()->readConfig($configEntry);
+               $url = $this->getConfigInstance()->readConfig($configEntry . "_url");
 
                // Compile the URL
                $url = $this->getTemplateInstance()->compileRawCode($url);

diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php
index c03e6ea6e5519c2672449525fa6634bd68a83328..10fb811201beeefb89604a80692e68b244d82c39 100644 (file)
--- a/inc/classes/main/response/image/class_ImageResponse.php
+++ b/inc/classes/main/response/image/class_ImageResponse.php
@@ -149,7 +149,7 @@ class ImageResponse extends BaseResponse implements Responseable {
                $this->getTemplateInstance()->assignApplicationData($this->getApplicationInstance());
 
                // Get the url from config
-               $url = $this->getConfigInstance()->readConfig($configEntry);
+               $url = $this->getConfigInstance()->readConfig($configEntry . "_url");
 
                // Compile the URL
                $url = $this->getTemplateInstance()->compileRawCode($url);