implement ttrss_feeds.cache_content

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 9a74130b0e21841e35883f7ab2a8b0b29129845a..49adf38795b8381d0182ab43d08e383a051971f7 100644 (file)
--- 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\r
 \r
                        $result = db_query($this->link,\r
-                               "SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated\r
+                               "SELECT cache_images,cache_content,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated\r
                                        FROM ttrss_feeds WHERE id = '$feed'");\r
 \r
                                if (db_num_rows($result) != 0) {\r
                                        $last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));\r
                                        $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));\r
+                                       $cache_content = sql_bool_to_bool(db_fetch_result($result, 0, "cache_content"));\r
 \r
-                                       if (!$cache_images && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {\r
+                                       if (!$cache_images && !$cache_content && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {\r
                                                include "rssfuncs.php";\r
                                                update_rss_feed($this->link, $feed, true, true);\r
+                                       } else {\r
+                                               db_query($this->link, "UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'\r
+                                                       WHERE id = '$feed'");\r
                                        }\r
                                }\r
                }\r
@@ -234,6 +238,7 @@ class Feeds extends Handler_Protected {
                $feed_title = $qfh_ret[1];\r
                $feed_site_url = $qfh_ret[2];\r
                $last_error = $qfh_ret[3];\r
+               $cache_content = true;\r
 \r
                $vgroup_last_feed = $vgr_last_feed;\r
 \r
@@ -627,6 +632,10 @@ class Feeds extends Handler_Protected {
 \r
                                        $feed_site_url = $line["site_url"];\r
 \r
+                                       if ($cache_content && $line["cached_content"] != "") {\r
+                                               $line["content_preview"] =& $line["cached_content"];\r
+                                       }\r
+\r
                                        $article_content = sanitize($this->link, $line["content_preview"],\r
                                                        false, false, $feed_site_url);\r
 \r