From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 3 Dec 2017 20:08:04 +0000 (+0300)
Subject: fix some minor issues found by code analyzer
X-Git-Tag: 18.8~136
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7c6f7bb0aa50f42fd697fbe82dc9b8b5931a3a52;p=tt-rss.git

fix some minor issues found by code analyzer
---

diff --git a/classes/db/mysqli.php b/classes/db/mysqli.php
index 817b48c0..a05b121f 100644
--- a/classes/db/mysqli.php
+++ b/classes/db/mysqli.php
@@ -65,7 +65,7 @@ class Db_Mysqli implements IDb {
 	}
 
 	function last_error() {
-		return mysqli_error();
+		return mysqli_error($this->link);
 	}
 
 	function last_query_error() {
diff --git a/classes/db/prefs.php b/classes/db/prefs.php
index e704a135..64238bc7 100644
--- a/classes/db/prefs.php
+++ b/classes/db/prefs.php
@@ -118,12 +118,6 @@ class Db_Prefs {
 			$user_id = sprintf("%d", $user_id);
 		}
 
-		if ($profile) {
-			$profile_qpart = "AND profile = '$profile'";
-		} else {
-			$profile_qpart = "AND profile IS NULL";
-		}
-
 		if (!$profile || get_schema_version() < 63) $profile = null;
 
 		$type_name = "";
diff --git a/classes/feeds.php b/classes/feeds.php
index b52b580f..983a8551 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -64,7 +64,7 @@ class Feeds extends Handler_Protected {
 
 			$target = "target=\"_blank\"";
 			$reply .= "<a title=\"$last_updated\" $target href=\"$feed_site_url\">".
-				truncate_string($feed_title, 30)."</a>";
+				truncate_string(strip_tags($feed_title), 30)."</a>";
 
 			if ($error) {
 				$error = htmlspecialchars($error);
@@ -72,7 +72,7 @@ class Feeds extends Handler_Protected {
 			}
 
 		} else {
-			$reply .= $feed_title;
+			$reply .= strip_tags($feed_title);
 		}
 
 		$reply .= "</span>";
@@ -440,11 +440,8 @@ class Feeds extends Handler_Protected {
                 if ($vfeed_group_enabled) {
                     if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
 
-                        $cur_feed_title = $line["feed_title"];
                         $vgroup_last_feed = $feed_id;
 
-                        $cur_feed_title = htmlspecialchars($cur_feed_title);
-
                         $vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
 
                         $reply['content'] .= "<div data-feed-id='$feed_id' id='FTITLE-$feed_id' class='cdmFeedTitle'>".
@@ -572,7 +569,7 @@ class Feeds extends Handler_Protected {
 
                 $tmp_content .= "</div>";
 
-                if ($highlight_words && count($highlight_words > 0)) {
+                if ($highlight_words && count($highlight_words) > 0) {
                     foreach ($highlight_words as $word) {
                         $line["title"] = preg_replace("/(\Q$word\E)/i",
                             "<span class=\"highlight\">$1</span>", $line["title"]);
@@ -1540,13 +1537,7 @@ class Feeds extends Handler_Protected {
 			$url = key($feedUrls);
 		}
 
-		if ($cat_id == "0" || !$cat_id) {
-			$cat_qpart = "NULL";
-		} else {
-			$cat_qpart = "'$cat_id'";
-		}
-
-		if (!(int)$cat_id) $cat_id = null;
+		if (!$cat_id) $cat_id = null;
 
 		$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
 			WHERE feed_url = ? AND owner_uid = ?");
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index f07e2bbf..f9d5bc29 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -279,8 +279,6 @@ class PluginHost {
 		} else {
 			return false;
 		}
-
-		return false;
 	}
 
 	function get_commands() {
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 5b7e52ac..05f6b8c8 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1212,24 +1212,6 @@ class Pref_Feeds extends Handler_Protected {
 		print $error_button;
 		print $inactive_button;
 
-		if (defined('_ENABLE_FEED_DEBUGGING')) {
-
-			print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
-				<option value=\"facDefault\" selected>".__('More actions...')."</option>";
-
-			if (FORCE_ARTICLE_PURGE == 0) {
-				print
-					"<option value=\"facPurge\">".__('Manual purge')."</option>";
-			}
-
-			print "
-				<option value=\"facClear\">".__('Clear feed data')."</option>
-				<option value=\"facRescore\">".__('Rescore articles')."</option>";
-
-			print "</select>";
-
-		}
-
 		print "</div>"; # toolbar
 
 		//print '</div>';
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index e1c2e776..1ff9a372 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -762,12 +762,6 @@ class Pref_Filters extends Handler_Protected {
 
 	function index() {
 
-		$sort = $_REQUEST["sort"];
-
-		if (!$sort || $sort == "undefined") {
-			$sort = "reg_exp";
-		}
-
 		$filter_search = $_REQUEST["search"];
 
 		if (array_key_exists("search", $_REQUEST)) {
@@ -780,8 +774,6 @@ class Pref_Filters extends Handler_Protected {
 		print "<div id=\"pref-filter-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">";
 		print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-		$filter_search = $_REQUEST["search"];
-
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_filter_search"] = $filter_search;
 		} else {
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 03563d8b..5d999bf3 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -99,7 +99,6 @@ class Pref_Prefs extends Handler_Protected {
 
 		foreach (array_keys($_POST) as $pref_name) {
 
-			$pref_name = $pref_name;
 			$value = $_POST[$pref_name];
 
 			if ($pref_name == 'DIGEST_PREFERRED_TIME') {
diff --git a/classes/rssutils.php b/classes/rssutils.php
index c9e6bc0e..bd599147 100644
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -492,8 +492,6 @@ class RSSUtils {
 		$rss = new FeedParser($feed_data);
 		$rss->init();
 
-		$feed = $feed;
-
 		if (!$rss->error()) {
 
 			// We use local pluginhost here because we need to load different per-user feed plugins