Public
/
pics
2
2
Fork 2
Code Issues 6 Pull Requests Releases Wiki Activity

ViewPhoto: simplify filter verification

This commit is contained in:
Aaron van Geffen 2024-01-15 11:33:43 +01:00
parent 52472d8b58
commit ec2d702a0d
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/ViewPhoto.php
View File

@ -50,13 +50,12 @@ class ViewPhoto extends HTMLController
if (isset($_GET['by']))
{
// Let's first verify that the filter is valid
$contributors = array_filter($tag->getContributorList(), fn($el) => $el['slug'] === $_GET['by']);
if (count($contributors) !== 1)
$user = Member::fromSlug($_GET['by']);
if (!$user)
throw new UnexpectedValueException('Invalid filter for this album or tag.');
// Alright, let's run with it then
$filter = reset($contributors);
$page->setActiveFilter($filter['slug']);
$page->setActiveFilter($user->getSlug());
}
$this->page->adopt($page);

3
models/Asset.php
View File

@ -723,9 +723,8 @@ class Asset
}
// Take active filter into account as well
if (!empty($activeFilter))
if (!empty($activeFilter) && ($user = Member::fromSlug($activeFilter)) !== false)
{
$user = Member::fromSlug($activeFilter);
$where[] = 'id_user_uploaded = {int:id_user_uploaded}';
$params['id_user_uploaded'] = $user->getUserId();
}

5
models/User.php
View File

@ -75,6 +75,11 @@ abstract class User
return $this->ip_address;
}
public function getSlug()
{
return $this->slug;
}
/**
* Returns whether user is logged in.
*/