From d5bb0009986f868d719a29cd87c0e9520bd94df7 Mon Sep 17 00:00:00 2001 From: cweiske Date: Sat, 16 Jan 2010 10:15:19 +0000 Subject: [PATCH] Part of bug #2928950: add support for "count" parameter in rss feed and add config options for default and maximum rss feed entries git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@591 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/config.default.php | 16 ++++++++++++++++ www/rss.php | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/data/config.default.php b/data/config.default.php index 69d2c25..8dd61a5 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -378,6 +378,22 @@ $defaultRecentDays = 14; */ $defaultOrderBy = 'date_desc'; +/** + * Number of entries that are shown in + * the RSS feed by default. + * + * @var integer + */ +$defaultRssEntries = 15; + +/** + * Number of entries the RSS puts out + * at maximum. + * + * @var integer + */ +$maxRssEntries = 100; + /** * Redirect all bookmarks through $url_redir to improve privacy. * diff --git a/www/rss.php b/www/rss.php index 82d9319..6b0625e 100644 --- a/www/rss.php +++ b/www/rss.php @@ -2,6 +2,10 @@ /** * RSS output of the latest posts. * + * Parameter: + * - count=15 + * Sets the number of RSS entries to export + * * SemanticScuttle - your social bookmark manager. * * PHP version 5. @@ -46,6 +50,16 @@ if ($usecache) { $cacheservice->Start($hash, 3600); } +if (isset($_GET['count'])) { + $rssEntries = (int)$_GET['count']; +} +if ($rssEntries <= 0) { + $rssEntries = $defaultRssEntries; +} else if ($rssEntries > $maxRssEntries) { + $rssEntries = $maxRssEntries; +} + + $watchlist = null; $pagetitle = ''; if ($user && $user != 'all') { @@ -80,7 +94,7 @@ $tplVars['feedlink'] = ROOT; $tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']); $bookmarks = $bookmarkservice->getBookmarks( - 0, 15, $userid, $cat, + 0, $rssEntries, $userid, $cat, null, getSortOrder(), $watchlist );