remove obsolete stuff from utils/

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 838087d9055e46aa8b663d3ff076261dd26fe609..84a24e2f00b26cceb69d8fc5c7a66ea37faec25d 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -81,7 +81,8 @@
                                ) OR (
                                        ttrss_feeds.update_interval > 0
                                        AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
-                               ) OR ttrss_feeds.last_updated IS NULL)";
+                               ) OR ttrss_feeds.last_updated IS NULL
+                               OR last_updated = '1970-01-01 00:00:00')";
                } else {
                        $update_limit_qpart = "AND ((
                                        ttrss_feeds.update_interval = 0
@@ -89,7 +90,8 @@
                                ) OR (
                                        ttrss_feeds.update_interval > 0
                                        AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
-                               ) OR ttrss_feeds.last_updated IS NULL)";
+                               ) OR ttrss_feeds.last_updated IS NULL
+                               OR last_updated = '1970-01-01 00:00:00')";
                }
 
                // Test if feed is currently being updated by another process.
@@ -254,7 +256,7 @@
                                }
 
                        $result = db_query($link, "SELECT id,update_interval,auth_login,
-                               auth_pass,cache_images,update_method
+                               auth_pass,cache_images,update_method,last_updated
                                FROM ttrss_feeds WHERE id = '$feed' AND $updstart_thresh_qpart");
 
                } else {
@@ -310,12 +312,9 @@
                        $auth_pass = urlencode($auth_pass);
                }
 
-               $update_interval = db_fetch_result($result, 0, "update_interval");
                $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
                $fetch_url = db_fetch_result($result, 0, "feed_url");
 
-               if ($update_interval < 0) { return false; }
-
                $feed = db_escape_string($feed);
 
                if ($auth_login && $auth_pass ){
@@ -347,11 +346,15 @@
 
                } else {
 
+                       // Ignore cache if new feed or manual update.
+                       $cache_age = (is_null($last_updated) || $last_updated == '1970-01-01 00:00:00') ?
+                               -1 : get_feed_update_interval($link, $feed) * 60;
+
                        if ($update_method == 3) {
                                $rss = fetch_twitter_rss($link, $fetch_url, $owner_uid);
                        } else if ($update_method == 1) {
 
-                               define('MAGPIE_CACHE_AGE', get_feed_update_interval($link, $feed) * 60);
+                               define('MAGPIE_CACHE_AGE', $cache_age);
                                define('MAGPIE_CACHE_ON', !$no_cache);
                                define('MAGPIE_FETCH_TIME_OUT', 60);
                                define('MAGPIE_CACHE_DIR', CACHE_DIR . "/magpie");
@@ -380,7 +383,7 @@
 
                                if (!$no_cache) {
                                        $rss->set_cache_location($simplepie_cache_dir);
-                                       $rss->set_cache_duration(get_feed_update_interval($link, $feed) * 60);
+                                       $rss->set_cache_duration($cache_age);
                                }
 
                                $rss->init();
@@ -662,7 +665,7 @@
                                        $entry_content = $item["content:escaped"];
 
                                        if (!$entry_content) $entry_content = $item["content:encoded"];
-                                       if (!$entry_content) $entry_content = $item["content"]["encoded"];
+                                       if (!$entry_content && is_array($entry_content)) $entry_content = $item["content"]["encoded"];
                                        if (!$entry_content) $entry_content = $item["content"];
 
                                        if (is_array($entry_content)) $entry_content = $entry_content[0];
@@ -1369,14 +1372,15 @@
                        if (is_writable($cache_dir)) {
                                $files = glob("$cache_dir/*");
 
-                               foreach ($files as $file) {
-                                       if (time() - filemtime($file) > 86400*7) {
-                                               unlink($file);
+                               if ($files)
+                                       foreach ($files as $file) {
+                                               if (time() - filemtime($file) > 86400*7) {
+                                                       unlink($file);
 
-                                               ++$num_deleted;
+                                                       ++$num_deleted;
+                                               }
                                        }
                                }
-                       }
 
                        if ($debug) _debug("Removed $num_deleted files.");
                }