try to improve color guessing algorithm a bit

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 3bce14d33ab8786bd3b67bb8b7aa6a0a94fbbef8..0d55dce36bf513f7a3737626bb4a03e0dcbd518e 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -159,7 +159,7 @@
 
                        // since we have the data cached, we can deal with other feeds with the same url
 
-                       $tmp_result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id,last_updated
+                       $tmp_result = db_query($link, "SELECT DISTINCT ttrss_feeds.id,last_updated
                        FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
                                ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
                                ttrss_users.id = ttrss_user_prefs.owner_uid AND
@@ -168,7 +168,7 @@
                                (ttrss_feeds.update_interval > 0 OR
                                        ttrss_user_prefs.value != '-1')
                                $login_thresh_qpart
-                       ORDER BY feed_url $query_limit");
+                       ORDER BY ttrss_feeds.id $query_limit");
 
                        if (db_num_rows($tmp_result) > 0) {
                                while ($tline = db_fetch_assoc($tmp_result)) {
@@ -203,7 +203,7 @@
                $result = db_query($link, "SELECT id,update_interval,auth_login,
                        feed_url,auth_pass,cache_images,last_updated,
                        mark_unread_on_update, owner_uid,
-                       pubsub_state
+                       pubsub_state, auth_pass_encrypted
                        FROM ttrss_feeds WHERE id = '$feed'");
 
                if (db_num_rows($result) == 0) {
@@ -218,6 +218,8 @@
                $mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
                        0, "mark_unread_on_update"));
                $pubsub_state = db_fetch_result($result, 0, "pubsub_state");
+               $auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result,
+                       0, "auth_pass_encrypted"));
 
                db_query($link, "UPDATE ttrss_feeds SET last_update_started = NOW()
                        WHERE id = '$feed'");
@@ -225,6 +227,11 @@
                $auth_login = db_fetch_result($result, 0, "auth_login");
                $auth_pass = db_fetch_result($result, 0, "auth_pass");
 
+               if ($auth_pass_encrypted) {
+                       require_once "crypt.php";
+                       $auth_pass = decrypt_string($auth_pass);
+               }
+
                $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
                $fetch_url = db_fetch_result($result, 0, "feed_url");
 
@@ -252,6 +259,8 @@
                $cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0;
                $last_updated_timestamp = strtotime($last_updated);
 
+               $force_refetch = isset($_REQUEST["force_refetch"]);
+
                if (file_exists($cache_filename) &&
                        is_readable($cache_filename) &&
                        !$auth_login && !$auth_pass &&
@@ -268,7 +277,7 @@
                                                $rss_hash = sha1($rss_data);
                                                @$rss = unserialize($rss_data);
                                        }
-                               } else {
+                               } else if (!$force_refetch) {
                                        if ($debug_enabled) {
                                                _debug("update_rss_feed: local cache valid and older than last_updated, nothing to do.");
                                        }
@@ -284,8 +293,9 @@
                                }
 
                                $feed_data = fetch_file_contents($fetch_url, false,
-                                       $auth_login, $auth_pass, false, $no_cache ? 15 : 45,
-                                       max($last_updated_timestamp, $cache_timestamp));
+                                       $auth_login, $auth_pass, false,
+                                       $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
+                                       $force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp));
 
                                if ($debug_enabled) {
                                        _debug("update_rss_feed: fetch done.");
@@ -393,14 +403,24 @@
 
                        $site_url = db_escape_string($link, mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
 
-                       if ($debug_enabled) {
-                               _debug("update_rss_feed: checking favicon...");
-                       }
+                       if ($favicon_needs_check || $force_refetch) {
+                               if ($debug_enabled) {
+                                       _debug("update_rss_feed: checking favicon...");
+                               }
 
-                       if ($favicon_needs_check) {
                                check_feed_favicon($site_url, $feed, $link);
+                               $favicon_file = ICONS_DIR . "/$feed.ico";
+
+                               if (file_exists($favicon_file)) {
+                                                require_once "colors.php";
+
+                                                $favicon_color = db_escape_string($link,
+                                                        calculate_avg_color($favicon_file));
 
-                               db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+                                                $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
+                               }
+
+                               db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
                                        WHERE id = '$feed'");
                        }
 
@@ -521,7 +541,7 @@
                                        _debug("update_rss_feed: date $entry_timestamp [$entry_timestamp_fmt]");
                                }
 
-                               $entry_title = $item->get_title();
+                               $entry_title = html_entity_decode($item->get_title());
 
                                $entry_link = rewrite_relative_url($site_url, $item->get_link());
 
@@ -1188,7 +1208,7 @@
        }
 
        function expire_cached_files($debug) {
-               foreach (array("simplepie", "images", "export") as $dir) {
+               foreach (array("simplepie", "images", "export", "upload") as $dir) {
                        $cache_dir = CACHE_DIR . "/$dir";
 
                        if ($debug) _debug("Expiring $cache_dir");
@@ -1297,6 +1317,9 @@
                        if ($filter_match) {
                                foreach ($filter["actions"] AS $action) {
                                        array_push($matches, $action);
+
+                                       // if Stop action encountered, perform no further processing
+                                       if ($action["type"] == "stop") return $matches;
                                }
                        }
                }