af_unburn: set useragent

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index a3cb94c7073856a91dbcd492ed073f4dd4c5e1d3..5cb22f8b855359a11791b7ccad10985558619bf3 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -285,13 +285,12 @@
                                $favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
                        }
 
-                       $result = db_query($link, "SELECT title,icon_url,site_url,owner_uid,
+                       $result = db_query($link, "SELECT title,site_url,owner_uid,
                                (favicon_last_checked IS NULL OR $favicon_interval_qpart) AS
                                                favicon_needs_check
                                FROM ttrss_feeds WHERE id = '$feed'");
 
                        $registered_title = db_fetch_result($result, 0, "title");
-                       $orig_icon_url = db_fetch_result($result, 0, "icon_url");
                        $orig_site_url = db_fetch_result($result, 0, "site_url");
                        $favicon_needs_check = sql_bool_to_bool(db_fetch_result($result, 0,
                                "favicon_needs_check"));
@@ -328,13 +327,6 @@
                                        site_url = '$site_url' WHERE id = '$feed'");
                        }
 
-                       $icon_url = db_escape_string(mb_substr(
-                               rewrite_relative_url($fetch_url, $rss->get_image_url()), 0, 245));
-
-                       if ($icon_url && $orig_icon_url != $icon_url) {
-                               db_query($link, "UPDATE ttrss_feeds SET icon_url = '$icon_url' WHERE id = '$feed'");
-                       }
-
                        if ($debug_enabled) {
                                _debug("update_rss_feed: loading filters & labels...");
                        }
@@ -524,12 +516,23 @@
                                        _debug("update_rss_feed: applying plugin filters..");
                                }
 
+                               // Todo unify with id checking below
+                               $result = db_query($link, "SELECT plugin_data FROM ttrss_entries
+                                       WHERE guid = '".db_escape_string($entry_guid)."'");
+
+                               if (db_num_rows($result) != 0) {
+                                       $entry_plugin_data = db_fetch_result($result, 0, "plugin_data");
+                               } else {
+                                       $entry_plugin_data = "";
+                               }
+
                                $article = array("owner_uid" => $owner_uid, // read only
-                                       "guid" => $entry_guid,
+                                       "guid" => $entry_guid, // read only
                                        "title" => $entry_title,
                                        "content" => $entry_content,
                                        "link" => $entry_link,
                                        "tags" => $entry_tags,
+                                       "plugin_data" => $entry_plugin_data,
                                        "author" => $entry_author);
 
                                foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_FILTER) as $plugin) {
@@ -537,11 +540,16 @@
                                }
 
                                $entry_tags = $article["tags"];
-                               $entry_guid = db_escape_string($article["guid"]);
+                               $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"]);
+
+                               if ($debug_enabled) {
+                                       _debug("update_rss_feed: plugin data: $entry_plugin_data");
+                               }
 
                                if ($cache_images && is_writable(CACHE_DIR . '/images'))
                                        $entry_content = cache_images($entry_content, $site_url, $debug_enabled);
@@ -575,6 +583,7 @@
                                                        date_entered,
                                                        comments,
                                                        num_comments,
+                                                       plugin_data,
                                                        author)
                                                VALUES
                                                        ('$entry_title',
@@ -589,6 +598,7 @@
                                                        NOW(),
                                                        '$entry_comments',
                                                        '$num_comments',
+                                                       '$entry_plugin_data',
                                                        '$entry_author')");
 
                                        $article_labels = array();
@@ -610,7 +620,7 @@
                                // now it should exist, if not - bad luck then
 
                                $result = db_query($link, "SELECT
-                                               id,content_hash,no_orig_date,title,
+                                               id,content_hash,no_orig_date,title,plugin_data,
                                                ".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated,
                                                ".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
                                                num_comments
@@ -633,6 +643,7 @@
                                        $orig_num_comments = db_fetch_result($result, 0, "num_comments");
                                        $orig_date_updated = strtotime(db_fetch_result($result,
                                                0, "date_updated"));
+                                       $orig_plugin_data = db_fetch_result($result, 0, "plugin_data");
 
                                        $ref_id = db_fetch_result($result, 0, "id");
                                        $entry_ref_id = $ref_id;
@@ -772,6 +783,11 @@
                                                $update_insignificant = true;
                                        }
 
+                                       if ($entry_plugin_data != $orig_plugin_data) {
+                                               $post_needs_update = true;
+                                               $update_insignificant = true;
+                                       }
+
                                        if ($content_hash != $orig_content_hash) {
                                                $post_needs_update = true;
                                                $update_insignificant = false;
@@ -796,7 +812,8 @@
                                                        SET title = '$entry_title', content = '$entry_content',
                                                                content_hash = '$content_hash',
                                                                updated = '$entry_timestamp_fmt',
-                                                               num_comments = '$num_comments'
+                                                               num_comments = '$num_comments',
+                                                               plugin_data = '$entry_plugin_data'
                                                        WHERE id = '$ref_id'");
 
                                                if (!$update_insignificant) {