jan/miniflux-legacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unify redirect/menu/source url parameter

Browse Source
This commit is contained in:
Mathias Kresin 2016-08-05 20:21:40 +02:00
parent b1187f5071
commit 0b4ee5d347
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/bookmark.php
View File

@ -18,18 +18,18 @@ Router\post_action('bookmark', function () {
// Add new bookmark // Add new bookmark
Router\get_action('bookmark', function () { Router\get_action('bookmark', function () {
$id = Request\param('id'); $id = Request\param('id');
$menu = Request\param('menu', 'unread'); $menu = Request\param('menu');
$source = Request\param('source', 'unread'); $redirect = Request\param('redirect', 'unread');
$offset = Request\int_param('offset', 0); $offset = Request\int_param('offset', 0);
$feed_id = Request\int_param('feed_id', 0); $feed_id = Request\int_param('feed_id', 0);
Model\Item\set_bookmark_value($id, Request\int_param('value')); Model\Item\set_bookmark_value($id, Request\int_param('value'));
if ($source === 'show') { if ($redirect === 'show') {
Response\redirect('?action=show&menu='.$menu.'&id='.$id); Response\redirect('?action=show&menu='.$menu.'&id='.$id);
} }
Response\redirect('?action='.$menu.'&offset='.$offset.'&feed_id='.$feed_id.'#item-'.$id); Response\redirect('?action='.$redirect.'&offset='.$offset.'&feed_id='.$feed_id.'#item-'.$id);
}); });
// Display bookmarks page // Display bookmarks page

4
templates/bookmark_links.php
View File

@ -2,14 +2,14 @@
<?php if ($item['bookmark']): ?> <?php if ($item['bookmark']): ?>
<a <a
class="bookmark" class="bookmark"
href="?action=bookmark&amp;value=0&amp;id=<?= $item['id'] ?>&amp;offset=<?= $offset ?>&amp;menu=<?= $menu ?>&amp;feed_id=<?= $item['feed_id'] ?>" href="?action=bookmark&amp;value=0&amp;id=<?= $item['id'] ?>&amp;offset=<?= $offset ?>&amp;redirect=<?= $menu ?>&amp;feed_id=<?= $item['feed_id'] ?>"
data-action="bookmark" data-action="bookmark"
data-reverse-label="<?= t('bookmark') ?>" data-reverse-label="<?= t('bookmark') ?>"
><?= t('remove bookmark') ?></a> ><?= t('remove bookmark') ?></a>
<?php else: ?> <?php else: ?>
<a <a
class="bookmark" class="bookmark"
href="?action=bookmark&amp;value=1&amp;id=<?= $item['id'] ?>&amp;offset=<?= $offset ?>&amp;menu=<?= $menu ?>&amp;feed_id=<?= $item['feed_id'] ?>" href="?action=bookmark&amp;value=1&amp;id=<?= $item['id'] ?>&amp;offset=<?= $offset ?>&amp;redirect=<?= $menu ?>&amp;feed_id=<?= $item['feed_id'] ?>"
data-action="bookmark" data-action="bookmark"
data-reverse-label="<?= t('remove bookmark') ?>" data-reverse-label="<?= t('remove bookmark') ?>"
><?= t('bookmark') ?></a> ><?= t('bookmark') ?></a>

2
templates/item.php
View File

@ -10,7 +10,7 @@
<span class="item-icons"> <span class="item-icons">
<a <a
class="bookmark-icon" class="bookmark-icon"
href="?action=bookmark&amp;value=<?= (int)!$item['bookmark'] ?>&amp;id=<?= $item['id'] ?>&amp;offset=<?= $offset ?>&amp;menu=<?= $menu ?>&amp;feed_id=<?= $item['feed_id'] ?>" href="?action=bookmark&amp;value=<?= (int)!$item['bookmark'] ?>&amp;id=<?= $item['id'] ?>&amp;offset=<?= $offset ?>&amp;redirect=<?= $menu ?>&amp;feed_id=<?= $item['feed_id'] ?>"
title="<?= ($item['bookmark']) ? t('remove bookmark') : t('bookmark') ?>" title="<?= ($item['bookmark']) ? t('remove bookmark') : t('bookmark') ?>"
data-action="bookmark" data-action="bookmark"
data-reverse-title="<?= ($item['bookmark']) ? t('bookmark') : t('remove bookmark') ?>" data-reverse-title="<?= ($item['bookmark']) ? t('bookmark') : t('remove bookmark') ?>"

2
templates/show_item.php
View File

@ -37,7 +37,7 @@
<li> <li>
<a <a
class="bookmark-icon" class="bookmark-icon"
href="?action=bookmark&amp;value=<?= (int)!$item['bookmark'] ?>&amp;id=<?= $item['id'] ?>&amp;source=show&amp;menu=<?= $menu ?>" href="?action=bookmark&amp;value=<?= (int)!$item['bookmark'] ?>&amp;id=<?= $item['id'] ?>&amp;redirect=show&amp;menu=<?= $menu ?>"
title="<?= ($item['bookmark']) ? t('remove bookmark') : t('bookmark') ?>" title="<?= ($item['bookmark']) ? t('remove bookmark') : t('bookmark') ?>"
data-reverse-title="<?= ($item['bookmark']) ? t('bookmark') :t('remove bookmark') ?>" data-reverse-title="<?= ($item['bookmark']) ? t('bookmark') :t('remove bookmark') ?>"
data-action="bookmark" data-action="bookmark"