|
|
|
@ -60,20 +60,7 @@
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Update a feed batch.
|
|
|
|
|
* Used by daemons to update n feeds by run.
|
|
|
|
|
* Only update feed needing a update, and not being processed
|
|
|
|
|
* by another process.
|
|
|
|
|
*
|
|
|
|
|
* @param mixed $link Database link
|
|
|
|
|
* @param integer $limit Maximum number of feeds in update batch. Default to DAEMON_FEED_LIMIT.
|
|
|
|
|
* @param boolean $from_http Set to true if you call this function from http to disable cli specific code.
|
|
|
|
|
* @param boolean $debug Set to false to disable debug output. Default to true.
|
|
|
|
|
* @return void
|
|
|
|
|
*/
|
|
|
|
|
function update_daemon_common($limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) {
|
|
|
|
|
function update_daemon_common($limit = DAEMON_FEED_LIMIT, $debug = true) {
|
|
|
|
|
// Process all other feeds using last_updated and interval parameters
|
|
|
|
|
|
|
|
|
|
$schema_version = get_schema_version();
|
|
|
|
@ -200,8 +187,6 @@
|
|
|
|
|
ORDER BY ttrss_feeds.id $query_limit");
|
|
|
|
|
|
|
|
|
|
if (db_num_rows($tmp_result) > 0) {
|
|
|
|
|
$rss = false;
|
|
|
|
|
|
|
|
|
|
while ($tline = db_fetch_assoc($tmp_result)) {
|
|
|
|
|
if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
|
|
|
|
|
|
|
|
|
@ -209,7 +194,7 @@
|
|
|
|
|
array_push($batch_owners, $tline["owner_uid"]);
|
|
|
|
|
|
|
|
|
|
$fstarted = microtime(true);
|
|
|
|
|
$rss = update_rss_feed($tline["id"], true, false);
|
|
|
|
|
update_rss_feed($tline["id"], true, false);
|
|
|
|
|
_debug_suppress(false);
|
|
|
|
|
|
|
|
|
|
_debug(sprintf(" %.4f (sec)", microtime(true) - $fstarted));
|
|
|
|
@ -237,7 +222,7 @@
|
|
|
|
|
|
|
|
|
|
return $nf;
|
|
|
|
|
|
|
|
|
|
} // function update_daemon_common
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// this is used when subscribing
|
|
|
|
|
function set_basic_feed_info($feed) {
|
|
|
|
@ -300,8 +285,10 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// ignore_daemon is not used
|
|
|
|
|
function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false, $rss = false) {
|
|
|
|
|
/**
|
|
|
|
|
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
|
|
|
|
|
*/
|
|
|
|
|
function update_rss_feed($feed, $no_cache = false) {
|
|
|
|
|
|
|
|
|
|
$debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
|
|
|
|
|
|
|
|
|
@ -370,9 +357,6 @@
|
|
|
|
|
$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
|
|
|
|
|
$pluginhost->load_data();
|
|
|
|
|
|
|
|
|
|
if ($rss && is_object($rss) && get_class($rss) == "FeedParser") {
|
|
|
|
|
_debug("using previously initialized parser object");
|
|
|
|
|
} else {
|
|
|
|
|
$rss_hash = false;
|
|
|
|
|
|
|
|
|
|
$force_refetch = isset($_REQUEST["force_refetch"]);
|
|
|
|
@ -458,7 +442,6 @@
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
|
|
|
|
|
$feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
|
|
|
|
@ -797,7 +780,7 @@
|
|
|
|
|
$matched_rules = array();
|
|
|
|
|
|
|
|
|
|
$article_filters = get_article_filters($filters, $article["title"],
|
|
|
|
|
$article["content"], $article["link"], 0, $article["author"],
|
|
|
|
|
$article["content"], $article["link"], $article["author"],
|
|
|
|
|
$article["tags"], $matched_rules);
|
|
|
|
|
|
|
|
|
|
if ($debug_enabled) {
|
|
|
|
@ -1224,11 +1207,12 @@
|
|
|
|
|
last_updated = NOW() WHERE id = '$feed'");
|
|
|
|
|
|
|
|
|
|
unset($rss);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_debug("done", $debug_enabled);
|
|
|
|
|
|
|
|
|
|
return $rss;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function cache_enclosures($enclosures, $site_url, $debug) {
|
|
|
|
@ -1369,7 +1353,7 @@
|
|
|
|
|
return $params;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags, &$matched_rules = false) {
|
|
|
|
|
function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false) {
|
|
|
|
|
$matches = array();
|
|
|
|
|
|
|
|
|
|
foreach ($filters as $filter) {
|
|
|
|
@ -1505,15 +1489,6 @@
|
|
|
|
|
mb_strtolower(strip_tags($title), 'utf-8'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* function verify_feed_xml($feed_data) {
|
|
|
|
|
libxml_use_internal_errors(true);
|
|
|
|
|
$doc = new DOMDocument();
|
|
|
|
|
$doc->loadXML($feed_data);
|
|
|
|
|
$error = libxml_get_last_error();
|
|
|
|
|
libxml_clear_errors();
|
|
|
|
|
return $error;
|
|
|
|
|
} */
|
|
|
|
|
|
|
|
|
|
function cleanup_counters_cache($debug) {
|
|
|
|
|
$result = db_query("DELETE FROM ttrss_counters_cache
|
|
|
|
|
WHERE feed_id > 0 AND
|
|
|
|
@ -1529,7 +1504,7 @@
|
|
|
|
|
ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid) = 0");
|
|
|
|
|
$crows = db_affected_rows($result);
|
|
|
|
|
|
|
|
|
|
_debug("Removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
|
|
|
|
|
if ($debug) _debug("Removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function housekeeping_user($owner_uid) {
|
|
|
|
|