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

Merge pull-request #493 and fix conflicts

This commit is contained in:
Frederic Guillot 2016-02-28 14:41:14 -05:00
parent d66fac1b61 341a2e4ee5
commit 2f06e6a346
7 changed files with 80 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
controllers/bookmark.php
View File

@ -37,8 +37,17 @@ Router\get_action('bookmark', function() {
Router\get_action('bookmarks', function() {
$offset = Request\int_param('offset', 0);
$nb_items = Model\Item\count_bookmarks();
$items = Model\Item\get_bookmarks($offset, Model\Config\get('items_per_page'));
$group_id = Request\int_param('group_id', null);
$feed_ids = array();
if (! is_null($group_id)) {
$feed_ids = Model\Group\get_feeds_by_group($group_id);
}
$nb_items = Model\Item\count_bookmarks($feed_ids);
$items = Model\Item\get_bookmarks(
$offset,
Model\Config\get('items_per_page'),
$feed_ids
);
Response\html(Template\layout('bookmarks', array(
'favicons' => Model\Favicon\get_item_favicons($items),
@ -47,6 +56,7 @@ Router\get_action('bookmarks', function() {
'direction' => '',
'display_mode' => Model\Config\get('items_display_mode'),
'item_title_link' => Model\Config\get('item_title_link'),
'group_id' => $group_id,
'items' => $items,
'nb_items' => $nb_items,
'offset' => $offset,
@ -54,6 +64,7 @@ Router\get_action('bookmarks', function() {
'nothing_to_read' => Request\int_param('nothing_to_read'),
'nb_unread_items' => Model\Item\count_by_status('unread'),
'menu' => 'bookmarks',
'groups' => Model\Group\get_all(),
'title' => t('Bookmarks').' ('.$nb_items.')'
)));
});

24
controllers/history.php
View File

@ -4,16 +4,23 @@
Router\get_action('history', function() {
$offset = Request\int_param('offset', 0);
$nb_items = Model\Item\count_by_status('read');
$group_id = Request\int_param('group_id', null);
$feed_ids = array();
if (! is_null($group_id)) {
$feed_ids = Model\Group\get_feeds_by_group($group_id);
}
$items = Model\Item\get_all_by_status(
'read',
array(),
$feed_ids,
$offset,
Model\Config\get('items_per_page'),
'updated',
Model\Config\get('items_sorting_direction')
);
$nb_items = Model\Item\count_by_status('read', $feed_ids);
Response\html(Template\layout('history', array(
'favicons' => Model\Favicon\get_item_favicons($items),
'original_marks_read' => Model\Config\get('original_marks_read'),
@ -22,20 +29,23 @@ Router\get_action('history', function() {
'direction' => '',
'display_mode' => Model\Config\get('items_display_mode'),
'item_title_link' => Model\Config\get('item_title_link'),
'group_id' => $group_id,
'nb_items' => $nb_items,
'nb_unread_items' => Model\Item\count_by_status('unread'),
'offset' => $offset,
'items_per_page' => Model\Config\get('items_per_page'),
'nothing_to_read' => Request\int_param('nothing_to_read'),
'menu' => 'history',
'groups' => Model\Group\get_all(),
'title' => t('History').' ('.$nb_items.')'
)));
});
// Confirmation box to flush history
Router\get_action('confirm-flush-history', function() {
$group_id = Request\int_param('group_id', null);
Response\html(Template\layout('confirm_flush_items', array(
'group_id' => $group_id,
'nb_unread_items' => Model\Item\count_by_status('unread'),
'menu' => 'history',
'title' => t('Confirmation')
@ -44,7 +54,11 @@ Router\get_action('confirm-flush-history', function() {
// Flush history
Router\get_action('flush-history', function() {
Model\Item\mark_all_as_removed();
$group_id = Request\int_param('group_id', null);
if (!is_null($group_id)) {
Model\Item\mark_group_as_removed($group_id);
} else {
Model\Item\mark_all_as_removed();
}
Response\redirect('?action=history');
});

19
models/item.php
View File

@ -131,17 +131,18 @@ function count_by_status($status, $feed_ids = array())
}
// Get the number of bookmarks
function count_bookmarks()
function count_bookmarks($feed_ids = array())
{
return Database::getInstance('db')
->table('items')
->eq('bookmark', 1)
->in('feed_id', $feed_ids)
->in('status', array('read', 'unread'))
->count();
}
// Get all bookmarks
function get_bookmarks($offset = null, $limit = null)
function get_bookmarks($offset = null, $limit = null, $feed_ids = array())
{
return Database::getInstance('db')
->table('items')
@ -163,6 +164,7 @@ function get_bookmarks($offset = null, $limit = null)
'feeds.rtl'
)
->join('feeds', 'id', 'feed_id')
->in('feed_id', $feed_ids)
->in('status', array('read', 'unread'))
->eq('bookmark', 1)
->orderBy('updated', Config\get('items_sorting_direction'))
@ -376,6 +378,19 @@ function mark_group_as_read($group_id)
->update(array('status' => 'read'));
}
// Mark all items of a group as removed
function mark_group_as_removed($group_id)
{
$feed_ids = Group\get_feeds_by_group($group_id);
return Database::getInstance('db')
->table('items')
->eq('status', 'read')
->eq('bookmark', 0)
->in('feed_id', $feed_ids)
->save(array('status' => 'removed', 'content' => ''));
}
// Mark all read items to removed after X days
function autoflush_read()
{

16
templates/bookmarks.php
View File

@ -1,9 +1,21 @@
<?php if (empty($items)): ?>
<?php if (empty($items) && is_null($group_id)): ?>
<p class="alert alert-info"><?= t('No bookmark') ?></p>
<?php else: ?>
<div class="page-header">
<h2><?= t('Bookmarks') ?><span id="page-counter"><?= isset($nb_items) ? $nb_items : '' ?></span></h2>
<?php if (!empty($groups)): ?>
<nav>
<ul id="grouplist">
<?php foreach ($groups as $group): ?>
<li <?= $group['id'] == $group_id ? 'class="active"' : '' ?>>
<a href="?action=bookmarks&group_id=<?=$group['id']?>"><?=$group['title']?></a>
</li>
<?php endforeach ?>
</ul>
</nav>
<?php endif ?>
</div>
<?php if ($nothing_to_read): ?>
@ -24,7 +36,7 @@
)) ?>
<?php endforeach ?>
<?= \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?>
<?= \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'group_id' => $group_id)) ?>
</section>
<?php endif ?>

4
templates/confirm_flush_items.php
View File

@ -5,6 +5,6 @@
<p class="alert alert-info"><?= t('Do you really want to remove these items from your history?') ?></p>
<div class="form-actions">
<a href="?action=flush-history" class="btn btn-red"><?= t('Remove') ?></a>
<?= t('or') ?> <a href="?action=history"><?= t('cancel') ?></a>
<a href="?action=flush-history<?= is_null($group_id) ? '' : '&amp;group_id='.$group_id ?>" class="btn btn-red"><?= t('Remove') ?></a>
<?= t('or') ?> <a href="?action=history<?= is_null($group_id) ? '' : '&amp;group_id='.$group_id ?>"><?= t('cancel') ?></a>
</div>

16
templates/history.php
View File

@ -4,8 +4,20 @@
<div class="page-header">
<h2><?= t('History') ?><span id="page-counter"><?= isset($nb_items) ? $nb_items : '' ?></span></h2>
<?php if (!empty($groups)): ?>
<nav>
<ul id="grouplist">
<?php foreach ($groups as $group): ?>
<li <?= $group['id'] == $group_id ? 'class="active"' : '' ?>>
<a href="?action=history&group_id=<?=$group['id']?>"><?=$group['title']?></a>
</li>
<?php endforeach ?>
</ul>
</nav>
<?php endif ?>
<ul>
<li><a href="?action=confirm-flush-history"><?= t('flush all items') ?></a></li>
<li><a href="?action=confirm-flush-history<?= is_null($group_id) ? '' : '&amp;group_id='.$group_id ?>"><?= t('flush all items') ?></a></li>
</ul>
</div>
@ -27,7 +39,7 @@
)) ?>
<?php endforeach ?>
<?= \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?>
<?= \Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction, 'group_id' => $group_id)) ?>
</section>
<?php endif ?>

2
templates/paging.php
View File

@ -1,6 +1,6 @@
<div id="items-paging">
<?php if ($offset > 0): ?>
<a id="previous-page" href="?action=<?= $menu ?>&amp;offset=<?= ($offset - $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?><?= isset($feed_id) ? '&amp;feed_id='.$feed_id : '' ?>">« <?= t('Previous page') ?></a>
<a id="previous-page" href="?action=<?= $menu ?>&amp;offset=<?= ($offset - $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?><?= isset($feed_id) ? '&amp;feed_id='.$feed_id : '' ?><?= isset($group_id) ? '&amp;group_id='.$group_id : '' ?>">« <?= t('Previous page') ?></a>
<?php endif ?>
&nbsp;
<?php if (($nb_items - $offset) > $items_per_page): ?>