$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, auth_pass_encrypted
+ pubsub_state, auth_pass_encrypted,
+ (SELECT max(date_entered) FROM
+ ttrss_entries, ttrss_user_entries where ref_id = id AND feed_id = '$feed') AS last_article_timestamp
FROM ttrss_feeds WHERE id = '$feed'");
if (db_num_rows($result) == 0) {
return false;
}
+ // set last update to now so if anything *simplepie* crashes later we won't be
+ // continuously failing on the same feed
+ db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'");
+
$last_updated = db_fetch_result($result, 0, "last_updated");
+ $last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp"));
$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"));
$cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".feed";
// 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;
+ $cache_age = ($no_cache || is_null($last_updated) || strpos($last_updated, '1970-01-01') === 0) ? 30 : get_feed_update_interval($feed) * 60;
_debug("cache filename: $cache_filename exists: " . file_exists($cache_filename), $debug_enabled);
_debug("cache age: $cache_age; no cache: $no_cache", $debug_enabled);
$rss = false;
$rss_hash = false;
$cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0;
- $last_updated_timestamp = strtotime($last_updated);
$force_refetch = isset($_REQUEST["force_refetch"]);
_debug("using local cache.", $debug_enabled);
- if ($cache_timestamp > $last_updated_timestamp) {
+ if ($cache_timestamp > $last_article_timestamp) {
@$rss_data = file_get_contents($cache_filename);
if ($rss_data) {
}
} else {
_debug("local cache will not be used for this feed", $debug_enabled);
- $cache_timestamp = 0;
}
if (!$rss) {
if (!$feed_data) {
- _debug("fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)", $debug_enabled);
+ _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);
$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));
+ $force_refetch ? 0 : $last_article_timestamp);
global $fetch_curl_used;
/* terrible hack: if we crash on floicon shit here, we won't check
* the icon avgcolor again (unless the icon got updated) */
- db_query("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
- id = '$feed'");
-
$favicon_file = ICONS_DIR . "/$feed.ico";
$favicon_modified = @filemtime($favicon_file);
if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
require_once "colors.php";
+ db_query("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
+ id = '$feed'");
+
$favicon_color = db_escape_string(
calculate_avg_color($favicon_file));
$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
} else if ($favicon_avg_color == 'fail') {
- _debug("floicon failed on this file, not trying to recalculate avg color");
+ _debug("floicon failed on this file, not trying to recalculate avg color", $debug_enabled);
}
db_query("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
_debug("date $entry_timestamp [$entry_timestamp_fmt]", $debug_enabled);
$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
+ $entry_title = decode_numeric_entities($entry_title);
$entry_link = rewrite_relative_url($site_url, $item->get_link());
foreach ($filter["rules"] as $rule) {
$match = false;
- $reg_exp = $rule["reg_exp"];
+ $reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
$rule_inverse = $rule["inverse"];
if (!$reg_exp)
$match = @preg_match("/$reg_exp/i", $author);
break;
case "tag":
- $tag_string = join(",", $tags);
- $match = @preg_match("/$reg_exp/i", $tag_string);
+ foreach ($tags as $tag) {
+ if (@preg_match("/$reg_exp/i", $tag)) {
+ $match = true;
+ break;
+ }
+ }
break;
}
_debug("Cleaned $rc cached tags.");
}
+
+ function utf8_entity_decode($entity){
+ $convmap = array(0x0, 0x10000, 0, 0xfffff);
+ return mb_decode_numericentity($entity, $convmap, 'UTF-8');
+ }
+
+ function decode_numeric_entities($body) {
+ $body = preg_replace('/&#\d{2,5};/ue', "utf8_entity_decode('$0')", $body );
+ $body = preg_replace('/&#x([a-fA-F0-7]{2,8});/ue', "utf8_entity_decode('&#'.hexdec('$1').';')", $body );
+ return $body;
+ }
?>