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

Fixed order:random

Browse source 
In order to reset seed for order:random, one had to specify at least one
order token. Most of pages didn't, effectively rendering random order
too persistent across navigation. This change makes sure that seed is
reset even if one doesn't specify any order token.
This commit is contained in:
Marcin Kurczewski 2014-05-19 09:30:18 +02:00
parent 7609cbcccf
commit 361a221dc0
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Models/SearchParsers/PostSearchParser.php
View file

@ -6,6 +6,7 @@ class PostSearchParser extends AbstractSearchParser
private $tags;
private $showHidden = false;
private $showDisliked = false;
private $randomReset = true;
protected function processSetup(&$tokens)
{
@ -35,6 +36,9 @@ class PostSearchParser extends AbstractSearchParser
if (!Access::check(new Privilege(Privilege::ListPosts, 'hidden')) or !$this->showHidden)
$this->processComplexToken('special', 'hidden', true);
if ($this->randomReset and isset($_SESSION['browsing-seed']))
unset($_SESSION['browsing-seed']);
foreach ($this->tags as $item)
{
list ($tagName, $neg) = $item;
@ -227,8 +231,6 @@ class PostSearchParser extends AbstractSearchParser
protected function processOrderToken($orderByString, $orderDir)
{
$randomReset = true;
if (in_array($orderByString, ['id']))
$orderColumn = 'post.id';
@ -263,7 +265,7 @@ class PostSearchParser extends AbstractSearchParser
//is going to reset. however, it stays the same as
//long as you keep visiting pages with order:random
//specified.
$randomReset = false;
$this->randomReset = false;
if (!isset($_SESSION['browsing-seed']))
$_SESSION['browsing-seed'] = mt_rand();
$seed = $_SESSION['browsing-seed'];
@ -275,9 +277,6 @@ class PostSearchParser extends AbstractSearchParser
else
return false;
if ($randomReset and isset($_SESSION['browsing-seed']))
unset($_SESSION['browsing-seed']);
$this->statement->setOrderBy($orderColumn, $orderDir);
return true;
}