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

Merge pull-request #441

Browse Source
This commit is contained in:
Frederic Guillot 2015-12-07 20:33:36 -05:00
commit d18ccf6536
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/bookmark.php
View File

@ -60,6 +60,12 @@ Router\get_action('bookmarks', function() {
// Display bookmark feeds // Display bookmark feeds
Router\get_action('bookmark-feed', function() { Router\get_action('bookmark-feed', function() {
// Select database if the parameter is set
$database = Request\param('database');
if (!empty($database)) {
Model\Database\select($database);
}
// Check token // Check token
$feed_token = Model\Config\get('feed_token'); $feed_token = Model\Config\get('feed_token');
$request_token = Request\param('token'); $request_token = Request\param('token');

1
controllers/config.php
View File

@ -201,6 +201,7 @@ Router\get_action('about', function() {
Response\html(Template\layout('about', array( Response\html(Template\layout('about', array(
'csrf' => Model\Config\generate_csrf(), 'csrf' => Model\Config\generate_csrf(),
'config' => Model\Config\get_all(), 'config' => Model\Config\get_all(),
'db_name' => Model\Database\select(),
'nb_unread_items' => Model\Item\count_by_status('unread'), 'nb_unread_items' => Model\Item\count_by_status('unread'),
'menu' => 'config', 'menu' => 'config',
'title' => t('Preferences') 'title' => t('Preferences')

4
templates/about.php
View File

@ -16,7 +16,7 @@
<h3><?= t('Bookmarks') ?></h3> <h3><?= t('Bookmarks') ?></h3>
<ul> <ul>
<li> <li>
<a href="<?= Helper\get_current_base_url().'?action=bookmark-feed&amp;token='.urlencode($config['feed_token']) ?>" target="_blank"><?= t('Bookmark RSS Feed') ?></a> <a href="<?= Helper\get_current_base_url().'?action=bookmark-feed&amp;database='.urlencode($db_name).'&amp;token='.urlencode($config['feed_token']) ?>" target="_blank"><?= t('Bookmark RSS Feed') ?></a>
</li> </li>
</ul> </ul>
</div> </div>
@ -33,4 +33,4 @@
<li><a href="?action=console"><?= t('Console') ?></a></li> <li><a href="?action=console"><?= t('Console') ?></a></li>
</ul> </ul>
</div> </div>
</section> </section>