From 0ad39c241e69687abeb395e9a7d2be0552328d03 Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Fri, 2 May 2014 13:51:20 +0200 Subject: [PATCH 1/3] Fixed start time placement --- public_html/dispatch.php | 2 ++ src/core.php | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/public_html/dispatch.php b/public_html/dispatch.php index 182d6b54..4d5413df 100644 --- a/public_html/dispatch.php +++ b/public_html/dispatch.php @@ -1,4 +1,6 @@ Date: Sat, 3 May 2014 23:23:13 +0200 Subject: [PATCH 2/3] Fixed activation, password reset and registration --- public_html/dispatch.php | 2 ++ src/Views/user-registration.phtml | 2 +- src/Views/user-select.phtml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public_html/dispatch.php b/public_html/dispatch.php index 4d5413df..281f5100 100644 --- a/public_html/dispatch.php +++ b/public_html/dispatch.php @@ -141,8 +141,10 @@ foreach (['GET', 'POST'] as $method) \Chibi\Router::register(['UserController', 'settingsAction'], $method, '/user/{name}/settings', $userValidations); \Chibi\Router::register(['UserController', 'editAction'], $method, '/user/{name}/edit', $userValidations); \Chibi\Router::register(['UserController', 'activationAction'], $method, '/activation/{token}', $userValidations); + \Chibi\Router::register(['UserController', 'activationProxyAction'], $method, '/activation-proxy', $userValidations); \Chibi\Router::register(['UserController', 'activationProxyAction'], $method, '/activation-proxy/{token}', $userValidations); \Chibi\Router::register(['UserController', 'passwordResetAction'], $method, '/password-reset/{token}', $userValidations); + \Chibi\Router::register(['UserController', 'passwordResetProxyAction'], $method, '/password-reset-proxy', $userValidations); \Chibi\Router::register(['UserController', 'passwordResetProxyAction'], $method, '/password-reset-proxy/{token}', $userValidations); \Chibi\Router::register(['UserController', 'toggleSafetyAction'], $method, '/user/toggle-safety/{safety}', $userValidations); } diff --git a/src/Views/user-registration.phtml b/src/Views/user-registration.phtml index 6b4cf214..151cd367 100644 --- a/src/Views/user-registration.phtml +++ b/src/Views/user-registration.phtml @@ -2,7 +2,7 @@ Assets::setSubTitle('registration form'); ?> -context->transport->success === true): ?> +context->transport->message)): ?> context) ?> context->transport->success === true): ?> +context->transport->message)): ?> context) ?> Date: Sat, 3 May 2014 23:27:00 +0200 Subject: [PATCH 3/3] Fixed erroreous redirects --- src/Controllers/AuthController.php | 4 +++- src/Controllers/LogController.php | 2 +- src/Controllers/PostController.php | 2 +- src/Controllers/TagController.php | 1 + src/Controllers/UserController.php | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Controllers/AuthController.php b/src/Controllers/AuthController.php index d6d8cfde..88c0106c 100644 --- a/src/Controllers/AuthController.php +++ b/src/Controllers/AuthController.php @@ -30,6 +30,7 @@ class AuthController $context->layoutName = null; Auth::logout(); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction'])); + exit; } public static function observeWorkFinish() @@ -50,8 +51,9 @@ class AuthController { \Chibi\Util\Url::forward(\Chibi\Util\Url::makeAbsolute($_SESSION['login-redirect-url'])); unset($_SESSION['login-redirect-url']); - return; + exit; } \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction'])); + exit; } } diff --git a/src/Controllers/LogController.php b/src/Controllers/LogController.php index 51872e3d..76542767 100644 --- a/src/Controllers/LogController.php +++ b/src/Controllers/LogController.php @@ -35,7 +35,7 @@ class LogController 'filter' => $formQuery, 'page' => 1 ])); - return; + exit; } Access::assert(Privilege::ViewLog); diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php index 2021e372..a2d90b99 100644 --- a/src/Controllers/PostController.php +++ b/src/Controllers/PostController.php @@ -23,7 +23,7 @@ class PostController 'additionalInfo' => $additionalInfo, 'query' => $formQuery]); \Chibi\Util\Url::forward($url); - return; + exit; } $query = trim($query); diff --git a/src/Controllers/TagController.php b/src/Controllers/TagController.php index f8ff5cc2..26d23a91 100644 --- a/src/Controllers/TagController.php +++ b/src/Controllers/TagController.php @@ -155,5 +155,6 @@ class TagController if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery) $params['page'] = $suppliedOldPage; \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['PostController', 'listAction'], $params)); + exit; } } diff --git a/src/Controllers/UserController.php b/src/Controllers/UserController.php index 7eb25bd4..a81a8887 100644 --- a/src/Controllers/UserController.php +++ b/src/Controllers/UserController.php @@ -128,6 +128,7 @@ class UserController \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction'])); LogHelper::log('{user} removed {subject}\'s account', ['subject' => TextHelper::reprUser($name)]); + exit; } public function settingsAction($name) @@ -348,7 +349,7 @@ class UserController if (Auth::isLoggedIn()) { \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction'])); - return; + exit; } $suppliedName = InputHelper::get('name');