sanitize: allow <description>

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 380960bd83383dca56f85cd7bbbbfd8e683051a9..fcecbf67069cf001e41da834513bab359734b2e0 100755 (executable)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -399,6 +399,11 @@
                        // fetch feed from source
                        if (!$feed_data) {
                                _debug("fetching [$fetch_url]...", $debug_enabled);
+
+                               if (ini_get("open_basedir") && function_exists("curl_init")) {
+                                       _debug("not using CURL due to open_basedir restrictions");
+                               }
+
                                _debug("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $last_article_timestamp), $debug_enabled);
 
                                $feed_data = fetch_file_contents($fetch_url, false,
@@ -750,11 +755,7 @@
                                        db_query("UPDATE ttrss_entries SET date_updated = NOW()
                                                WHERE id = '$base_entry_id'");
 
-                    // if we allow duplicate posts, we have to continue to
-                    // create the user entries for this feed
-                    if (!get_pref("ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
-                        continue;
-                    }
+                                       continue;
                                }
 
                                _debug("hash differs, applying plugin filters:", $debug_enabled);
@@ -919,15 +920,6 @@
                                                        id = '$ref_id'");
                                        } */
 
-                                       // check for user post link to main table
-
-                                       // do we allow duplicate posts with same GUID in different feeds?
-                                       if (get_pref("ALLOW_DUPLICATE_POSTS", $owner_uid, false)) {
-                                               $dupcheck_qpart = "AND (feed_id = '$feed' OR feed_id IS NULL)";
-                                       } else {
-                                               $dupcheck_qpart = "";
-                                       }
-
                                        if (find_article_filter($article_filters, "filter")) {
                                                //db_query("COMMIT"); // close transaction in progress
                                                continue;
@@ -937,9 +929,10 @@
 
                                        _debug("initial score: $score [including plugin modifier: $entry_score_modifier]", $debug_enabled);
 
+                                       // check for user post link to main table
+
                                        $query = "SELECT ref_id, int_id FROM ttrss_user_entries WHERE
-                                                       ref_id = '$ref_id' AND owner_uid = '$owner_uid'
-                                                       $dupcheck_qpart";
+                                                       ref_id = '$ref_id' AND owner_uid = '$owner_uid'";
 
 //                                     if ($_REQUEST["xdebug"]) print "$query\n";
 
@@ -1520,9 +1513,9 @@
 
                purge_orphans( true);
                cleanup_counters_cache($debug);
-               $rc = cleanup_tags( 14, 50000);
 
-               _debug("Cleaned $rc cached tags.");
+               //$rc = cleanup_tags( 14, 50000);
+               //_debug("Cleaned $rc cached tags.");
 
                PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");