fix various issues reported by static analysis

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

diff --git a/include/functions2.php b/include/functions2.php
index 39c7f746b6e0b01d8eb84b46826333b3474c2b75..f9ee8245f2bfd4df85eae76532420ea5836bfc82 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -909,23 +909,29 @@
 
                        if ($entry->hasAttribute('src')) {
                                $src = rewrite_relative_url($rewrite_base_url, $entry->getAttribute('src'));
+                               $cached_filename = CACHE_DIR . '/images/' . sha1($src);
 
-                               // check cache only for video and images for the time being
-                               if ($entry->nodeName == 'img' || ($entry->parentNode && $entry->parentNode->nodeName == "video")) {
+                               if (file_exists($cached_filename)) {
 
-                                       $cached_filename = CACHE_DIR . '/images/' . sha1($src);
-                                       $extension = $entry->tagName == 'source' ? '.mp4' : '.png';
+                                       // this is strictly cosmetic
+                                       if ($entry->tagName == 'img') {
+                                               $suffix = ".png";
+                                       } else if ($entry->parentNode && $entry->parentNode->tagName == "video") {
+                                               $suffix = ".mp4";
+                                       } else if ($entry->parentNode && $entry->parentNode->tagName == "audio") {
+                                               $suffix = ".ogg";
+                                       } else {
+                                               $suffix = "";
+                                       }
 
-                                       if (file_exists($cached_filename)) {
-                                               $src = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($src) . $extension;
+                                       $src = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($src) . $suffix;
 
-                                               if ($entry->hasAttribute('srcset')) {
-                                                       $entry->removeAttribute('srcset');
-                                               }
+                                       if ($entry->hasAttribute('srcset')) {
+                                               $entry->removeAttribute('srcset');
+                                       }
 
-                                               if ($entry->hasAttribute('sizes')) {
-                                                       $entry->removeAttribute('sizes');
-                                               }
+                                       if ($entry->hasAttribute('sizes')) {
+                                               $entry->removeAttribute('sizes');
                                        }
                                }
 
@@ -1551,7 +1557,7 @@
                }
        } // function encrypt_password
 
-       function load_filters($feed_id, $owner_uid, $action_id = false) {
+       function load_filters($feed_id, $owner_uid) {
                $filters = array();
 
                $cat_id = (int)getFeedCategory($feed_id);
@@ -1649,7 +1655,7 @@
                return true;
        }
 
-       function format_tags_string($tags, $id) {
+       function format_tags_string($tags) {
                if (!is_array($tags) || count($tags) == 0) {
                        return __("no tags");
                } else {
@@ -1669,7 +1675,7 @@
                }
        }
 
-       function format_article_labels($labels, $id) {
+       function format_article_labels($labels) {
 
                if (!is_array($labels)) return '';
 
@@ -1822,6 +1828,11 @@
 
                if (db_num_rows($result) > 0) {
                        while ($line = db_fetch_assoc($result)) {
+
+                               if (file_exists(CACHE_DIR . '/images/' . sha1($line["content_url"]))) {
+                                       $line["content_url"] = get_self_url_prefix() . '/public.php?op=cached_url&hash=' . sha1($line["content_url"]);
+                               }
+
                                array_push($rv, $line);
                        }
                }
@@ -2001,8 +2012,7 @@
                                                        $rv .= $retval;
                                                } else {
 
-                                                       if (preg_match("/image/", $entry["type"]) ||
-                                                                       preg_match("/\.(jpe?g|png|gif|bmp)/i", $entry["filename"])) {
+                                                       if (preg_match("/image/", $entry["type"])) {
 
                                                                        if (!$hide_images) {
                                                                                $encsize = '';
@@ -2474,6 +2484,9 @@
                return false;
        }
 
+       /**
+        * @SuppressWarnings(unused)
+        */
        function error_json($code) {
                require_once "errors.php";