Merged branch 'master' into api

public_html/dispatch.php

@@ -1,4 +1,6 @@
 <?php
+$startTime = microtime(true);
+
 require_once '../src/core.php';
 
 $query = rtrim($_SERVER['REQUEST_URI'], '/');
@@ -155,8 +157,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);
 }

src/Controllers/AuthController.php

@@ -44,8 +44,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(['StaticPagesController', 'mainPageView']));
+		exit;
 	}
 }

src/Controllers/LogController.php

@@ -24,7 +24,7 @@ class LogController
 						'filter' => $formQuery,
 						'page' => 1
 					]));
-			return;
+			exit;
 		}
 
 		$ret = Api::run(

src/Controllers/PostController.php

@@ -23,7 +23,7 @@ class PostController
 				'additionalInfo' => $additionalInfo,
 				'query' => $formQuery]);
 			\Chibi\Util\Url::forward($url);
-			return;
+			exit;
 		}
 
 		$query = trim($query);

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', 'listView'], $params));
+		exit;
 	}
 }

src/Controllers/UserController.php

@@ -128,6 +128,7 @@ class UserController
 
 		\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['StaticPagesController', 'mainPageView']));
 		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(['StaticPagesController', 'mainPageView']));
-			return;
+			exit;
 		}
 
 		$suppliedName = InputHelper::get('name');

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

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

src/core.php

@@ -1,5 +1,4 @@
 <?php
-$startTime = microtime(true);
 define('SZURU_VERSION', '0.7.1');
 define('SZURU_LINK', 'http://github.com/rr-/szurubooru');