fix some minor issues found by code analyzer

master
Andrew Dolgov 7 years ago
parent fa3bcfa379
commit 7c6f7bb0aa

@ -65,7 +65,7 @@ class Db_Mysqli implements IDb {
} }
function last_error() { function last_error() {
return mysqli_error(); return mysqli_error($this->link);
} }
function last_query_error() { function last_query_error() {

@ -118,12 +118,6 @@ class Db_Prefs {
$user_id = sprintf("%d", $user_id); $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; if (!$profile || get_schema_version() < 63) $profile = null;
$type_name = ""; $type_name = "";

@ -64,7 +64,7 @@ class Feeds extends Handler_Protected {
$target = "target=\"_blank\""; $target = "target=\"_blank\"";
$reply .= "<a title=\"$last_updated\" $target href=\"$feed_site_url\">". $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) { if ($error) {
$error = htmlspecialchars($error); $error = htmlspecialchars($error);
@ -72,7 +72,7 @@ class Feeds extends Handler_Protected {
} }
} else { } else {
$reply .= $feed_title; $reply .= strip_tags($feed_title);
} }
$reply .= "</span>"; $reply .= "</span>";
@ -440,11 +440,8 @@ class Feeds extends Handler_Protected {
if ($vfeed_group_enabled) { if ($vfeed_group_enabled) {
if ($feed_id != $vgroup_last_feed && $line["feed_title"]) { if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
$cur_feed_title = $line["feed_title"];
$vgroup_last_feed = $feed_id; $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>"; $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'>". $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>"; $tmp_content .= "</div>";
if ($highlight_words && count($highlight_words > 0)) { if ($highlight_words && count($highlight_words) > 0) {
foreach ($highlight_words as $word) { foreach ($highlight_words as $word) {
$line["title"] = preg_replace("/(\Q$word\E)/i", $line["title"] = preg_replace("/(\Q$word\E)/i",
"<span class=\"highlight\">$1</span>", $line["title"]); "<span class=\"highlight\">$1</span>", $line["title"]);
@ -1540,13 +1537,7 @@ class Feeds extends Handler_Protected {
$url = key($feedUrls); $url = key($feedUrls);
} }
if ($cat_id == "0" || !$cat_id) { if (!$cat_id) $cat_id = null;
$cat_qpart = "NULL";
} else {
$cat_qpart = "'$cat_id'";
}
if (!(int)$cat_id) $cat_id = null;
$sth = $pdo->prepare("SELECT id FROM ttrss_feeds $sth = $pdo->prepare("SELECT id FROM ttrss_feeds
WHERE feed_url = ? AND owner_uid = ?"); WHERE feed_url = ? AND owner_uid = ?");

@ -279,8 +279,6 @@ class PluginHost {
} else { } else {
return false; return false;
} }
return false;
} }
function get_commands() { function get_commands() {

@ -1212,24 +1212,6 @@ class Pref_Feeds extends Handler_Protected {
print $error_button; print $error_button;
print $inactive_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>"; # toolbar
//print '</div>'; //print '</div>';

@ -762,12 +762,6 @@ class Pref_Filters extends Handler_Protected {
function index() { function index() {
$sort = $_REQUEST["sort"];
if (!$sort || $sort == "undefined") {
$sort = "reg_exp";
}
$filter_search = $_REQUEST["search"]; $filter_search = $_REQUEST["search"];
if (array_key_exists("search", $_REQUEST)) { 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-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">";
print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">"; print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">";
$filter_search = $_REQUEST["search"];
if (array_key_exists("search", $_REQUEST)) { if (array_key_exists("search", $_REQUEST)) {
$_SESSION["prefs_filter_search"] = $filter_search; $_SESSION["prefs_filter_search"] = $filter_search;
} else { } else {

@ -99,7 +99,6 @@ class Pref_Prefs extends Handler_Protected {
foreach (array_keys($_POST) as $pref_name) { foreach (array_keys($_POST) as $pref_name) {
$pref_name = $pref_name;
$value = $_POST[$pref_name]; $value = $_POST[$pref_name];
if ($pref_name == 'DIGEST_PREFERRED_TIME') { if ($pref_name == 'DIGEST_PREFERRED_TIME') {

@ -492,8 +492,6 @@ class RSSUtils {
$rss = new FeedParser($feed_data); $rss = new FeedParser($feed_data);
$rss->init(); $rss->init();
$feed = $feed;
if (!$rss->error()) { if (!$rss->error()) {
// We use local pluginhost here because we need to load different per-user feed plugins // We use local pluginhost here because we need to load different per-user feed plugins

Loading…
Cancel
Save