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

Merged mass tag and post list redirection

Browse source
This commit is contained in:
Marcin Kurczewski 2014-05-19 09:24:15 +02:00
parent acbd45d530
commit 7609cbcccf
4 changed files with 20 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Controllers/PostController.php
View file

@ -43,7 +43,15 @@ class PostController extends AbstractController
public function listRedirectAction($source = 'posts')
{
$context = Core::getContext();
if ($source == 'mass-tag')
Access::assert(new Privilege(Privilege::MassTag));
$oldPage = intval(InputHelper::get('old-page'));
$oldQuery = trim(InputHelper::get('old-query'));
$query = trim(InputHelper::get('query'));
$additionalInfo = trim(InputHelper::get('tag'));
$context->transport->searchQuery = $query;
$context->transport->lastSearchQuery = $query;
if (strpos($query, '/') !== false)
@ -53,9 +61,14 @@ class PostController extends AbstractController
$params['source'] = $source;
if ($query)
$params['query'] = $query;
#if ($additionalInfo)
# $params['additionalInfo'] = $additionalInfo;
$params['page'] = 1;
if ($additionalInfo)
$params['additionalInfo'] = $additionalInfo;
if ($oldPage != 0 and $oldQuery == $query)
$params['page'] = $oldPage;
else
$params['page'] = 1;
$url = \Chibi\Router::linkTo(['PostController', 'listView'], $params);
$this->redirect($url);

24
src/Controllers/TagController.php
View file

@ -131,30 +131,6 @@ class TagController extends AbstractController
$this->renderViewWithSource('tag-list-wrapper', 'mass-tag');
}
public function massTagRedirectAction()
{
Access::assert(new Privilege(Privilege::MassTag));
$suppliedOldPage = intval(InputHelper::get('old-page'));
$suppliedOldQuery = InputHelper::get('old-query');
$suppliedQuery = InputHelper::get('query');
$suppliedTag = InputHelper::get('tag');
$params =
[
'source' => 'mass-tag',
'query' => trim($suppliedQuery ?: ''),
'additionalInfo' => $suppliedTag ? $suppliedTag : '',
];
if ($suppliedOldPage != 0 and $suppliedOldQuery == $suppliedQuery)
$params['page'] = $suppliedOldPage;
else
$params['page'] = 1;
$url = \Chibi\Router::linkTo(['PostController', 'listView'], $params);
$this->redirect($url);
}
private function renderViewWithSource($viewName, $source)
{

4
src/Views/tag/tag-mass-tag.phtml
View file

@ -1,5 +1,7 @@
<div class="form-wrapper">
<form method="post" action="<?= \Chibi\Router::linkTo(['TagController', 'massTagRedirectAction']) ?>">
<form method="post" action="<?= \Chibi\Router::linkTo(
['PostController', 'listRedirectAction'],
['source' => 'mass-tag']) ?>">
<h1>mass tag</h1>
<div class="form-row">

3
src/routes.php
View file

@ -40,7 +40,7 @@ $postValidation =
\Chibi\Router::register(['PostController', 'listView'], 'GET', '/{source}/{page}', $postValidation);
\Chibi\Router::register(['PostController', 'listView'], 'GET', '/{source}/{query}/{page}', $postValidation);
\Chibi\Router::register(['PostController', 'listView'], 'GET', '/{source}/{query}/{additionalInfo}/{page}', $postValidation);
\Chibi\Router::register(['PostController', 'listRedirectAction'], 'POST', '/posts-redirect', $postValidation);
\Chibi\Router::register(['PostController', 'listRedirectAction'], 'POST', '/{source}-redirect', $postValidation);
\Chibi\Router::register(['PostController', 'randomView'], 'GET', '/random', $postValidation);
\Chibi\Router::register(['PostController', 'randomView'], 'GET', '/random/{page}', $postValidation);
@ -91,7 +91,6 @@ $tagValidation =
\Chibi\Router::register(['TagController', 'mergeView'], 'GET', '/tags-merge', $tagValidation);
\Chibi\Router::register(['TagController', 'mergeAction'], 'POST', '/tags-merge', $tagValidation);
\Chibi\Router::register(['TagController', 'massTagRedirectView'], 'GET', '/mass-tag-redirect', $tagValidation);
\Chibi\Router::register(['TagController', 'massTagRedirectAction'], 'POST', '/mass-tag-redirect', $tagValidation);
$userValidation =
[