ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed erroreous redirects

Browse source
This commit is contained in:
Marcin Kurczewski 2014-05-03 23:27:00 +02:00
parent 0b058565ba
commit 3d6564f7a8
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Controllers/AuthController.php
View file

@ -30,6 +30,7 @@ class AuthController
$context->layoutName = null; $context->layoutName = null;
Auth::logout(); Auth::logout();
\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction'])); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction']));
exit;
} }
public static function observeWorkFinish() public static function observeWorkFinish()
@ -50,8 +51,9 @@ class AuthController
{ {
\Chibi\Util\Url::forward(\Chibi\Util\Url::makeAbsolute($_SESSION['login-redirect-url'])); \Chibi\Util\Url::forward(\Chibi\Util\Url::makeAbsolute($_SESSION['login-redirect-url']));
unset($_SESSION['login-redirect-url']); unset($_SESSION['login-redirect-url']);
return; exit;
} }
\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction'])); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction']));
exit;
} }
} }

2
src/Controllers/LogController.php
View file

@ -35,7 +35,7 @@ class LogController
'filter' => $formQuery, 'filter' => $formQuery,
'page' => 1 'page' => 1
])); ]));
return; exit;
} }
Access::assert(Privilege::ViewLog); Access::assert(Privilege::ViewLog);

2
src/Controllers/PostController.php
View file

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

1
src/Controllers/TagController.php
View file

@ -155,5 +155,6 @@ class TagController
if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery) if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery)
$params['page'] = $suppliedOldPage; $params['page'] = $suppliedOldPage;
\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['PostController', 'listAction'], $params)); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['PostController', 'listAction'], $params));
exit;
} }
} }

3
src/Controllers/UserController.php
View file

@ -128,6 +128,7 @@ class UserController
\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction'])); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction']));
LogHelper::log('{user} removed {subject}\'s account', ['subject' => TextHelper::reprUser($name)]); LogHelper::log('{user} removed {subject}\'s account', ['subject' => TextHelper::reprUser($name)]);
exit;
} }
public function settingsAction($name) public function settingsAction($name)
@ -348,7 +349,7 @@ class UserController
if (Auth::isLoggedIn()) if (Auth::isLoggedIn())
{ {
\Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction'])); \Chibi\Util\Url::forward(\Chibi\Router::linkTo(['IndexController', 'indexAction']));
return; exit;
} }
$suppliedName = InputHelper::get('name'); $suppliedName = InputHelper::get('name');