remove simplepie

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index f4f9fa53c60a437343adeb357f8eb37a81eee5a1..2291546968336a06c9270b16529c2d90fad7b636 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -193,8 +193,6 @@
        function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false,
                $override_url = false) {
 
-               require_once "lib/simplepie/simplepie.inc";
-
                $debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug'];
 
                _debug("start", $debug_enabled);
@@ -212,6 +210,10 @@
                        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");
@@ -241,7 +243,7 @@
 
                $date_feed_processed = date('Y-m-d H:i');
 
-               $cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".feed";
+               $cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".feed2";
 
                // Ignore cache if new feed or manual update.
                $cache_age = ($no_cache || is_null($last_updated) || strpos($last_updated, '1970-01-01') === 0) ? 30 : get_feed_update_interval($feed) * 60;
@@ -265,11 +267,10 @@
                                _debug("using local cache.", $debug_enabled);
 
                                if ($cache_timestamp > $last_article_timestamp) {
-                                       @$rss_data = file_get_contents($cache_filename);
+                                       @$feed_data = file_get_contents($cache_filename);
 
-                                       if ($rss_data) {
-                                               $rss_hash = sha1($rss_data);
-                                               @$rss = unserialize($rss_data);
+                                       if ($feed_data) {
+                                               $rss_hash = sha1($feed_data);
                                        }
                                } else if (!$force_refetch) {
                                        _debug("local cache valid and older than last_updated, nothing to do.", $debug_enabled);
@@ -357,16 +358,8 @@
                }
 
                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();
+                       $rss = new FeedParser($feed_data);
+                       $rss->init();
                }
 
 //             print_r($rss);
@@ -377,12 +370,11 @@
 
                        // 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 ($new_rss_hash != $rss_hash && count($rss->get_items()) > 0 ) {
                                        _debug("saving $cache_filename", $debug_enabled);
-                                       @file_put_contents($cache_filename, serialize($rss));
+                                       @file_put_contents($cache_filename, $feed_data);
                                }
                        }
 
@@ -414,6 +406,9 @@
 
                        $site_url = db_escape_string(mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
 
+                       _debug("site_url: $site_url", $debug_enabled);
+                       _debug("feed_title: " . $rss->get_title(), $debug_enabled);
+
                        if ($favicon_needs_check || $force_refetch) {
 
                                /* terrible hack: if we crash on floicon shit here, we won't check
@@ -529,6 +524,8 @@
                                if (!$entry_guid) $entry_guid = $item->get_link();
                                if (!$entry_guid) $entry_guid = make_guid_from_title($item->get_title());
 
+                               _debug("f_guid $entry_guid", $debug_enabled);
+
                                if (!$entry_guid) continue;
 
                                $entry_guid = "$owner_uid,$entry_guid";
@@ -539,7 +536,9 @@
 
                                $entry_timestamp = "";
 
-                               $entry_timestamp = strtotime($item->get_date());
+                               $entry_timestamp = $item->get_date();
+
+                               _debug("orig date: " . $item->get_date(), $debug_enabled);
 
                                if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
                                        $entry_timestamp = time();
@@ -552,7 +551,9 @@
 
                                _debug("date $entry_timestamp [$entry_timestamp_fmt]", $debug_enabled);
 
-                               $entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
+//                             $entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
+//                             $entry_title = decode_numeric_entities($entry_title);
+                               $entry_title = $item->get_title();
 
                                $entry_link = rewrite_relative_url($site_url, $item->get_link());
 
@@ -570,20 +571,15 @@
                                        print "\n";
                                }
 
-                               $entry_comments = $item->data["comments"];
-
-                               if ($item->get_author()) {
-                                       $entry_author_item = $item->get_author();
-                                       $entry_author = $entry_author_item->get_name();
-                                       if (!$entry_author) $entry_author = $entry_author_item->get_email();
-                               }
+                               $entry_comments = $item->get_comments_url();
+                               $entry_author = $item->get_author();
 
                                $entry_guid = db_escape_string(mb_substr($entry_guid, 0, 245));
 
                                $entry_comments = db_escape_string(mb_substr(trim($entry_comments), 0, 245));
                                $entry_author = db_escape_string(mb_substr(trim($entry_author), 0, 245));
 
-                               $num_comments = $item->get_item_tags('http://purl.org/rss/1.0/modules/slash/', 'comments');
+                               $num_comments = $item->get_comments_count();
 
                                if (is_array($num_comments) && is_array($num_comments[0])) {
                                        $num_comments = (int) $num_comments[0]["data"];
@@ -603,7 +599,7 @@
 
                                if (is_array($additional_tags_src)) {
                                        foreach ($additional_tags_src as $tobj) {
-                                               array_push($additional_tags, $tobj->get_term());
+                                               array_push($additional_tags, $tobj);
                                        }
                                }
 
@@ -1242,7 +1238,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)