From 7b55001eeeb326323d020dcfac2f864f8c3ad633 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 26 Apr 2017 15:29:22 +0300 Subject: fix various issues reported by static analysis update gitlab-ci config --- include/errorhandler.php | 3 - include/functions.php | 5 +- include/functions2.php | 9 ++- include/rssfuncs.php | 167 ++++++++++++++++++++--------------------------- include/sanity_check.php | 6 +- include/sessions.php | 11 +++- 6 files changed, 90 insertions(+), 111 deletions(-) (limited to 'include') diff --git a/include/errorhandler.php b/include/errorhandler.php index f757b68d1..bb2fbaee3 100644 --- a/include/errorhandler.php +++ b/include/errorhandler.php @@ -32,8 +32,6 @@ function format_backtrace($trace) { } function ttrss_error_handler($errno, $errstr, $file, $line, $context) { - global $logger; - if (error_reporting() == 0 || !$errno) return false; $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1); @@ -46,7 +44,6 @@ function ttrss_error_handler($errno, $errstr, $file, $line, $context) { } function ttrss_fatal_handler() { - global $logger; global $last_query; $error = error_get_last(); diff --git a/include/functions.php b/include/functions.php index 526750574..baeaa03ab 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1163,7 +1163,7 @@ } } - function catchup_feed($feed, $cat_view, $owner_uid = false, $max_id = false, $mode = 'all', $search = false) { + function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) { if (!$owner_uid) $owner_uid = $_SESSION['uid']; @@ -1746,7 +1746,6 @@ global $fetch_last_error; global $fetch_last_error_content; - global $fetch_last_error_code; require_once "include/rssfuncs.php"; @@ -2066,5 +2065,3 @@ // TODO: less dumb splitting require_once "functions2.php"; - -?> diff --git a/include/functions2.php b/include/functions2.php index 844693654..f9ee8245f 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -1557,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); @@ -1655,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 { @@ -1675,7 +1675,7 @@ } } - function format_article_labels($labels, $id) { + function format_article_labels($labels) { if (!is_array($labels)) return ''; @@ -2484,6 +2484,9 @@ return false; } + /** + * @SuppressWarnings(unused) + */ function error_json($code) { require_once "errors.php"; diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 1eea3df3a..645d06f89 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -60,20 +60,7 @@ } - - /** - * Update a feed batch. - * Used by daemons to update n feeds by run. - * Only update feed needing a update, and not being processed - * by another process. - * - * @param mixed $link Database link - * @param integer $limit Maximum number of feeds in update batch. Default to DAEMON_FEED_LIMIT. - * @param boolean $from_http Set to true if you call this function from http to disable cli specific code. - * @param boolean $debug Set to false to disable debug output. Default to true. - * @return void - */ - function update_daemon_common($limit = DAEMON_FEED_LIMIT, $from_http = false, $debug = true) { + function update_daemon_common($limit = DAEMON_FEED_LIMIT, $debug = true) { // Process all other feeds using last_updated and interval parameters $schema_version = get_schema_version(); @@ -200,8 +187,6 @@ ORDER BY ttrss_feeds.id $query_limit"); if (db_num_rows($tmp_result) > 0) { - $rss = false; - while ($tline = db_fetch_assoc($tmp_result)) { if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]); @@ -209,7 +194,7 @@ array_push($batch_owners, $tline["owner_uid"]); $fstarted = microtime(true); - $rss = update_rss_feed($tline["id"], true, false); + update_rss_feed($tline["id"], true, false); _debug_suppress(false); _debug(sprintf(" %.4f (sec)", microtime(true) - $fstarted)); @@ -237,7 +222,7 @@ return $nf; - } // function update_daemon_common + } // this is used when subscribing function set_basic_feed_info($feed) { @@ -300,8 +285,10 @@ } } - // ignore_daemon is not used - function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false, $rss = false) { + /** + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + function update_rss_feed($feed, $no_cache = false) { $debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']; @@ -370,94 +357,90 @@ $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); $pluginhost->load_data(); - if ($rss && is_object($rss) && get_class($rss) == "FeedParser") { - _debug("using previously initialized parser object"); - } else { - $rss_hash = false; + $rss_hash = false; - $force_refetch = isset($_REQUEST["force_refetch"]); - $feed_data = ""; + $force_refetch = isset($_REQUEST["force_refetch"]); + $feed_data = ""; - foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) { - $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass); - } - - // try cache - if (!$feed_data && - file_exists($cache_filename) && - is_readable($cache_filename) && - !$auth_login && !$auth_pass && - filemtime($cache_filename) > time() - 30) { + foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) { + $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass); + } - _debug("using local cache [$cache_filename].", $debug_enabled); + // try cache + if (!$feed_data && + file_exists($cache_filename) && + is_readable($cache_filename) && + !$auth_login && !$auth_pass && + filemtime($cache_filename) > time() - 30) { - @$feed_data = file_get_contents($cache_filename); + _debug("using local cache [$cache_filename].", $debug_enabled); - if ($feed_data) { - $rss_hash = sha1($feed_data); - } + @$feed_data = file_get_contents($cache_filename); - } else { - _debug("local cache will not be used for this feed", $debug_enabled); + if ($feed_data) { + $rss_hash = sha1($feed_data); } - // fetch feed from source - if (!$feed_data) { - _debug("fetching [$fetch_url]...", $debug_enabled); + } else { + _debug("local cache will not be used for this feed", $debug_enabled); + } - if (ini_get("open_basedir") && function_exists("curl_init")) { - _debug("not using CURL due to open_basedir restrictions"); - } + // fetch feed from source + if (!$feed_data) { + _debug("fetching [$fetch_url]...", $debug_enabled); - $feed_data = fetch_file_contents($fetch_url, false, - $auth_login, $auth_pass, false, - $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT, - 0); + if (ini_get("open_basedir") && function_exists("curl_init")) { + _debug("not using CURL due to open_basedir restrictions"); + } - global $fetch_curl_used; + $feed_data = fetch_file_contents($fetch_url, false, + $auth_login, $auth_pass, false, + $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT, + 0); - if (!$fetch_curl_used) { - $tmp = @gzdecode($feed_data); + global $fetch_curl_used; - if ($tmp) $feed_data = $tmp; - } + if (!$fetch_curl_used) { + $tmp = @gzdecode($feed_data); - $feed_data = trim($feed_data); + if ($tmp) $feed_data = $tmp; + } - _debug("fetch done.", $debug_enabled); + $feed_data = trim($feed_data); - // cache vanilla feed data for re-use - if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) { - $new_rss_hash = sha1($feed_data); + _debug("fetch done.", $debug_enabled); - if ($new_rss_hash != $rss_hash) { - _debug("saving $cache_filename", $debug_enabled); - @file_put_contents($cache_filename, $feed_data); - } + // cache vanilla feed data for re-use + if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) { + $new_rss_hash = sha1($feed_data); + + if ($new_rss_hash != $rss_hash) { + _debug("saving $cache_filename", $debug_enabled); + @file_put_contents($cache_filename, $feed_data); } } + } - if (!$feed_data) { - global $fetch_last_error; - global $fetch_last_error_code; + if (!$feed_data) { + global $fetch_last_error; + global $fetch_last_error_code; - _debug("unable to fetch: $fetch_last_error [$fetch_last_error_code]", $debug_enabled); + _debug("unable to fetch: $fetch_last_error [$fetch_last_error_code]", $debug_enabled); - $error_escaped = ''; + $error_escaped = ''; - // If-Modified-Since - if ($fetch_last_error_code != 304) { - $error_escaped = db_escape_string($fetch_last_error); - } else { - _debug("source claims data not modified, nothing to do.", $debug_enabled); - } + // If-Modified-Since + if ($fetch_last_error_code != 304) { + $error_escaped = db_escape_string($fetch_last_error); + } else { + _debug("source claims data not modified, nothing to do.", $debug_enabled); + } - db_query( - "UPDATE ttrss_feeds SET last_error = '$error_escaped', - last_updated = NOW() WHERE id = '$feed'"); + db_query( + "UPDATE ttrss_feeds SET last_error = '$error_escaped', + last_updated = NOW() WHERE id = '$feed'"); - return; - } + return; } foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) { @@ -797,7 +780,7 @@ $matched_rules = array(); $article_filters = get_article_filters($filters, $article["title"], - $article["content"], $article["link"], 0, $article["author"], + $article["content"], $article["link"], $article["author"], $article["tags"], $matched_rules); if ($debug_enabled) { @@ -1224,11 +1207,12 @@ last_updated = NOW() WHERE id = '$feed'"); unset($rss); + return; } _debug("done", $debug_enabled); - return $rss; + return true; } function cache_enclosures($enclosures, $site_url, $debug) { @@ -1369,7 +1353,7 @@ return $params; } - function get_article_filters($filters, $title, $content, $link, $timestamp, $author, $tags, &$matched_rules = false) { + function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false) { $matches = array(); foreach ($filters as $filter) { @@ -1505,15 +1489,6 @@ mb_strtolower(strip_tags($title), 'utf-8')); } - /* function verify_feed_xml($feed_data) { - libxml_use_internal_errors(true); - $doc = new DOMDocument(); - $doc->loadXML($feed_data); - $error = libxml_get_last_error(); - libxml_clear_errors(); - return $error; - } */ - function cleanup_counters_cache($debug) { $result = db_query("DELETE FROM ttrss_counters_cache WHERE feed_id > 0 AND @@ -1529,7 +1504,7 @@ ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid) = 0"); $crows = db_affected_rows($result); - _debug("Removed $frows (feeds) $crows (cats) orphaned counter cache entries."); + if ($debug) _debug("Removed $frows (feeds) $crows (cats) orphaned counter cache entries."); } function housekeeping_user($owner_uid) { diff --git a/include/sanity_check.php b/include/sanity_check.php index f1181f88c..3b3e281ec 100755 --- a/include/sanity_check.php +++ b/include/sanity_check.php @@ -1,6 +1,5 @@ query("DELETE FROM ttrss_sessions WHERE expire < " . time()); -- cgit v1.2.3