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

Tag list respects safety settings

Browse source
This commit is contained in:
Marcin Kurczewski 2013-10-30 16:22:46 +01:00
parent e0c4c28e70
commit 36caef3831
3 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Helpers/PrivilegesHelper.php
View file

@ -63,6 +63,16 @@ class PrivilegesHelper
if (!$user->email_confirmed)
throw new SimpleException('Need e-mail address confirmation to continue');
}
public static function getAllowedSafety()
{
$context = \Chibi\Registry::getContext();
return array_filter(PostSafety::getAll(), function($safety) use ($context)
{
return PrivilegesHelper::confirm(Privilege::ListPosts, PostSafety::toString($safety)) and
$context->user->hasEnabledSafety($safety);
});
}
}
PrivilegesHelper::init();

6
src/Models/Model_Post_QueryBuilder.php
View file

@ -31,11 +31,7 @@ class Model_Post_QueryBuilder implements AbstractQueryBuilder
protected static function filterUserSafety($dbQuery)
{
$context = \Chibi\Registry::getContext();
$allowedSafety = array_filter(PostSafety::getAll(), function($safety) use ($context)
{
return PrivilegesHelper::confirm(Privilege::ListPosts, PostSafety::toString($safety)) and
$context->user->hasEnabledSafety($safety);
});
$allowedSafety = PrivilegesHelper::getAllowedSafety();
$dbQuery->addSql('safety')->in('(' . R::genSlots($allowedSafety) . ')');
foreach ($allowedSafety as $s)
$dbQuery->put($s);

27
src/Models/Model_Tag_QueryBuilder.php
View file

@ -3,21 +3,34 @@ class model_Tag_QueryBuilder implements AbstractQueryBuilder
{
public static function build($dbQuery, $query)
{
$allowedSafety = PrivilegesHelper::getAllowedSafety();
$limitQuery = false;
$dbQuery->addSql(', COUNT(post_tag.post_id)')->as('count');
$dbQuery->from('tag');
$dbQuery->innerJoin('post_tag');
$dbQuery->on('tag.id = post_tag.tag_id');
$dbQuery
->addSql(', COUNT(post_tag.post_id)')
->as('count')
->from('tag')
->innerJoin('post_tag')
->on('tag.id = post_tag.tag_id')
->innerJoin('post')
->on('post.id = post_tag.post_id')
->where('safety IN (' . R::genSlots($allowedSafety) . ')');
foreach ($allowedSafety as $s)
$dbQuery->put($s);
if ($query !== null)
{
$limitQuery = true;
if (strlen($query) >= 3)
$query = '%' . $query;
$query .= '%';
$dbQuery->where('LOWER(tag.name) LIKE LOWER(?)')->put($query);
$dbQuery
->and('LOWER(tag.name)')
->like('LOWER(?)')
->put($query);
}
$dbQuery->groupBy('tag.id');
$dbQuery->orderBy('LOWER(tag.name)')->asc();
$dbQuery
->groupBy('tag.id')
->orderBy('LOWER(tag.name)')
->asc();
if ($limitQuery)
$dbQuery->limit(15);
}