From 0b058565baa920b1c34b5e0acb29965e35bb3242 Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Sat, 3 May 2014 23:23:13 +0200
Subject: [PATCH] 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');
 ?>
 
-<?php if ($this->context->transport->success === true): ?>
+<?php if (isset($this->context->transport->message)): ?>
 	<?php \Chibi\View::render('message', $this->context) ?>
 <?php else: ?>
 	<?php
diff --git a/src/Views/user-select.phtml b/src/Views/user-select.phtml
index ac93d8f7..f840dc9f 100644
--- a/src/Views/user-select.phtml
+++ b/src/Views/user-select.phtml
@@ -1,4 +1,4 @@
-<?php if ($this->context->transport->success === true): ?>
+<?php if (isset($this->context->transport->message)): ?>
 	<?php \Chibi\View::render('message', $this->context) ?>
 <?php else: ?>
 	<?php