From 87764a50cf08f33008a0f83d91b4d807643db67c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 23 Nov 2012 13:22:34 +0400 Subject: implement ttrss_feeds.cache_content --- classes/feeds.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'classes/feeds.php') diff --git a/classes/feeds.php b/classes/feeds.php index 9a74130b0..49adf3879 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -158,16 +158,20 @@ class Feeds extends Handler_Protected { // Update the feed if required with some basic flood control $result = db_query($this->link, - "SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + "SELECT cache_images,cache_content,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated FROM ttrss_feeds WHERE id = '$feed'"); if (db_num_rows($result) != 0) { $last_updated = strtotime(db_fetch_result($result, 0, "last_updated")); $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images")); + $cache_content = sql_bool_to_bool(db_fetch_result($result, 0, "cache_content")); - if (!$cache_images && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) { + if (!$cache_images && !$cache_content && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) { include "rssfuncs.php"; update_rss_feed($this->link, $feed, true, true); + } else { + db_query($this->link, "UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01' + WHERE id = '$feed'"); } } } @@ -234,6 +238,7 @@ class Feeds extends Handler_Protected { $feed_title = $qfh_ret[1]; $feed_site_url = $qfh_ret[2]; $last_error = $qfh_ret[3]; + $cache_content = true; $vgroup_last_feed = $vgr_last_feed; @@ -627,6 +632,10 @@ class Feeds extends Handler_Protected { $feed_site_url = $line["site_url"]; + if ($cache_content && $line["cached_content"] != "") { + $line["content_preview"] =& $line["cached_content"]; + } + $article_content = sanitize($this->link, $line["content_preview"], false, false, $feed_site_url); -- cgit v1.2.3