properly fix the cache_images issue (refs #578)

[tt-rss.git] / include / rssfuncs.php

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index f1d1129798906663d8b615c6e43e1a117d3b4b60..1180b0adb662b75de08cf9f55e0796b531f86a83 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -158,38 +158,6 @@
                // Send feed digests by email if needed.
                send_headlines_digests($link, $debug);
 
-               // Purge feeds with stale data OR not being updated for a while to keep DB size down
-
-               if ($debug) _debug("Purging inactive feeds...");
-
-               if (DB_TYPE == "pgsql") {
-                       $interval_qpart = "NOW() - INTERVAL '1 month'";
-               } else {
-                       $interval_qpart = "DATE_SUB(NOW(), INTERVAL 1 MONTH)";
-               }
-
-               $result = db_query($link, "SELECT id, feed_url FROM ttrss_feeds WHERE
-                                       (SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
-                                               ttrss_entries.id = ref_id AND
-                                               ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart OR
-                                       last_updated < $interval_qpart");
-
-               $feeds_purged = 0;
-               $articles_removed = 0;
-
-               while ($line = db_fetch_assoc($result)) {
-                       $articles_removed += purge_feed($link, $line["id"], 0, false);
-
-                       db_query($link, "UPDATE ttrss_feeds SET last_updated = NOW() WHERE
-                               id = " . $line["id"]);
-
-                       ++$feeds_purged;
-               }
-
-               if ($debug && $articles_removed > 0)
-                       _debug(sprintf("Purged %d feeds (%d articles).", $feeds_purged,
-                               $articles_removed));
-
        } // function update_daemon_common
 
        // ignore_daemon is not used
@@ -270,8 +238,10 @@
                                _debug("update_rss_feed: unable to fetch: $fetch_last_error");
                        }
 
+                       $error_escaped = db_escape_string($fetch_last_error);
+
                        db_query($link,
-                               "UPDATE ttrss_feeds SET last_error = '$fetch_last_error',
+                               "UPDATE ttrss_feeds SET last_error = '$error_escaped',
                                        last_updated = NOW() WHERE id = '$feed'");
 
                        return;
@@ -599,11 +569,12 @@
 
                                $entry_tags = $article["tags"];
                                $entry_guid = db_escape_string($entry_guid);
-                               $entry_content = db_escape_string($article["content"], false);
                                $entry_title = db_escape_string($article["title"]);
                                $entry_author = db_escape_string($article["author"]);
                                $entry_link = db_escape_string($article["link"]);
                                $entry_plugin_data = db_escape_string($article["plugin_data"]);
+                               $entry_content = $article["content"]; // escaped below
+
 
                                if ($debug_enabled) {
                                        _debug("update_rss_feed: plugin data: $entry_plugin_data");
@@ -612,6 +583,8 @@
                                if ($cache_images && is_writable(CACHE_DIR . '/images'))
                                        $entry_content = cache_images($entry_content, $site_url, $debug_enabled);
 
+                               $entry_content = db_escape_string($entry_content, false);
+
                                $content_hash = "SHA1:" . sha1($entry_content);
 
                                db_query($link, "BEGIN");
@@ -795,12 +768,17 @@
                                                        }
                                                }
 
+                                               $last_marked = ($marked == 'true') ? 'NOW()' : 'NULL';
+                                               $last_published = ($published == 'true') ? 'NOW()' : 'NULL';
+
                                                $result = db_query($link,
                                                        "INSERT INTO ttrss_user_entries
                                                                (ref_id, owner_uid, feed_id, unread, last_read, marked,
-                                                                       published, score, tag_cache, label_cache, uuid)
+                                                               published, score, tag_cache, label_cache, uuid,
+                                                               last_marked, last_published)
                                                        VALUES ('$ref_id', '$owner_uid', '$feed', $unread,
-                                                               $last_read_qpart, $marked, $published, '$score', '', '', '')");
+                                                               $last_read_qpart, $marked, $published, '$score', '', '',
+                                                               '', $last_marked, $last_published)");
 
                                                if (PUBSUBHUBBUB_HUB && $published == 'true') {
                                                        $rss_link = get_self_url_prefix() .
@@ -1112,7 +1090,7 @@
 
                $node = $doc->getElementsByTagName('body')->item(0);
 
-               return $doc->saveXML($node, LIBXML_NOEMPTYTAG);
+               return $doc->saveXML($node);
        }
 
        function expire_lock_files($debug) {
@@ -1298,27 +1276,6 @@
                }
        }
 
-       function cache_content($link, $url, $login, $pass) {
-
-               $content = fetch_file_contents($url, $login, $pass);
-
-               if ($content) {
-                       $doc = new DOMDocument();
-                       @$doc->loadHTML($content);
-                       $xpath = new DOMXPath($doc);
-
-                       $node = $doc->getElementsByTagName('body')->item(0);
-
-                       if ($node) {
-                               $content = $doc->saveXML($node, LIBXML_NOEMPTYTAG);
-
-                               return $content;
-                       }
-               }
-
-               return "";
-       }
-
        function make_guid_from_title($title) {
                return preg_replace("/[ \"\',.:;]/", "-",
                        mb_strtolower(strip_tags($title), 'utf-8'));