From b5791f11c5d07b5903287cff4f06a1f959f316c4 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 1 Dec 2017 20:25:13 +0300 Subject: [PATCH] queryfeedheadlines: PDOize (1) --- classes/feeds.php | 798 +++++++++++++++++++++++----------------------- 1 file changed, 394 insertions(+), 404 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index 3ab3fc44e..bf5425e75 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -303,8 +303,6 @@ class Feeds extends Handler_Protected { $feed, $cat_view, $search, $last_error, $last_updated); - $headlines_count = is_numeric($result) ? 0 : db_num_rows($result); - if ($offset == 0) { foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINES_BEFORE) as $p) { $reply['content'] .= $p->hook_headlines_before($feed, $cat_view, $qfh_ret); @@ -313,522 +311,505 @@ class Feeds extends Handler_Protected { $reply['content'] = ''; - if ($headlines_count > 0) { + $headlines_count = 0; + + $lnum = $offset; + $num_unread = 0; + if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info); + $expand_cdm = get_pref('CDM_EXPANDED'); + + while ($line = $result->fetch()) { + + ++$headlines_count; + + $line["content_preview"] = "— " . truncate_string(strip_tags($line["content"]), 250); + + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { + $line = $p->hook_query_headlines($line, 250, false); + } + + if (get_pref('SHOW_CONTENT_PREVIEW')) { + $content_preview = $line["content_preview"]; + } + + $id = $line["id"]; + $feed_id = $line["feed_id"]; + $label_cache = $line["label_cache"]; + $labels = false; - $lnum = $offset; + if ($label_cache) { + $label_cache = json_decode($label_cache, true); - $num_unread = 0; + if ($label_cache) { + if ($label_cache["no-labels"] == 1) + $labels = array(); + else + $labels = $label_cache; + } + } - if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info); + if (!is_array($labels)) $labels = Article::get_article_labels($id); - $expand_cdm = get_pref('CDM_EXPANDED'); + $labels_str = ""; + $labels_str .= Article::format_article_labels($labels); + $labels_str .= ""; - while ($line = db_fetch_assoc($result)) { - - $line["content_preview"] = "— " . truncate_string(strip_tags($line["content"]), 250); + if (count($topmost_article_ids) < 3) { + array_push($topmost_article_ids, $id); + } - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) { - $line = $p->hook_query_headlines($line, 250, false); - } + $class = ""; - if (get_pref('SHOW_CONTENT_PREVIEW')) { - $content_preview = $line["content_preview"]; - } + if (sql_bool_to_bool($line["unread"])) { + $class .= " Unread"; + ++$num_unread; + } - $id = $line["id"]; - $feed_id = $line["feed_id"]; - $label_cache = $line["label_cache"]; - $labels = false; + if (sql_bool_to_bool($line["marked"])) { + $marked_pic = "\"Unstar"; + $class .= " marked"; + } else { + $marked_pic = "\"Star"; + } - if ($label_cache) { - $label_cache = json_decode($label_cache, true); + if (sql_bool_to_bool($line["published"])) { + $published_pic = "\"Unpublish"; + $class .= " published"; + } else { + $published_pic = "\"Publish"; + } - if ($label_cache) { - if ($label_cache["no-labels"] == 1) - $labels = array(); - else - $labels = $label_cache; - } - } + $updated_fmt = make_local_datetime($line["updated"], false, false, false, true); + $date_entered_fmt = T_sprintf("Imported at %s", + make_local_datetime($line["date_entered"], false)); - if (!is_array($labels)) $labels = Article::get_article_labels($id); + $score = $line["score"]; - $labels_str = ""; - $labels_str .= Article::format_article_labels($labels); - $labels_str .= ""; + $score_pic = "images/" . get_score_pic($score); - if (count($topmost_article_ids) < 3) { - array_push($topmost_article_ids, $id); - } + $score_pic = ""; - $class = ""; + if ($score > 500) { + $hlc_suffix = "high"; + } else if ($score < -100) { + $hlc_suffix = "low"; + } else { + $hlc_suffix = ""; + } - if (sql_bool_to_bool($line["unread"])) { - $class .= " Unread"; - ++$num_unread; - } + $entry_author = $line["author"]; - if (sql_bool_to_bool($line["marked"])) { - $marked_pic = "\"Unstar"; - $class .= " marked"; - } else { - $marked_pic = "\"Star"; - } + if ($entry_author) { + $entry_author = " — $entry_author"; + } - if (sql_bool_to_bool($line["published"])) { - $published_pic = "\"Unpublish"; - $class .= " published"; - } else { - $published_pic = "\"Publish"; - } + $has_feed_icon = feed_has_icon($feed_id); -# $content_link = "" . -# $line["title"] . ""; + if ($has_feed_icon) { + $feed_icon_img = "\"\""; + } else { + $feed_icon_img = "\"\""; + } -# $content_link = "" . -# $line["title"] . ""; + $entry_site_url = $line["site_url"]; -# $content_link = "" . -# $line["title"] . ""; + //setting feed headline background color, needs to change text color based on dark/light + $fav_color = $line['favicon_avg_color']; - $updated_fmt = make_local_datetime($line["updated"], false, false, false, true); - $date_entered_fmt = T_sprintf("Imported at %s", - make_local_datetime($line["date_entered"], false)); + require_once "colors.php"; - $score = $line["score"]; + if ($fav_color && $fav_color != 'fail') { + if (!isset($rgba_cache[$feed_id])) { + $rgba_cache[$feed_id] = join(",", _color_unpack($fav_color)); + } + } - $score_pic = "images/" . get_score_pic($score); + if (!get_pref('COMBINED_DISPLAY_MODE')) { -/* $score_title = __("(Click to change)"); - $score_pic = ""; */ + if ($vfeed_group_enabled) { + if ($feed_id != $vgroup_last_feed && $line["feed_title"]) { - $score_pic = ""; + $cur_feed_title = $line["feed_title"]; + $vgroup_last_feed = $feed_id; - if ($score > 500) { - $hlc_suffix = "high"; - } else if ($score < -100) { - $hlc_suffix = "low"; - } else { - $hlc_suffix = ""; - } + $cur_feed_title = htmlspecialchars($cur_feed_title); - $entry_author = $line["author"]; + $vf_catchup_link = "".__('mark feed as read').""; - if ($entry_author) { - $entry_author = " — $entry_author"; - } + $reply['content'] .= "
". + "
$feed_icon_img
". + "". + $line["feed_title"]." + $vf_catchup_link
"; - $has_feed_icon = feed_has_icon($feed_id); - if ($has_feed_icon) { - $feed_icon_img = "\"\""; - } else { - $feed_icon_img = "\"\""; - } + } + } - $entry_site_url = $line["site_url"]; + $mouseover_attrs = "onmouseover='postMouseIn(event, $id)' + onmouseout='postMouseOut($id)'"; - //setting feed headline background color, needs to change text color based on dark/light - $fav_color = $line['favicon_avg_color']; + $reply['content'] .= "
"; - require_once "colors.php"; + $reply['content'] .= "
"; - if ($fav_color && $fav_color != 'fail') { - if (!isset($rgba_cache[$feed_id])) { - $rgba_cache[$feed_id] = join(",", _color_unpack($fav_color)); - } - } + $reply['content'] .= ""; - if (!get_pref('COMBINED_DISPLAY_MODE')) { + $reply['content'] .= "$marked_pic"; + $reply['content'] .= "$published_pic"; - if ($vfeed_group_enabled) { - if ($feed_id != $vgroup_last_feed && $line["feed_title"]) { + $reply['content'] .= "
"; - $cur_feed_title = $line["feed_title"]; - $vgroup_last_feed = $feed_id; + $reply['content'] .= "
"; + $reply['content'] .= "" . + truncate_string($line["title"], 200); - $cur_feed_title = htmlspecialchars($cur_feed_title); + if (get_pref('SHOW_CONTENT_PREVIEW')) { + $reply['content'] .= "" . $line["content_preview"] . ""; + } - $vf_catchup_link = "".__('mark feed as read').""; + $reply['content'] .= ""; - $reply['content'] .= "
". - "
$feed_icon_img
". - "". - $line["feed_title"]." - $vf_catchup_link
"; + $reply['content'] .= $labels_str; + $reply['content'] .= "
"; - } - } + if (!$vfeed_group_enabled) { + if (@$line["feed_title"]) { + $rgba = @$rgba_cache[$feed_id]; - $mouseover_attrs = "onmouseover='postMouseIn(event, $id)' - onmouseout='postMouseOut($id)'"; + $reply['content'] .= "". + truncate_string($line["feed_title"],30).""; + } + } - $reply['content'] .= "
"; - $reply['content'] .= "
"; + $reply['content'] .= ""; - $reply['content'] .= ""; + $reply['content'] .= "
$updated_fmt
+ "; - $reply['content'] .= "$marked_pic"; - $reply['content'] .= "$published_pic"; + $reply['content'] .= "
"; - $reply['content'] .= "
"; + $reply['content'] .= $score_pic; - $reply['content'] .= "
"; - $reply['content'] .= "" . - truncate_string($line["title"], 200); + if ($line["feed_title"] && !$vfeed_group_enabled) { - if (get_pref('SHOW_CONTENT_PREVIEW')) { - $reply['content'] .= "" . $line["content_preview"] . ""; - } + $reply['content'] .= " + $feed_icon_img"; + } - $reply['content'] .= ""; + $reply['content'] .= "
"; + $reply['content'] .= "
"; - $reply['content'] .= $labels_str; + } else { - $reply['content'] .= "
"; + if ($line["tag_cache"]) + $tags = explode(",", $line["tag_cache"]); + else + $tags = false; - if (!$vfeed_group_enabled) { - if (@$line["feed_title"]) { - $rgba = @$rgba_cache[$feed_id]; + $line["content"] = sanitize($line["content"], + sql_bool_to_bool($line['hide_images']), false, $entry_site_url, $highlight_words, $line["id"]); - $reply['content'] .= "". - truncate_string($line["feed_title"],30).""; - } - } + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) { + $line = $p->hook_render_article_cdm($line); + } + if ($vfeed_group_enabled && $line["feed_title"]) { + if ($feed_id != $vgroup_last_feed) { - $reply['content'] .= ""; + $cur_feed_title = $line["feed_title"]; + $vgroup_last_feed = $feed_id; - $reply['content'] .= "
$updated_fmt
- "; + $cur_feed_title = htmlspecialchars($cur_feed_title); - $reply['content'] .= "
"; + $vf_catchup_link = "".__('mark feed as read').""; - $reply['content'] .= $score_pic; + $has_feed_icon = feed_has_icon($feed_id); - if ($line["feed_title"] && !$vfeed_group_enabled) { + if ($has_feed_icon) { + $feed_icon_img = "\"\""; + } else { + //$feed_icon_img = "\"\""; + } - $reply['content'] .= " - $feed_icon_img"; - } + $reply['content'] .= "
". + "
$feed_icon_img
". + "". + $line["feed_title"]." $vf_catchup_link
"; - $reply['content'] .= "
"; - $reply['content'] .= "
"; + } + } - } else { + $mouseover_attrs = "onmouseover='postMouseIn(event, $id)' + onmouseout='postMouseOut($id)'"; - if ($line["tag_cache"]) - $tags = explode(",", $line["tag_cache"]); - else - $tags = false; + $expanded_class = $expand_cdm ? "expanded" : "expandable"; - $line["content"] = sanitize($line["content"], - sql_bool_to_bool($line['hide_images']), false, $entry_site_url, $highlight_words, $line["id"]); + $tmp_content = "
"; - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) { - $line = $p->hook_render_article_cdm($line); - } + $tmp_content .= "
"; + $tmp_content .= "
"; - if ($vfeed_group_enabled && $line["feed_title"]) { - if ($feed_id != $vgroup_last_feed) { + $tmp_content .= ""; - $cur_feed_title = $line["feed_title"]; - $vgroup_last_feed = $feed_id; + $tmp_content .= "$marked_pic"; + $tmp_content .= "$published_pic"; - $cur_feed_title = htmlspecialchars($cur_feed_title); + $tmp_content .= "
"; - $vf_catchup_link = "".__('mark feed as read').""; + if ($highlight_words && count($highlight_words > 0)) { + foreach ($highlight_words as $word) { + $line["title"] = preg_replace("/(\Q$word\E)/i", + "$1", $line["title"]); + } + } - $has_feed_icon = feed_has_icon($feed_id); + // data-article-id included for context menu + $tmp_content .= " + ". + $line["title"] . + " $entry_author"; - if ($has_feed_icon) { - $feed_icon_img = "\"\""; - } else { - //$feed_icon_img = "\"\""; - } + $tmp_content .= $labels_str; - $reply['content'] .= "
". - "
$feed_icon_img
". - "". - $line["feed_title"]." $vf_catchup_link
"; + $tmp_content .= ""; - } - } + if (!$expand_cdm) + $content_hidden = "style=\"display : none\""; + else + $excerpt_hidden = "style=\"display : none\""; - $mouseover_attrs = "onmouseover='postMouseIn(event, $id)' - onmouseout='postMouseOut($id)'"; + $tmp_content .= "" . $content_preview . ""; - $expanded_class = $expand_cdm ? "expanded" : "expandable"; - - $tmp_content = "
"; + $tmp_content .= ""; - $tmp_content .= "
"; - $tmp_content .= "
"; + if (!$vfeed_group_enabled) { + if (@$line["feed_title"]) { + $rgba = @$rgba_cache[$feed_id]; - $tmp_content .= ""; + $tmp_content .= "
+ ". + truncate_string($line["feed_title"],30)." +
"; + } + } - $tmp_content .= "$marked_pic"; - $tmp_content .= "$published_pic"; + $tmp_content .= "$updated_fmt"; - $tmp_content .= "
"; + $tmp_content .= "
"; + $tmp_content .= "$score_pic"; - if ($highlight_words && count($highlight_words > 0)) { - foreach ($highlight_words as $word) { - $line["title"] = preg_replace("/(\Q$word\E)/i", - "$1", $line["title"]); - } - } + if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) { + $tmp_content .= "$feed_icon_img"; + } + $tmp_content .= "
"; //scoreWrap - // data-article-id included for context menu - $tmp_content .= " - ". - $line["title"] . - " $entry_author"; + $tmp_content .= "
"; //cdmHeader - $tmp_content .= $labels_str; + $tmp_content .= "
"; - $tmp_content .= ""; + $tmp_content .= "
"; + if ($line['note']) { + $tmp_content .= Article::format_article_note($id, $line['note']); + } + $tmp_content .= "
"; //POSTNOTE - if (!$expand_cdm) - $content_hidden = "style=\"display : none\""; - else - $excerpt_hidden = "style=\"display : none\""; + if (!$line['lang']) $line['lang'] = 'en'; - $tmp_content .= "" . $content_preview . ""; + $tmp_content .= "
"; - $tmp_content .= ""; + if ($line["orig_feed_id"]) { - if (!$vfeed_group_enabled) { - if (@$line["feed_title"]) { - $rgba = @$rgba_cache[$feed_id]; + $ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds + WHERE id = ? AND owner_uid = ?"); + $ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]); - $tmp_content .= "
- ". - truncate_string($line["feed_title"],30)." -
"; - } - } + if ($tmp_line = $ofgh->fetch()) { - $tmp_content .= "$updated_fmt"; + $tmp_content .= "
"; + $tmp_content .= __("Originally from:"); - $tmp_content .= "
"; - $tmp_content .= "$score_pic"; + $tmp_content .= " "; - if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) { - $tmp_content .= "$feed_icon_img"; - } - $tmp_content .= "
"; //scoreWrap + $tmp_content .= "" . + $tmp_line['title'] . ""; - $tmp_content .= "
"; //cdmHeader + $tmp_content .= " "; - $tmp_content .= "
"; + $tmp_content .= ""; + $tmp_content .= ""; - $tmp_content .= "
"; - if ($line['note']) { - $tmp_content .= Article::format_article_note($id, $line['note']); - } - $tmp_content .= "
"; //POSTNOTE + $tmp_content .= "
"; + } + } - if (!$line['lang']) $line['lang'] = 'en'; + $tmp_content .= ""; + $tmp_content .= ""; + $tmp_content .= htmlspecialchars($line["content"]); + $tmp_content .= ""; + $tmp_content .= ""; - $tmp_content .= "
"; + $tmp_content .= "
"; //cdmContentInner - if ($line["orig_feed_id"]) { + $tmp_content .= "
"; - $ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds - WHERE id = ? AND owner_uid = ?"); - $ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]); + $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]); + $tmp_content .= Article::format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"])); - if ($tmp_line = $ofgh->fetch()) { + $tmp_content .= "
"; // cdmIntermediate - $tmp_content .= "
"; - $tmp_content .= __("Originally from:"); + $tmp_content .= "
"; - $tmp_content .= " "; + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) { + $tmp_content .= $p->hook_article_left_button($line); + } - $tmp_content .= "" . - $tmp_line['title'] . ""; + $tags_str = Article::format_tags_string($tags, $id); - $tmp_content .= " "; + $tmp_content .= ""; - $tmp_content .= ""; - $tmp_content .= ""; + $tmp_content .= "Tags + $tags_str + (+)"; - $tmp_content .= "
"; - } - } + $num_comments = (int) $line["num_comments"]; + $entry_comments = ""; - $tmp_content .= ""; - $tmp_content .= ""; - $tmp_content .= htmlspecialchars($line["content"]); - $tmp_content .= ""; - $tmp_content .= ""; + if ($num_comments > 0) { + if ($line["comments"]) { + $comments_url = htmlspecialchars($line["comments"]); + } else { + $comments_url = htmlspecialchars($line["link"]); + } + $entry_comments = "$num_comments ". + _ngettext("comment", "comments", $num_comments).""; - $tmp_content .= "
"; //cdmContentInner + } else { + if ($line["comments"] && $line["link"] != $line["comments"]) { + $entry_comments = "".__("comments").""; + } + } - $tmp_content .= "
"; + if ($entry_comments) $tmp_content .= " ($entry_comments)"; - $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]); - $tmp_content .= Article::format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"])); + $tmp_content .= ""; + $tmp_content .= "
"; - $tmp_content .= "
"; // cdmIntermediate + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) { + $tmp_content .= $p->hook_article_button($line); + } - $tmp_content .= "
"; + $tmp_content .= "
"; // buttons - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) { - $tmp_content .= $p->hook_article_left_button($line); - } + $tmp_content .= "
"; // cdmFooter + $tmp_content .= "
"; // cdmContent + $tmp_content .= "
"; // RROW.cdm - $tags_str = Article::format_tags_string($tags, $id); + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE_CDM) as $p) { + $tmp_content = $p->hook_format_article_cdm($tmp_content, $line); + } - $tmp_content .= ""; + $reply['content'] .= $tmp_content; + } - $tmp_content .= "Tags - $tags_str - (+)"; + ++$lnum; + } - $num_comments = (int) $line["num_comments"]; - $entry_comments = ""; + if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PE", $timing_info); - if ($num_comments > 0) { - if ($line["comments"]) { - $comments_url = htmlspecialchars($line["comments"]); + if (!$headlines_count) { + + if (!is_numeric($result)) { + + switch ($view_mode) { + case "unread": + $message = __("No unread articles found to display."); + break; + case "updated": + $message = __("No updated articles found to display."); + break; + case "marked": + $message = __("No starred articles found to display."); + break; + default: + if ($feed < LABEL_BASE_INDEX) { + $message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."); } else { - $comments_url = htmlspecialchars($line["link"]); + $message = __("No articles found to display."); } - $entry_comments = "$num_comments ". - _ngettext("comment", "comments", $num_comments).""; - - } else { - if ($line["comments"] && $line["link"] != $line["comments"]) { - $entry_comments = "".__("comments").""; - } - } - - if ($entry_comments) $tmp_content .= " ($entry_comments)"; - - $tmp_content .= ""; - $tmp_content .= "
"; - -// $tmp_content .= "$marked_pic"; -// $tmp_content .= "$published_pic"; - - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) { - $tmp_content .= $p->hook_article_button($line); - } - - $tmp_content .= "
"; // buttons - - $tmp_content .= "
"; // cdmFooter - $tmp_content .= "
"; // cdmContent - $tmp_content .= "
"; // RROW.cdm - - foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE_CDM) as $p) { - $tmp_content = $p->hook_format_article_cdm($tmp_content, $line); - } - - $reply['content'] .= $tmp_content; } - ++$lnum; - } + if (!$offset && $message) { + $reply['content'] = "
$message"; - if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PE", $timing_info); + $reply['content'] .= "

"; - } else if (!is_numeric($result)) { - $message = ""; + $sth = $this->pdo->prepare("SELECT " . SUBSTRING_FOR_DATE . "(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds + WHERE owner_uid = ?"); + $sth->execute([$_SESSION['uid']]); + $row = $sth->fetch(); - switch ($view_mode) { - case "unread": - $message = __("No unread articles found to display."); - break; - case "updated": - $message = __("No updated articles found to display."); - break; - case "marked": - $message = __("No starred articles found to display."); - break; - default: - if ($feed < LABEL_BASE_INDEX) { - $message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."); - } else { - $message = __("No articles found to display."); + $last_updated = make_local_datetime($row["last_updated"], false); + + $reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated); + + $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors + FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?"); + $sth->execute([$_SESSION['uid']]); + $row = $sth->fetch(); + + $num_errors = $row["num_errors"]; + + if ($num_errors > 0) { + $reply['content'] .= "
"; + $reply['content'] .= "" . + __('Some feeds have update errors (click for details)') . ""; } - } + $reply['content'] .= "

"; - if (!$offset && $message) { - $reply['content'] = "
$message"; - - $reply['content'] .= "

"; - - $sth = $this->pdo->prepare("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds - WHERE owner_uid = ?"); - $sth->execute([$_SESSION['uid']]); - $row = $sth->fetch(); - - $last_updated = make_local_datetime($row["last_updated"], false); - - $reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated); - - $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors - FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?"); - $sth->execute([$_SESSION['uid']]); - $row = $sth->fetch(); - - $num_errors = $row["num_errors"]; - - if ($num_errors > 0) { - $reply['content'] .= "
"; - $reply['content'] .= "". - __('Some feeds have update errors (click for details)').""; } - $reply['content'] .= "

"; - + } else if (is_numeric($result) && $result == -1) { + $reply['first_id_changed'] = true; } - } else if (is_numeric($result) && $result == -1) { - $reply['first_id_changed'] = true; } if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H2", $timing_info); @@ -2121,10 +2102,10 @@ class Feeds extends Handler_Protected { print $query; } - $result = db_query($query); + $res = $pdo->query($query); - if ($result && db_num_rows($result) > 0) { - $first_id = (int)db_fetch_result($result, 0, "id"); + if ($row = $res->fetch()) { + $first_id = (int)$row["id"]; if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) { return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); @@ -2167,7 +2148,7 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) print $query; - $result = db_query($query); + $res = $pdo->query($query); } else { // browsing by tag @@ -2211,20 +2192,23 @@ class Feeds extends Handler_Protected { if ($_REQUEST["debug"]) print $query; - $result = db_query($query); + $res = $pdo->query($query); } - return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); + return array($res, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); } static function getParentCategories($cat, $owner_uid) { $rv = array(); - $result = db_query("SELECT parent_cat FROM ttrss_feed_categories - WHERE id = '$cat' AND parent_cat IS NOT NULL AND owner_uid = $owner_uid"); + $pdo = Db::pdo(); - while ($line = db_fetch_assoc($result)) { + $sth = $pdo->prepare("SELECT parent_cat FROM ttrss_feed_categories + WHERE id = ? AND parent_cat IS NOT NULL AND owner_uid = ?"); + $sth->execute([$cat, $owner_uid]); + + while ($line = $sth->fetch()) { array_push($rv, $line["parent_cat"]); $rv = array_merge($rv, Feeds::getParentCategories($line["parent_cat"], $owner_uid)); } @@ -2235,10 +2219,13 @@ class Feeds extends Handler_Protected { static function getChildCategories($cat, $owner_uid) { $rv = array(); - $result = db_query("SELECT id FROM ttrss_feed_categories - WHERE parent_cat = '$cat' AND owner_uid = $owner_uid"); + $pdo = Db::pdo(); - while ($line = db_fetch_assoc($result)) { + $sth = $pdo->prepare("SELECT id FROM ttrss_feed_categories + WHERE parent_cat = ? AND owner_uid = ?"); + $sth->execute([$cat, $owner_uid]); + + while ($line = $sth->fetch()) { array_push($rv, $line["id"]); $rv = array_merge($rv, Feeds::getChildCategories($line["id"], $owner_uid)); } @@ -2247,11 +2234,14 @@ class Feeds extends Handler_Protected { } static function getFeedCategory($feed) { - $result = db_query("SELECT cat_id FROM ttrss_feeds - WHERE id = '$feed'"); + $pdo = Db::pdo(); - if (db_num_rows($result) > 0) { - return db_fetch_result($result, 0, "cat_id"); + $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds + WHERE id = ?"); + $sth->execute([$feed]); + + if ($row = $sth->fetch()) { + return $row["cat_id"]; } else { return false; }