remove image.php; put cached image endpoint to public.php

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 4cd0f688876d676bf509ee00c5928c6cc3641974..b285f74c0cf6694ec081a54a159ee4939b56333b 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -683,6 +683,7 @@
                                        "link" => $entry_link,
                                        "tags" => $entry_tags,
                                        "author" => $entry_author,
+                                       "force_catchup" => false, // ugly hack for the time being
                                        "language" => $entry_language, // read only
                                        "feed" => array("id" => $feed,
                                                "fetch_url" => $fetch_url,
@@ -737,6 +738,9 @@
                                $entry_author = db_escape_string($article["author"]);
                                $entry_link = db_escape_string($article["link"]);
                                $entry_content = $article["content"]; // escaped below
+                               $entry_force_catchup = $article["force_catchup"];
+
+                               _debug("force catchup: $entry_force_catchup");
 
                                if ($cache_images && is_writable(CACHE_DIR . '/images'))
                                        cache_images($entry_content, $site_url, $debug_enabled);
@@ -861,7 +865,7 @@
 
                                                _debug("user record not found, creating...", $debug_enabled);
 
-                                               if ($score >= -500 && !find_article_filter($article_filters, 'catchup')) {
+                                               if ($score >= -500 && !find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) {
                                                        $unread = 'true';
                                                        $last_read_qpart = 'NULL';
                                                } else {
@@ -883,7 +887,7 @@
 
                                                // N-grams
 
-                                               if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_DUPLICATE_THRESHOLD')) {
+                                               /* if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_DUPLICATE_THRESHOLD')) {
 
                                                        $result = db_query("SELECT COUNT(*) AS similar FROM
                                                                        ttrss_entries,ttrss_user_entries
@@ -898,7 +902,7 @@
                                                        if ($ngram_similar > 0) {
                                                                $unread = 'false';
                                                        }
-                                               }
+                                               } */
 
                                                $last_marked = ($marked == 'true') ? 'NOW()' : 'NULL';
                                                $last_published = ($published == 'true') ? 'NOW()' : 'NULL';
@@ -1087,20 +1091,6 @@
                                        db_query("COMMIT");
                                }
 
-                               if (get_pref("AUTO_ASSIGN_LABELS", $owner_uid, false)) {
-                                       _debug("auto-assigning labels...", $debug_enabled);
-
-                                       foreach ($labels as $label) {
-                                               $caption = preg_quote($label["caption"]);
-
-                                               if ($caption && preg_match("/\b$caption\b/i", "$tags_str " . strip_tags($entry_content) . " $entry_title")) {
-                                                       if (!labels_contains_caption($article_labels, $caption)) {
-                                                               label_add_article($entry_ref_id, $caption, $owner_uid);
-                                                       }
-                                               }
-                                       }
-                               }
-
                                _debug("article processed", $debug_enabled);
                        }
 
@@ -1165,16 +1155,8 @@
                                                file_put_contents($local_filename, $file_content);
                                        }
                                }
-
-                               /* if (file_exists($local_filename)) {
-                                       $entry->setAttribute('src', SELF_URL_PATH . '/image.php?url=' .
-                                               base64_encode($src));
-                               } */
                        }
                }
-
-               //$node = $doc->getElementsByTagName('body')->item(0);
-               //return $doc->saveXML($node);
        }
 
        function expire_error_log($debug) {