From: Roland Häder Date: Sun, 21 Dec 2008 04:22:53 +0000 (+0000) Subject: Method redirectToConfiguredUrl() does now append the suffix '_url' to all config... X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=7a7444283b983623879c5e271ec71cd8f2cf16a4 Method redirectToConfiguredUrl() does now append the suffix '_url' to all config entries --- diff --git a/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php b/inc/classes/main/actions/post_registration/class_LoginAfterRegistrationAction.php index 15fd499a..d10f2a63 100644 --- 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 91a9d518..d82dec02 100644 --- 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 8691c3d2..ed67dba8 100644 --- 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 75690eb3..d2eb1909 100644 --- 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 e4620cb2..0c67b766 100644 --- 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 e0c34990..d994de3b 100644 --- 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 7df7795a..ff103aa4 100644 --- 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 50bf2deb..c5532635 100644 --- 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 c03e6ea6..10fb8112 100644 --- 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);