Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index dbe76d2d377c2103f509b4d8b7a4a39f71a8ecf9..08bf1fe6dbb217751f7da0bfb388bcc614d06ad7 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -202,7 +202,9 @@
                $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) {
@@ -210,7 +212,12 @@
                        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"));
@@ -251,7 +258,6 @@
                $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"]);
 
@@ -262,7 +268,7 @@
 
                                _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) {
@@ -275,18 +281,18 @@
                                }
                } 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;
 
@@ -551,6 +557,7 @@
                                _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());
 
@@ -1240,7 +1247,7 @@
 
                        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)
@@ -1269,8 +1276,12 @@
                                        $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;
                                }
 
@@ -1382,4 +1393,15 @@
 
                _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;
+       }
 ?>