implement proper last_marked/last_published feeds for proper sorting of

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index c3ac1073015f984f943870f316aa01177ec00d2a..a95280a3180bc889da92a4216c1bbbdf700b79e9 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -174,7 +174,7 @@
 
                $result = db_query($link, "SELECT id,update_interval,auth_login,
                        feed_url,auth_pass,cache_images,last_updated,
-                       mark_unread_on_update, owner_uid, update_on_checksum_change,
+                       mark_unread_on_update, owner_uid,
                        pubsub_state
                        FROM ttrss_feeds WHERE id = '$feed'");
 
@@ -189,8 +189,6 @@
                $owner_uid = db_fetch_result($result, 0, "owner_uid");
                $mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
                        0, "mark_unread_on_update"));
-               $update_on_checksum_change = sql_bool_to_bool(db_fetch_result($result,
-                       0, "update_on_checksum_change"));
                $pubsub_state = db_fetch_result($result, 0, "pubsub_state");
 
                db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW()
@@ -240,14 +238,17 @@
                                _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;
                }
 
                $pluginhost = new PluginHost($link);
+               $pluginhost->set_debug($debug_enabled);
                $user_plugins = get_pref($link, "_ENABLED_PLUGINS", $owner_uid);
 
                $pluginhost->load(PLUGINS, $pluginhost::KIND_ALL);
@@ -263,6 +264,10 @@
                }
 
                $rss = new SimplePie();
+               $rss->set_sanitize_class("SanitizeDummy");
+               // simplepie ignores the above and creates default sanitizer anyway,
+               // so let's override it...
+               $rss->sanitize = new SanitizeDummy();
                $rss->set_output_encoding('UTF-8');
                $rss->set_raw_data($feed_data);
 
@@ -410,7 +415,7 @@
                        }
 
                        foreach ($items as $item) {
-                               if ($_REQUEST['xdebug'] == 2) {
+                               if ($_REQUEST['xdebug'] == 3) {
                                        print_r($item);
                                }
 
@@ -445,7 +450,7 @@
 
                                $entry_title = $item->get_title();
 
-                               $entry_link = rewrite_relative_url($site_url, htmlspecialchars_decode($item->get_link()));
+                               $entry_link = rewrite_relative_url($site_url, $item->get_link());
 
                                if ($debug_enabled) {
                                        _debug("update_rss_feed: title $entry_title");
@@ -523,7 +528,7 @@
                                }
 
                                if ($debug_enabled) {
-                                       _debug("update_rss_feed: done collecting data [TITLE:$entry_title]");
+                                       _debug("update_rss_feed: done collecting data.");
                                }
 
                                // TODO: less memory-hungry implementation
@@ -564,7 +569,6 @@
 
                                $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"]);
@@ -577,6 +581,8 @@
                                if ($cache_images && is_writable(CACHE_DIR . '/images'))
                                        $entry_content = cache_images($entry_content, $site_url, $debug_enabled);
 
+                               $entry_content = db_escape_string($article["content"], false);
+
                                $content_hash = "SHA1:" . sha1($entry_content);
 
                                db_query($link, "BEGIN");
@@ -760,12 +766,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() .
@@ -843,10 +854,6 @@
                                                        if ($mark_unread_on_update) {
                                                                db_query($link, "UPDATE ttrss_user_entries
                                                                        SET last_read = null, unread = true WHERE ref_id = '$ref_id'");
-                                                       } else if ($update_on_checksum_change) {
-                                                               db_query($link, "UPDATE ttrss_user_entries
-                                                                       SET last_read = null WHERE ref_id = '$ref_id'
-                                                                               AND unread = false");
                                                        }
                                                }
                                        }
@@ -1081,7 +1088,7 @@
 
                $node = $doc->getElementsByTagName('body')->item(0);
 
-               return $doc->saveXML($node, LIBXML_NOEMPTYTAG);
+               return $doc->saveXML($node);
        }
 
        function expire_lock_files($debug) {
@@ -1267,27 +1274,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'));