From 7d66ab2e949bc915f108737f08cac2f9057ef729 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 29 Mar 2012 13:06:44 -0700 Subject: Improve comment RSS feed visibility, initially added by Thomas E. Horner in fc942aacda07346fa9af04853659eaeac1e766d3. Change some variable names, refactor out visibility checking code, actually check visibility at generation time instead of just suppressing the UI, update module.info Fixes #1829. --- modules/comment/helpers/comment_rss.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'modules/comment/helpers/comment_rss.php') diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php index 919aac95..cfee4727 100644 --- a/modules/comment/helpers/comment_rss.php +++ b/modules/comment/helpers/comment_rss.php @@ -19,17 +19,23 @@ */ class comment_rss_Core { - static function available_feeds($item, $tag) { - $avail = module::get_var("comment", "rss_available"); - if($avail == "none") { - return array(); + static function feed_visible($feed_id) { + $visible = module::get_var("comment", "rss_visible"); + if (!in_array($feed_id, array("newest", "per_item"))) { + return false; } - if($avail == "both" || $avail == "newest") { + return ($visible == "all" || $visible == $feed_id); + } + + static function available_feeds($item, $tag) { + $feeds = array(); + + if (comment_rss::feed_visible("newest")) { $feeds["comment/newest"] = t("All new comments"); } - if ($item && ($avail == "both" || $avail == "onitem")) { + if ($item && comment_rss::feed_visible("per_item")) { $feeds["comment/item/$item->id"] = t("Comments on %title", array("title" => html::purify($item->title))); } @@ -37,7 +43,7 @@ class comment_rss_Core { } static function feed($feed_id, $offset, $limit, $id) { - if ($feed_id != "newest" && $feed_id != "item") { + if (!comment_rss::feed_visible($feed_id)) { return; } -- cgit v1.2.3