X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Frssfuncs.php;h=9c80a72d6efc7035ac9151fc27afd8cccb516b9f;hb=1ffe3391f902c4baa984982f19e61a0e45de21ff;hp=73fe757c3dfac0d930d265de7a41ffe6b5c28c4f;hpb=be574731fcb3db99df04b7300cea184b2780ba12;p=tt-rss.git diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 73fe757c..9c80a72d 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -3,32 +3,32 @@ define('DAEMON_FEED_LIMIT', 100); define('DAEMON_SLEEP_INTERVAL', 60); - function update_feedbrowser_cache($link) { + function update_feedbrowser_cache() { - $result = db_query($link, "SELECT feed_url, site_url, title, COUNT(id) AS subscribers + $result = db_query("SELECT feed_url, site_url, title, COUNT(id) AS subscribers FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf WHERE tf.feed_url = ttrss_feeds.feed_url AND (private IS true OR auth_login != '' OR auth_pass != '' OR feed_url LIKE '%:%@%/%')) GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT 1000"); - db_query($link, "BEGIN"); + db_query("BEGIN"); - db_query($link, "DELETE FROM ttrss_feedbrowser_cache"); + db_query("DELETE FROM ttrss_feedbrowser_cache"); $count = 0; while ($line = db_fetch_assoc($result)) { - $subscribers = db_escape_string($link, $line["subscribers"]); - $feed_url = db_escape_string($link, $line["feed_url"]); - $title = db_escape_string($link, $line["title"]); - $site_url = db_escape_string($link, $line["site_url"]); + $subscribers = db_escape_string($line["subscribers"]); + $feed_url = db_escape_string($line["feed_url"]); + $title = db_escape_string($line["title"]); + $site_url = db_escape_string($line["site_url"]); - $tmp_result = db_query($link, "SELECT subscribers FROM + $tmp_result = db_query("SELECT subscribers FROM ttrss_feedbrowser_cache WHERE feed_url = '$feed_url'"); if (db_num_rows($tmp_result) == 0) { - db_query($link, "INSERT INTO ttrss_feedbrowser_cache + db_query("INSERT INTO ttrss_feedbrowser_cache (feed_url, site_url, title, subscribers) VALUES ('$feed_url', '$site_url', '$title', '$subscribers')"); @@ -38,7 +38,7 @@ } - db_query($link, "COMMIT"); + db_query("COMMIT"); return $count; @@ -57,9 +57,15 @@ * @param boolean $debug Set to false to disable debug output. Default to true. * @return void */ - function update_daemon_common($link, $limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) { + function update_daemon_common($limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) { // Process all other feeds using last_updated and interval parameters + $schema_version = get_schema_version(); + + if ($schema_version != SCHEMA_VERSION) { + die("Schema version is wrong, please upgrade the database.\n"); + } + define('PREFS_NO_CACHE', true); // Test if the user has loggued in recently. If not, it does not update its feeds. @@ -77,6 +83,7 @@ if (DB_TYPE == "pgsql") { $update_limit_qpart = "AND (( ttrss_feeds.update_interval = 0 + AND ttrss_user_prefs.value != '-1' AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL) ) OR ( ttrss_feeds.update_interval > 0 @@ -86,6 +93,7 @@ } else { $update_limit_qpart = "AND (( ttrss_feeds.update_interval = 0 + AND ttrss_user_prefs.value != '-1' AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE) ) OR ( ttrss_feeds.update_interval > 0 @@ -108,9 +116,7 @@ $random_qpart = sql_random_function(); // We search for feed needing update. - $result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid, - ".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated, - ttrss_feeds.update_interval + $result = db_query("SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE @@ -118,50 +124,77 @@ AND ttrss_users.id = ttrss_user_prefs.owner_uid AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' $login_thresh_qpart $update_limit_qpart - $updstart_thresh_qpart + $updstart_thresh_qpart ORDER BY $random_qpart $query_limit"); - $user_prefs_cache = array(); - - if($debug) _debug(sprintf("Scheduled %d feeds to update...\n", db_num_rows($result))); + if($debug) _debug(sprintf("Scheduled %d feeds to update...", db_num_rows($result))); // Here is a little cache magic in order to minimize risk of double feed updates. $feeds_to_update = array(); while ($line = db_fetch_assoc($result)) { - $feeds_to_update[$line['id']] = $line; + array_push($feeds_to_update, db_escape_string($line['feed_url'])); } // We update the feed last update started date before anything else. // There is no lag due to feed contents downloads // It prevent an other process to update the same feed. - $feed_ids = array_keys($feeds_to_update); - if($feed_ids) { - db_query($link, sprintf("UPDATE ttrss_feeds SET last_update_started = NOW() - WHERE id IN (%s)", implode(',', $feed_ids))); + + if(count($feeds_to_update) > 0) { + $feeds_quoted = array(); + + foreach ($feeds_to_update as $feed) { + array_push($feeds_quoted, "'" . db_escape_string($feed) . "'"); + } + + db_query(sprintf("UPDATE ttrss_feeds SET last_update_started = NOW() + WHERE feed_url IN (%s)", implode(',', $feeds_quoted))); } expire_cached_files($debug); expire_lock_files($debug); + expire_error_log($debug); - // For each feed, we call the feed update function. - while ($line = array_pop($feeds_to_update)) { - - if($debug) _debug("Feed: " . $line["feed_url"] . ", " . $line["last_updated"]); - - update_rss_feed($link, $line["id"], true); + $nf = 0; - sleep(1); // prevent flood (FIXME make this an option?) + // For each feed, we call the feed update function. + foreach ($feeds_to_update as $feed) { + if($debug) _debug("Base feed: $feed"); + + //update_rss_feed($line["id"], true); + + // since we have the data cached, we can deal with other feeds with the same url + + $tmp_result = db_query("SELECT DISTINCT ttrss_feeds.id,last_updated + FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE + ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND + ttrss_users.id = ttrss_user_prefs.owner_uid AND + ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND + feed_url = '".db_escape_string($feed)."' AND + (ttrss_feeds.update_interval > 0 OR + ttrss_user_prefs.value != '-1') + $login_thresh_qpart + ORDER BY ttrss_feeds.id $query_limit"); + + if (db_num_rows($tmp_result) > 0) { + while ($tline = db_fetch_assoc($tmp_result)) { + if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"]); + update_rss_feed($tline["id"], true); + ++$nf; + } + } } require_once "digest.php"; // Send feed digests by email if needed. - send_headlines_digests($link, $debug); + send_headlines_digests($debug); + + return $nf; } // function update_daemon_common // ignore_daemon is not used - function update_rss_feed($link, $feed, $ignore_daemon = false, $no_cache = false, + function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false, $override_url = false) { require_once "lib/simplepie/simplepie.inc"; @@ -172,10 +205,10 @@ _debug("update_rss_feed: start"); } - $result = db_query($link, "SELECT id,update_interval,auth_login, + $result = db_query("SELECT id,update_interval,auth_login, feed_url,auth_pass,cache_images,last_updated, mark_unread_on_update, owner_uid, - pubsub_state + pubsub_state, auth_pass_encrypted FROM ttrss_feeds WHERE id = '$feed'"); if (db_num_rows($result) == 0) { @@ -190,117 +223,178 @@ $mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result, 0, "mark_unread_on_update")); $pubsub_state = db_fetch_result($result, 0, "pubsub_state"); + $auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result, + 0, "auth_pass_encrypted")); - db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW() + db_query("UPDATE ttrss_feeds SET last_update_started = NOW() WHERE id = '$feed'"); $auth_login = db_fetch_result($result, 0, "auth_login"); $auth_pass = db_fetch_result($result, 0, "auth_pass"); + if ($auth_pass_encrypted) { + require_once "crypt.php"; + $auth_pass = decrypt_string($auth_pass); + } + $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images")); $fetch_url = db_fetch_result($result, 0, "feed_url"); - $feed = db_escape_string($link, $feed); + $feed = db_escape_string($feed); - /* if ($auth_login && $auth_pass ){ - $url_parts = array(); - preg_match("/(^[^:]*):\/\/(.*)/", $fetch_url, $url_parts); + if ($override_url) $fetch_url = $override_url; - if ($url_parts[1] && $url_parts[2]) { - $fetch_url = $url_parts[1] . "://$auth_login:$auth_pass@" . $url_parts[2]; - } - } */ + $date_feed_processed = date('Y-m-d H:i'); + + $cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".feed"; - if ($override_url) - $fetch_url = $override_url; + // Ignore cache if new feed or manual update. + $cache_age = ($no_cache || is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ? + 30 : get_feed_update_interval($feed) * 60; if ($debug_enabled) { - _debug("update_rss_feed: fetching [$fetch_url]..."); + _debug("update_rss_feed: cache filename: $cache_filename exists: " . file_exists($cache_filename)); + _debug("update_rss_feed: cache age: $cache_age; no cache: $no_cache"); } - // Ignore cache if new feed or manual update. - $cache_age = (is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ? - -1 : get_feed_update_interval($link, $feed) * 60; + $cached_feed_data_hash = false; - $simplepie_cache_dir = CACHE_DIR . "/simplepie"; + $rss = false; + $rss_hash = false; + $cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0; + $last_updated_timestamp = strtotime($last_updated); - $date_feed_processed = date('Y-m-d H:i'); + $force_refetch = isset($_REQUEST["force_refetch"]); + + if (file_exists($cache_filename) && + is_readable($cache_filename) && + !$auth_login && !$auth_pass && + filemtime($cache_filename) > time() - $cache_age) { - if (!is_dir($simplepie_cache_dir)) { - mkdir($simplepie_cache_dir); + if ($debug_enabled) { + _debug("update_rss_feed: using local cache."); + } + + if ($cache_timestamp > $last_updated_timestamp) { + @$rss_data = file_get_contents($cache_filename); + + if ($rss_data) { + $rss_hash = sha1($rss_data); + @$rss = unserialize($rss_data); + } + } else if (!$force_refetch) { + if ($debug_enabled) { + _debug("update_rss_feed: local cache valid and older than last_updated, nothing to do."); + } + return; + } } - $feed_data = fetch_file_contents($fetch_url, false, - $auth_login, $auth_pass, false, $no_cache ? 15 : 45); + if (!$rss) { - if (!$feed_data) { - global $fetch_last_error; + if (!$feed_data) { + if ($debug_enabled) { + _debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)"); + } - if ($debug_enabled) { - _debug("update_rss_feed: unable to fetch: $fetch_last_error"); - } + $feed_data = fetch_file_contents($fetch_url, false, + $auth_login, $auth_pass, false, + $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT, + $force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp)); - $error_escaped = db_escape_string($link, $fetch_last_error); + global $fetch_curl_used; - db_query($link, - "UPDATE ttrss_feeds SET last_error = '$error_escaped', - last_updated = NOW() WHERE id = '$feed'"); + if (!$fetch_curl_used) { + $tmp = @gzdecode($feed_data); - return; - } + if ($tmp) $feed_data = $tmp; + } - $pluginhost = new PluginHost($link); - $pluginhost->set_debug($debug_enabled); - $user_plugins = get_pref($link, "_ENABLED_PLUGINS", $owner_uid); + if ($debug_enabled) { + _debug("update_rss_feed: fetch done."); + } - $pluginhost->load(PLUGINS, $pluginhost::KIND_ALL); - $pluginhost->load($user_plugins, $pluginhost::KIND_USER, $owner_uid); - $pluginhost->load_data(); + } - foreach ($pluginhost->get_hooks($pluginhost::HOOK_FEED_FETCHED) as $plugin) { - $feed_data = $plugin->hook_feed_fetched($feed_data); - } + if (!$feed_data) { + global $fetch_last_error; + global $fetch_last_error_code; - if ($debug_enabled) { - _debug("update_rss_feed: fetch done, parsing..."); - } + if ($debug_enabled) { + _debug("update_rss_feed: unable to fetch: $fetch_last_error [$fetch_last_error_code]"); + } - $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); + $error_escaped = ''; - if ($debug_enabled) { - _debug("feed update interval (sec): " . - get_feed_update_interval($link, $feed)*60); + // If-Modified-Since + if ($fetch_last_error_code != 304) { + $error_escaped = db_escape_string($fetch_last_error); + } else { + if ($debug_enabled) { + _debug("update_rss_feed: source claims data not modified, nothing to do."); + } + } + + db_query( + "UPDATE ttrss_feeds SET last_error = '$error_escaped', + last_updated = NOW() WHERE id = '$feed'"); + + return; + } } - $rss->enable_cache(!$no_cache); + $pluginhost = new PluginHost(); + $pluginhost->set_debug($debug_enabled); + $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid); + + $pluginhost->load(PLUGINS, PluginHost::KIND_ALL); + $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); + $pluginhost->load_data(); - if (!$no_cache) { - $rss->set_cache_location($simplepie_cache_dir); - $rss->set_cache_duration($cache_age); + foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) { + $feed_data = $plugin->hook_feed_fetched($feed_data); } - @$rss->init(); + if (!$rss) { + $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); + $rss->enable_cache(false); + + @$rss->init(); + } // print_r($rss); - $feed = db_escape_string($link, $feed); + $feed = db_escape_string($feed); if (!$rss->error()) { + // cache data for later + if (!$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) { + $rss_data = serialize($rss); + $new_rss_hash = sha1($rss_data); + + if ($new_rss_hash != $rss_hash) { + if ($debug_enabled) { + _debug("update_rss_feed: saving $cache_filename"); + } + @file_put_contents($cache_filename, serialize($rss)); + } + } + // We use local pluginhost here because we need to load different per-user feed plugins - $pluginhost->run_hooks($pluginhost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss); + $pluginhost->run_hooks(PluginHost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss); if ($debug_enabled) { _debug("update_rss_feed: processing feed data..."); } -// db_query($link, "BEGIN"); +// db_query("BEGIN"); if (DB_TYPE == "pgsql") { $favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'"; @@ -308,7 +402,7 @@ $favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)"; } - $result = db_query($link, "SELECT title,site_url,owner_uid, + $result = db_query("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'"); @@ -320,33 +414,44 @@ $owner_uid = db_fetch_result($result, 0, "owner_uid"); - $site_url = db_escape_string($link, mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245)); + $site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245)); - if ($debug_enabled) { - _debug("update_rss_feed: checking favicon..."); - } + if ($favicon_needs_check || $force_refetch) { + if ($debug_enabled) { + _debug("update_rss_feed: checking favicon..."); + } - if ($favicon_needs_check) { check_feed_favicon($site_url, $feed, $link); + $favicon_file = ICONS_DIR . "/$feed.ico"; + + if (file_exists($favicon_file)) { + require_once "colors.php"; + + $favicon_color = db_escape_string( + calculate_avg_color($favicon_file)); + + $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'"; + } - db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() + db_query("UPDATE ttrss_feeds SET favicon_last_checked = NOW() + $favicon_colorstring WHERE id = '$feed'"); } if (!$registered_title || $registered_title == "[Unknown]") { - $feed_title = db_escape_string($link, $rss->get_title()); + $feed_title = db_escape_string($rss->get_title()); if ($debug_enabled) { _debug("update_rss_feed: registering title: $feed_title"); } - db_query($link, "UPDATE ttrss_feeds SET + db_query("UPDATE ttrss_feeds SET title = '$feed_title' WHERE id = '$feed'"); } if ($site_url && $orig_site_url != $site_url) { - db_query($link, "UPDATE ttrss_feeds SET + db_query("UPDATE ttrss_feeds SET site_url = '$site_url' WHERE id = '$feed'"); } @@ -354,8 +459,8 @@ _debug("update_rss_feed: loading filters & labels..."); } - $filters = load_filters($link, $feed, $owner_uid); - $labels = get_all_labels($link, $owner_uid); + $filters = load_filters($feed, $owner_uid); + $labels = get_all_labels($owner_uid); if ($debug_enabled) { //print_r($filters); @@ -369,7 +474,7 @@ _debug("update_rss_feed: no articles found."); } - db_query($link, "UPDATE ttrss_feeds + db_query("UPDATE ttrss_feeds SET last_updated = NOW(), last_error = '' WHERE id = '$feed'"); return; // no articles @@ -407,7 +512,7 @@ if ($debug_enabled) _debug("update_rss_feed: feed hub url found, subscribe request sent."); - db_query($link, "UPDATE ttrss_feeds SET pubsub_state = 1 + db_query("UPDATE ttrss_feeds SET pubsub_state = 1 WHERE id = '$feed'"); } } @@ -425,14 +530,16 @@ if (!$entry_guid) $entry_guid = $item->get_link(); if (!$entry_guid) $entry_guid = make_guid_from_title($item->get_title()); - if ($debug_enabled) { - _debug("update_rss_feed: guid $entry_guid"); - } - if (!$entry_guid) continue; $entry_guid = "$owner_uid,$entry_guid"; + $entry_guid_hashed = db_escape_string('SHA1:' . sha1($entry_guid)); + + if ($debug_enabled) { + _debug("update_rss_feed: guid $entry_guid / $entry_guid_hashed"); + } + $entry_timestamp = ""; $entry_timestamp = strtotime($item->get_date()); @@ -450,7 +557,7 @@ _debug("update_rss_feed: date $entry_timestamp [$entry_timestamp_fmt]"); } - $entry_title = $item->get_title(); + $entry_title = html_entity_decode($item->get_title()); $entry_link = rewrite_relative_url($site_url, $item->get_link()); @@ -477,13 +584,13 @@ $entry_author = $entry_author_item->get_name(); if (!$entry_author) $entry_author = $entry_author_item->get_email(); - $entry_author = db_escape_string($link, $entry_author); + $entry_author = db_escape_string($entry_author); } - $entry_guid = db_escape_string($link, mb_substr($entry_guid, 0, 245)); + $entry_guid = db_escape_string(mb_substr($entry_guid, 0, 245)); - $entry_comments = db_escape_string($link, mb_substr($entry_comments, 0, 245)); - $entry_author = db_escape_string($link, mb_substr($entry_author, 0, 245)); + $entry_comments = db_escape_string(mb_substr($entry_comments, 0, 245)); + $entry_author = db_escape_string(mb_substr($entry_author, 0, 245)); $num_comments = $item->get_item_tags('http://purl.org/rss/1.0/modules/slash/', 'comments'); @@ -494,6 +601,7 @@ } if ($debug_enabled) { + _debug("update_rss_feed: author $entry_author"); _debug("update_rss_feed: num_comments: $num_comments"); _debug("update_rss_feed: looking for tags [1]..."); } @@ -540,8 +648,8 @@ } // FIXME not sure if owner_uid is a good idea here, we may have a base entry without user entry (?) - $result = db_query($link, "SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries - WHERE ref_id = id AND guid = '".db_escape_string($link, $entry_guid)."' AND owner_uid = $owner_uid"); + $result = db_query("SELECT plugin_data,title,content,link,tag_cache,author FROM ttrss_entries, ttrss_user_entries + WHERE ref_id = id AND (guid = '".db_escape_string($entry_guid)."' OR guid = '$entry_guid_hashed') AND owner_uid = $owner_uid"); if (db_num_rows($result) != 0) { $entry_plugin_data = db_fetch_result($result, 0, "plugin_data"); @@ -565,16 +673,16 @@ "author" => $entry_author, "stored" => $stored_article); - foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_FILTER) as $plugin) { + foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) { $article = $plugin->hook_article_filter($article); } $entry_tags = $article["tags"]; - $entry_guid = db_escape_string($link, $entry_guid); - $entry_title = db_escape_string($link, $article["title"]); - $entry_author = db_escape_string($link, $article["author"]); - $entry_link = db_escape_string($link, $article["link"]); - $entry_plugin_data = db_escape_string($link, $article["plugin_data"]); + $entry_guid = db_escape_string($entry_guid); + $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 @@ -585,14 +693,14 @@ if ($cache_images && is_writable(CACHE_DIR . '/images')) cache_images($entry_content, $site_url, $debug_enabled); - $entry_content = db_escape_string($link, $entry_content, false); + $entry_content = db_escape_string($entry_content, false); $content_hash = "SHA1:" . sha1($entry_content); - db_query($link, "BEGIN"); + db_query("BEGIN"); - $result = db_query($link, "SELECT id FROM ttrss_entries - WHERE guid = '$entry_guid'"); + $result = db_query("SELECT id FROM ttrss_entries + WHERE (guid = '$entry_guid' OR guid = '$entry_guid_hashed')"); if (db_num_rows($result) == 0) { @@ -602,7 +710,7 @@ // base post entry does not exist, create it - $result = db_query($link, + $result = db_query( "INSERT INTO ttrss_entries (title, guid, @@ -620,7 +728,7 @@ author) VALUES ('$entry_title', - '$entry_guid', + '$entry_guid_hashed', '$entry_link', '$entry_timestamp_fmt', '$entry_content', @@ -644,22 +752,22 @@ $base_entry_id = db_fetch_result($result, 0, "id"); - db_query($link, "UPDATE ttrss_entries SET date_updated = NOW() + db_query("UPDATE ttrss_entries SET date_updated = NOW() WHERE id = '$base_entry_id'"); - $article_labels = get_article_labels($link, $base_entry_id, $owner_uid); + $article_labels = get_article_labels($base_entry_id, $owner_uid); } // now it should exist, if not - bad luck then - $result = db_query($link, "SELECT - id,content_hash,no_orig_date,title,plugin_data, + $result = db_query("SELECT + id,content_hash,no_orig_date,title,plugin_data,guid, ".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated, ".SUBSTRING_FOR_DATE."(updated,1,19) as updated, num_comments FROM ttrss_entries - WHERE guid = '$entry_guid'"); + WHERE guid = '$entry_guid' OR guid = '$entry_guid_hashed'"); $entry_ref_id = 0; $entry_int_id = 0; @@ -667,7 +775,7 @@ if (db_num_rows($result) == 1) { if ($debug_enabled) { - _debug("update_rss_feed: base guid [$entry_guid] found, checking for user record"); + _debug("update_rss_feed: base guid found, checking for user record"); } // this will be used below in update handler @@ -681,10 +789,18 @@ $ref_id = db_fetch_result($result, 0, "id"); $entry_ref_id = $ref_id; + /* $stored_guid = db_fetch_result($result, 0, "guid"); + if ($stored_guid != $entry_guid_hashed) { + if ($debug_enabled) _debug("upgrading compat guid to hashed one"); + + db_query("UPDATE ttrss_entries SET guid = '$entry_guid_hashed' WHERE + 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($link, "ALLOW_DUPLICATE_POSTS", $owner_uid, false)) { + if (get_pref("ALLOW_DUPLICATE_POSTS", $owner_uid, false)) { $dupcheck_qpart = "AND (feed_id = '$feed' OR feed_id IS NULL)"; } else { $dupcheck_qpart = ""; @@ -704,7 +820,7 @@ } if (find_article_filter($article_filters, "filter")) { - db_query($link, "COMMIT"); // close transaction in progress + db_query("COMMIT"); // close transaction in progress continue; } @@ -720,7 +836,7 @@ // if ($_REQUEST["xdebug"]) print "$query\n"; - $result = db_query($link, $query); + $result = db_query($query); // okay it doesn't exist - create user entry if (db_num_rows($result) == 0) { @@ -753,7 +869,7 @@ if (DB_TYPE == "pgsql" and defined('_NGRAM_TITLE_DUPLICATE_THRESHOLD')) { - $result = db_query($link, "SELECT COUNT(*) AS similar FROM + $result = db_query("SELECT COUNT(*) AS similar FROM ttrss_entries,ttrss_user_entries WHERE ref_id = id AND updated >= NOW() - INTERVAL '7 day' AND similarity(title, '$entry_title') >= "._NGRAM_TITLE_DUPLICATE_THRESHOLD." @@ -773,7 +889,7 @@ $last_marked = ($marked == 'true') ? 'NOW()' : 'NULL'; $last_published = ($published == 'true') ? 'NOW()' : 'NULL'; - $result = db_query($link, + $result = db_query( "INSERT INTO ttrss_user_entries (ref_id, owner_uid, feed_id, unread, last_read, marked, published, score, tag_cache, label_cache, uuid, @@ -785,14 +901,14 @@ if (PUBSUBHUBBUB_HUB && $published == 'true') { $rss_link = get_self_url_prefix() . "/public.php?op=rss&id=-2&key=" . - get_feed_access_key($link, -2, false, $owner_uid); + get_feed_access_key(-2, false, $owner_uid); $p = new Publisher(PUBSUBHUBBUB_HUB); $pubsub_result = $p->publish_update($rss_link); } - $result = db_query($link, + $result = db_query( "SELECT int_id FROM ttrss_user_entries WHERE ref_id = '$ref_id' AND owner_uid = '$owner_uid' AND feed_id = '$feed' LIMIT 1"); @@ -831,7 +947,7 @@ $update_insignificant = false; } - if (db_escape_string($link, $orig_title) != $entry_title) { + if (db_escape_string($orig_title) != $entry_title) { $post_needs_update = true; $update_insignificant = false; } @@ -841,12 +957,12 @@ if ($post_needs_update) { if (defined('DAEMON_EXTENDED_DEBUG')) { - _debug("update_rss_feed: post $entry_guid needs update..."); + _debug("update_rss_feed: post $entry_guid_hashed needs update..."); } // print ""; - db_query($link, "UPDATE ttrss_entries + db_query("UPDATE ttrss_entries SET title = '$entry_title', content = '$entry_content', content_hash = '$content_hash', updated = '$entry_timestamp_fmt', @@ -856,20 +972,20 @@ if (!$update_insignificant) { if ($mark_unread_on_update) { - db_query($link, "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET last_read = null, unread = true WHERE ref_id = '$ref_id'"); } } } } - db_query($link, "COMMIT"); + db_query("COMMIT"); if ($debug_enabled) { _debug("update_rss_feed: assigning labels..."); } - assign_article_to_label_filters($link, $entry_ref_id, $article_filters, + assign_article_to_label_filters($entry_ref_id, $article_filters, $owner_uid, $article_labels); if ($debug_enabled) { @@ -895,24 +1011,24 @@ print_r($enclosures); } - db_query($link, "BEGIN"); + db_query("BEGIN"); foreach ($enclosures as $enc) { - $enc_url = db_escape_string($link, $enc[0]); - $enc_type = db_escape_string($link, $enc[1]); - $enc_dur = db_escape_string($link, $enc[2]); + $enc_url = db_escape_string($enc[0]); + $enc_type = db_escape_string($enc[1]); + $enc_dur = db_escape_string($enc[2]); - $result = db_query($link, "SELECT id FROM ttrss_enclosures + $result = db_query("SELECT id FROM ttrss_enclosures WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'"); if (db_num_rows($result) == 0) { - db_query($link, "INSERT INTO ttrss_enclosures + db_query("INSERT INTO ttrss_enclosures (content_url, content_type, title, duration, post_id) VALUES ('$enc_url', '$enc_type', '', '$enc_dur', '$entry_ref_id')"); } } - db_query($link, "COMMIT"); + db_query("COMMIT"); // check for manual tags (we have to do it here since they're loaded from filters) @@ -931,7 +1047,7 @@ // Skip boring tags - $boring_tags = trim_array(explode(",", mb_strtolower(get_pref($link, + $boring_tags = trim_array(explode(",", mb_strtolower(get_pref( 'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8'))); $filtered_tags = array(); @@ -956,22 +1072,22 @@ if (count($filtered_tags) > 0) { - db_query($link, "BEGIN"); + db_query("BEGIN"); foreach ($filtered_tags as $tag) { $tag = sanitize_tag($tag); - $tag = db_escape_string($link, $tag); + $tag = db_escape_string($tag); if (!tag_is_valid($tag)) continue; - $result = db_query($link, "SELECT id FROM ttrss_tags + $result = db_query("SELECT id FROM ttrss_tags WHERE tag_name = '$tag' AND post_int_id = '$entry_int_id' AND owner_uid = '$owner_uid' LIMIT 1"); if ($result && db_num_rows($result) == 0) { - db_query($link, "INSERT INTO ttrss_tags + db_query("INSERT INTO ttrss_tags (owner_uid,tag_name,post_int_id) VALUES ('$owner_uid','$tag', '$entry_int_id')"); } @@ -983,16 +1099,16 @@ $tags_to_cache = array_unique($tags_to_cache); - $tags_str = db_escape_string($link, join(",", $tags_to_cache)); + $tags_str = db_escape_string(join(",", $tags_to_cache)); - db_query($link, "UPDATE ttrss_user_entries + db_query("UPDATE ttrss_user_entries SET tag_cache = '$tags_str' WHERE ref_id = '$entry_ref_id' AND owner_uid = $owner_uid"); - db_query($link, "COMMIT"); + db_query("COMMIT"); } - if (get_pref($link, "AUTO_ASSIGN_LABELS", $owner_uid, false)) { + if (get_pref("AUTO_ASSIGN_LABELS", $owner_uid, false)) { if ($debug_enabled) { _debug("update_rss_feed: auto-assigning labels..."); } @@ -1002,7 +1118,7 @@ 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($link, $entry_ref_id, $caption, $owner_uid); + label_add_article($entry_ref_id, $caption, $owner_uid); } } } @@ -1017,29 +1133,29 @@ if ($debug_enabled) { _debug("update_rss_feed: new feed, catching it up..."); } - catchup_feed($link, $feed, false, $owner_uid); + catchup_feed($feed, false, $owner_uid); } if ($debug_enabled) { _debug("purging feed..."); } - purge_feed($link, $feed, 0, $debug_enabled); + purge_feed($feed, 0, $debug_enabled); - db_query($link, "UPDATE ttrss_feeds + db_query("UPDATE ttrss_feeds SET last_updated = NOW(), last_error = '' WHERE id = '$feed'"); -// db_query($link, "COMMIT"); +// db_query("COMMIT"); } else { - $error_msg = db_escape_string($link, mb_substr($rss->error(), 0, 245)); + $error_msg = db_escape_string(mb_substr($rss->error(), 0, 245)); if ($debug_enabled) { _debug("update_rss_feed: error fetching feed: $error_msg"); } - db_query($link, + db_query( "UPDATE ttrss_feeds SET last_error = '$error_msg', last_updated = NOW() WHERE id = '$feed'"); } @@ -1095,6 +1211,19 @@ return $doc->saveXML($node); } + function expire_error_log($debug) { + if ($debug) _debug("Removing old error log entries..."); + + if (DB_TYPE == "pgsql") { + db_query("DELETE FROM ttrss_error_log + WHERE created_at < NOW() - INTERVAL '7 days'"); + } else { + db_query("DELETE FROM ttrss_error_log + WHERE created_at < DATE_SUB(NOW(), INTERVAL 7 DAY)"); + } + + } + function expire_lock_files($debug) { if ($debug) _debug("Removing old lock files..."); @@ -1117,7 +1246,7 @@ } function expire_cached_files($debug) { - foreach (array("simplepie", "images", "export") as $dir) { + foreach (array("simplepie", "images", "export", "upload") as $dir) { $cache_dir = CACHE_DIR . "/$dir"; if ($debug) _debug("Expiring $cache_dir"); @@ -1226,6 +1355,9 @@ if ($filter_match) { foreach ($filter["actions"] AS $action) { array_push($matches, $action); + + // if Stop action encountered, perform no further processing + if ($action["type"] == "stop") return $matches; } } } @@ -1274,11 +1406,11 @@ return false; } - function assign_article_to_label_filters($link, $id, $filters, $owner_uid, $article_labels) { + function assign_article_to_label_filters($id, $filters, $owner_uid, $article_labels) { foreach ($filters as $f) { if ($f["type"] == "label") { if (!labels_contains_caption($article_labels, $f["param"])) { - label_add_article($link, $id, $f["param"], $owner_uid); + label_add_article($id, $f["param"], $owner_uid); } } }