PrivateCoffee/wishthis
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: wishlist view

Browse source
This commit is contained in:
grandeljay 2023-09-07 15:58:26 +02:00
parent 56993052b4
commit cfe30781a9
3 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/api/wishlists.php
View file

@ -108,45 +108,36 @@ switch ($_SERVER['REQUEST_METHOD']) {
$getOwnWishlists = $user->isLoggedIn();
if ($getWishlistCardsFromPriority) {
/**
* Get wishlist cards with priority
*/
$wishlist = Wishlist::getFromId($_GET['wishlist_id']);
if (false === $wishlist) {
http_response_code(404);
}
$priorityAll = -1;
$priorityNone = 0;
$priority = (int) $_GET['priority'] ?? $priorityAll;
$options = array(
'style' => $_GET['style'],
'placeholders' => array(),
);
$where = array(
'wishlist' => '`wishlist` = ' . $wishlist->getId(),
'priority' => '`priority` = ' . $_GET['priority'],
'priority' => '`priority` = ' . $priority,
);
if (-1 === $_GET['priority']) {
if ($priorityAll === $priority) {
unset($where['priority']);
}
if (empty($_GET['priority'])) {
$where['priority'] = '`priority` IS NULL';
if ($priorityNone === $priority) {
$where['priority'] = '`priority` IS NULL OR `priority` = 0';
}
$options['WHERE'] = '(' . implode(') AND (', $where) . ')';
$response['results'] = $wishlist->getCards($options);
/**
* Get wishlist by id
*/
$wishlist = Wishlist::getFromId($_GET['wishlist_id']);
/** Determine if user is allowed to access wishlist */
if ($wishlist instanceof Wishlist) {
if ($user->isLoggedIn() && $user->getId() === $wishlist->getUserId()) {
$response['results'] = $wishlist->getCards();
} else {
http_response_code(403);
}
} else {
http_response_code(404);
}
} elseif ($getWishlistFromHash) {
$wishlist = Wishlist::getFromHash($_GET['wishlist_hash']);

2
src/classes/wishthis/Wish.php
View file

@ -198,7 +198,7 @@ class Wish
$userCard->getLocale() . '@currency=' . $userCard->getCurrency(),
\NumberFormatter::CURRENCY
);
$userIsCurrent = $userCurrent->getId() === $userCard->getId();
$userIsCurrent = $userCurrent->isLoggedIn() && $userCurrent->getId() === $userCard->getId();
/**
* Card

2
src/pages/parts/wishlist.php
View file

@ -44,7 +44,7 @@ $user = User::getCurrent();
<?= __('All priorities') ?>
</div>
<div class="item" data-value="">
<div class="item" data-value="0">
<i class="ui white empty circular label"></i>
<?= __('No priority') ?>
</div>