get_article_tags: while getting tags from cache check if article entry actually exists

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

diff --git a/include/functions2.php b/include/functions2.php
index 779688716749c442a7588d7bb08e0bee99efe1ef..92ed3f340bccf5ae6732c166d64929ac3bda2367 100755 (executable)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -465,6 +465,7 @@
                $override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false;
                $start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false;
                $check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false;
+               $skip_first_id_check = isset($params["skip_first_id_check"]) ? $params["skip_first_id_check"] : false;
 
                $ext_tables_part = "";
                $query_strategy_part = "";
@@ -731,7 +732,7 @@
                                        $sanity_interval_qpart = "date_entered >= DATE_SUB(NOW(), INTERVAL 1 hour) AND";
                                }
 
-                               if (!$search) {
+                               if (!$search && !$skip_first_id_check) {
                                        // if previous topmost article id changed that means our current pagination is no longer valid
                                        $query = "SELECT DISTINCT
                                                        ttrss_feeds.title,
@@ -891,6 +892,8 @@
 
                $entries = $xpath->query('(//a[@href]|//img[@src])');
 
+               $ttrss_uses_https = parse_url(get_self_url_prefix(), PHP_URL_SCHEME) === 'https';
+
                foreach ($entries as $entry) {
 
                        if ($site_url) {
@@ -915,6 +918,21 @@
                                }
 
                                if ($entry->nodeName == 'img') {
+                                       if ($entry->hasAttribute('src')) {
+                                               $is_https_url = parse_url($entry->getAttribute('src'), PHP_URL_SCHEME) === 'https';
+
+                                               if ($ttrss_uses_https && !$is_https_url) {
+
+                                                       if ($entry->hasAttribute('srcset')) {
+                                                               $entry->removeAttribute('srcset');
+                                                       }
+
+                                                       if ($entry->hasAttribute('sizes')) {
+                                                               $entry->removeAttribute('sizes');
+                                                       }
+                                               }
+                                       }
+
                                        if (($owner && get_pref("STRIP_IMAGES", $owner)) ||
                                                        $force_remove_images || $_SESSION["bw_limit"]) {
 
@@ -1103,7 +1121,8 @@
                        $result = db_query("SELECT tag_cache FROM ttrss_user_entries
                                WHERE ref_id = '$id' AND owner_uid = $owner_uid");
 
-                       $tag_cache = db_fetch_result($result, 0, "tag_cache");
+                       if (db_num_rows($result) != 0)
+                               $tag_cache = db_fetch_result($result, 0, "tag_cache");
                }
 
                if ($tag_cache) {
@@ -1138,7 +1157,7 @@
 
        function tag_is_valid($tag) {
                if ($tag == '') return false;
-               if (preg_match("/^[0-9]*$/", $tag)) return false;
+               if (is_numeric($tag)) return false;
                if (mb_strlen($tag) > 250) return false;
 
                if (!$tag) return false;