foreach ($article as $k => $v) {
if ($k != "feed" && isset($v)) {
- $tmp .= sha1("$k:" . (is_array($v) ? implode(",", $v) : $v));
+ $x = strip_tags(is_array($v) ? implode(",", $v) : $v);
+
+ //_debug("$k:" . sha1($x) . ":" . htmlspecialchars($x), true);
+
+ $tmp .= sha1("$k:" . sha1($x));
}
}
$query_limit = "";
if($limit) $query_limit = sprintf("LIMIT %d", $limit);
+ // Update the least recently updated feeds first
+ $query_order = "ORDER BY last_updated";
+ if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
+
$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
FROM
ttrss_feeds, ttrss_users, ttrss_user_prefs
AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
$login_thresh_qpart $update_limit_qpart
$updstart_thresh_qpart
- ORDER BY last_updated $query_limit";
+ $query_order $query_limit";
// We search for feed needing update.
$result = db_query($query);
$nf = 0;
$bstarted = microtime(true);
+ $batch_owners = array();
+
// For each feed, we call the feed update function.
foreach ($feeds_to_update as $feed) {
if($debug) _debug("Base feed: $feed");
ttrss_users.id = ttrss_user_prefs.owner_uid AND
ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
ttrss_user_prefs.profile IS NULL AND
- feed_url = '".db_escape_string($feed)."' AND
- (ttrss_feeds.update_interval > 0 OR
- ttrss_user_prefs.value != '-1')
+ feed_url = '".db_escape_string($feed)."'
+ $update_limit_qpart
$login_thresh_qpart
ORDER BY ttrss_feeds.id $query_limit");
while ($tline = db_fetch_assoc($tmp_result)) {
if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
+ if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
+ array_push($batch_owners, $tline["owner_uid"]);
+
$fstarted = microtime(true);
$rss = update_rss_feed($tline["id"], true, false);
_debug_suppress(false);
microtime(true) - $bstarted, (microtime(true) - $bstarted) / $nf));
}
+ foreach ($batch_owners as $owner_uid) {
+ _debug("Running housekeeping tasks for user $owner_uid...");
+
+ housekeeping_user($owner_uid);
+ }
+
require_once "digest.php";
// Send feed digests by email if needed.
$feed = db_escape_string($feed);
- $result = db_query("SELECT feed_url,auth_pass,auth_pass_encrypted
+ $result = db_query("SELECT feed_url,auth_pass,auth_login,auth_pass_encrypted
FROM ttrss_feeds WHERE id = '$feed'");
$auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result,
feed_url,auth_pass,cache_images,
mark_unread_on_update, owner_uid,
pubsub_state, auth_pass_encrypted,
- feed_language,
- (SELECT max(date_entered) FROM
- ttrss_entries, ttrss_user_entries where ref_id = id AND feed_id = '$feed') AS last_article_timestamp
+ feed_language
FROM ttrss_feeds WHERE id = '$feed'");
if (db_num_rows($result) == 0) {
_debug("feed $feed NOT FOUND/SKIPPED", $debug_enabled);
+ user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
return false;
}
- $last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp"));
-
- if (defined('_DISABLE_HTTP_304'))
- $last_article_timestamp = 0;
-
$owner_uid = db_fetch_result($result, 0, "owner_uid");
$mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
0, "mark_unread_on_update"));
$rss_hash = false;
$force_refetch = isset($_REQUEST["force_refetch"]);
+ $feed_data = "";
foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
- $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass);
+ $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
}
// try cache
// fetch feed from source
if (!$feed_data) {
_debug("fetching [$fetch_url]...", $debug_enabled);
- _debug("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $last_article_timestamp), $debug_enabled);
+
+ if (ini_get("open_basedir") && function_exists("curl_init")) {
+ _debug("not using CURL due to open_basedir restrictions");
+ }
$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 : $last_article_timestamp);
+ 0);
global $fetch_curl_used;
if ($_REQUEST["xdebug"] == 2) {
print "content: ";
- print $entry_content;
+ print htmlspecialchars($entry_content);
print "\n";
}
$entry_stored_hash = db_fetch_result($result, 0, "content_hash");
$article_labels = get_article_labels($base_entry_id, $owner_uid);
$entry_language = db_fetch_result($result, 0, "lang");
+
+ $existing_tags = get_article_tags($base_entry_id, $owner_uid);
+ $entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
+
} else {
$base_entry_id = false;
$entry_stored_hash = "";
"language" => $entry_language,
"feed" => array("id" => $feed,
"fetch_url" => $fetch_url,
- "site_url" => $site_url)
+ "site_url" => $site_url,
+ "cache_images" => $cache_images)
);
$entry_plugin_data = "";
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);
$entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
}
+ if ($_REQUEST["xdebug"] == 2) {
+ print "processed content: ";
+ print htmlspecialchars($article["content"]);
+ print "\n";
+ }
+
$entry_plugin_data = db_escape_string($entry_plugin_data);
_debug("plugin data: $entry_plugin_data", $debug_enabled);
foreach ($article as $k => $v) {
// i guess we'll have to take the risk of 4byte unicode labels & tags here
- if (!is_array($article[$k])) {
+ if (is_string($article[$k])) {
$article[$k] = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $v);
}
}
/* Collect article tags here so we could filter by them: */
+ $matched_rules = array();
+
$article_filters = get_article_filters($filters, $article["title"],
$article["content"], $article["link"], 0, $article["author"],
- $article["tags"]);
+ $article["tags"], $matched_rules);
if ($debug_enabled) {
- _debug("article filters: ", $debug_enabled);
+ _debug("matched filter rules: ", $debug_enabled);
+
+ if (count($matched_rules) != 0) {
+ print_r($matched_rules);
+ }
+
+ _debug("filter actions: ", $debug_enabled);
+
if (count($article_filters) != 0) {
print_r($article_filters);
}
if ($debug_enabled) {
_debug("article labels:", $debug_enabled);
- print_r($article_labels);
+
+ if (count($article_labels) != 0) {
+ print_r($article_labels);
+ }
}
_debug("force catchup: $entry_force_catchup");
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;
_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";
SET score = '$score' WHERE ref_id = '$ref_id'");
if ($mark_unread_on_update) {
+ _debug("article updated, marking unread as requested.", $debug_enabled);
+
db_query("UPDATE ttrss_user_entries
SET last_read = null, unread = true WHERE ref_id = '$ref_id'");
}
return $params;
}
- function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags) {
+ function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags, &$matched_rules = false) {
$matches = array();
foreach ($filters as $filter) {
if ($inverse) $filter_match = !$filter_match;
if ($filter_match) {
+ if (is_array($matched_rules)) array_push($matched_rules, $rule);
+
foreach ($filter["actions"] AS $action) {
array_push($matches, $action);
_debug("Removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
}
+ function housekeeping_user($owner_uid) {
+ $tmph = new PluginHost();
+
+ load_user_plugins($owner_uid, $tmph);
+
+ $tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
+ }
+
function housekeeping_common($debug) {
expire_cached_files($debug);
expire_lock_files($debug);
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", "");
-
}
?>
git.wh0rd.org / tt-rss.git / blobdiff