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

Moved user listing to API

Browse source
This commit is contained in:
Marcin Kurczewski 2014-05-04 10:32:32 +02:00
parent f74213bafb
commit 243f22542d
5 changed files with 41 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public_html/dispatch.php
View file

@ -140,6 +140,9 @@ $userValidations =
'filter' => '[^\/]+',
];
\Chibi\Router::register(['UserController', 'listView'], 'GET', '/users', $userValidations);
\Chibi\Router::register(['UserController', 'listView'], 'GET', '/users/{page}', $userValidations);
\Chibi\Router::register(['UserController', 'listView'], 'GET', '/users/{filter}/{page}', $userValidations);
\Chibi\Router::register(['UserController', 'flagAction'], 'POST', '/user/{name}/flag', $userValidations);
\Chibi\Router::register(['UserController', 'banAction'], 'POST', '/user/{name}/ban', $userValidations);
\Chibi\Router::register(['UserController', 'unbanAction'], 'POST', '/user/{name}/unban', $userValidations);
@ -151,10 +154,6 @@ foreach (['GET', 'POST'] as $method)
\Chibi\Router::register(['UserController', 'registrationAction'], $method, '/register', $userValidations);
\Chibi\Router::register(['UserController', 'viewAction'], $method, '/user/{name}/{tab}', $userValidations);
\Chibi\Router::register(['UserController', 'viewAction'], $method, '/user/{name}/{tab}/{page}', $userValidations);
\Chibi\Router::register(['UserController', 'listAction'], $method, '/users', $userValidations);
\Chibi\Router::register(['UserController', 'listAction'], $method, '/users/{page}', $userValidations);
\Chibi\Router::register(['UserController', 'listAction'], $method, '/users/{filter}', $userValidations);
\Chibi\Router::register(['UserController', 'listAction'], $method, '/users/{filter}/{page}', $userValidations);
\Chibi\Router::register(['UserController', 'acceptRegistrationAction'], $method, '/user/{name}/accept-registration', $userValidations);
\Chibi\Router::register(['UserController', 'deleteAction'], $method, '/user/{name}/delete', $userValidations);
\Chibi\Router::register(['UserController', 'settingsAction'], $method, '/user/{name}/settings', $userValidations);

25
src/Api/Jobs/ListUsersJob.php Normal file
View file

@ -0,0 +1,25 @@
<?php
class ListUsersJob extends AbstractPageJob
{
public function execute()
{
$pageSize = $this->getPageSize();
$page = $this->getArgument(self::PAGE_NUMBER);
$filter = $this->getArgument(self::QUERY);
$users = UserSearchService::getEntities($filter, $pageSize, $page);
$userCount = UserSearchService::getEntityCount($filter);
return $this->getPager($users, $userCount, $page, $pageSize);
}
public function getDefaultPageSize()
{
return intval(getConfig()->browsing->usersPerPage);
}
public function requiresPrivilege()
{
return Privilege::ListUsers;
}
}

31
src/Controllers/UserController.php
View file

@ -1,29 +1,20 @@
<?php
class UserController
{
public function listAction($filter, $page)
public function listView($filter = 'order:alpha,asc', $page = 1)
{
$ret = Api::run(
new ListUsersJob(),
[
ListUsersJob::PAGE_NUMBER => $page,
ListUsersJob::QUERY => $filter,
]);
$context = getContext();
Access::assert(
Privilege::ListUsers);
$suppliedFilter = $filter ?: InputHelper::get('filter') ?: 'order:alpha,asc';
$page = max(1, intval($page));
$usersPerPage = intval(getConfig()->browsing->usersPerPage);
$users = UserSearchService::getEntities($suppliedFilter, $usersPerPage, $page);
$userCount = UserSearchService::getEntityCount($suppliedFilter);
$pageCount = ceil($userCount / $usersPerPage);
$page = min($pageCount, $page);
$context->filter = $suppliedFilter;
$context->transport->users = $users;
$context->transport->paginator = new StdClass;
$context->transport->paginator->page = $page;
$context->transport->paginator->pageCount = $pageCount;
$context->transport->paginator->entityCount = $userCount;
$context->transport->paginator->entities = $users;
$context->transport->paginator->params = func_get_args();
$context->filter = $filter;
$context->transport->users = $ret->entities;
$context->transport->paginator = $ret;
}
public function flagAction($name)

2
src/Views/top-navigation.phtml
View file

@ -54,7 +54,7 @@
{
$registerNavItem(
'Users',
\Chibi\Router::linkTo(['UserController', 'listAction']),
\Chibi\Router::linkTo(['UserController', 'listView']),
$activeController == 'user' and $activeAction != 'registration' and
(!isset($this->context->route->arguments['name']) or
$this->context->route->arguments['name'] != Auth::getCurrentUser()->name));

2
src/Views/user-list.phtml
View file

@ -27,7 +27,7 @@ if (Auth::getCurrentUser()->hasEnabledEndlessScrolling())
<?php else: ?>
<li>
<?php endif ?>
<a href="<?= \Chibi\Router::linkTo(['UserController', 'listAction'], ['filter' => $key]) ?>">
<a href="<?= \Chibi\Router::linkTo(['UserController', 'listView'], ['filter' => $key]) ?>">
<?= $text ?>
</a>
</li>