fix schema for favicon_avg_color

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index ce197156c4603110d4c6c8d92f629fd16c5004ee..49870090615304338c84e48d84c5c70206a69866 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");
 
@@ -286,7 +293,7 @@
                                $force_refetch = isset($_REQUEST["force_refetch"]);
 
                                $feed_data = fetch_file_contents($fetch_url, false,
-                                       $auth_login, $auth_pass, 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));
 
@@ -401,9 +408,14 @@
                        }
 
                        if ($favicon_needs_check) {
-                               check_feed_favicon($site_url, $feed, $link);
-
-                               db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+                               $favicon_file = check_feed_favicon($site_url, $feed, $link);
+                if ($favicon_file) {
+                                   $favicon_color = calculate_avg_color($favicon_file);
+                    if (is_array($favicon_color))
+                        $favicon_colorstring = ",favicon_avg_color = '" . implode("|", array_slice($favicon_color, 0, 3)) . "'";
+                }
+                               
+                               db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring
                                        WHERE id = '$feed'");
                        }
 
@@ -524,7 +536,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());
 
@@ -1191,7 +1203,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");