X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Ffeeds.php;h=0a7b7a241b94247632e16f93621bf5e3cf863b9b;hb=HEAD;hp=983a8551258938a85dd7fe422e3dcc370c8c755b;hpb=7c6f7bb0aa50f42fd697fbe82dc9b8b5931a3a52;p=tt-rss.git
diff --git a/classes/feeds.php b/classes/feeds.php
index 983a8551..0a7b7a24 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -173,49 +173,10 @@ class Feeds extends Handler_Protected {
$method_split = explode(":", $method);
if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
- // Update the feed if required with some basic flood control
-
- $any_needs_curl = false;
-
- if (ini_get("open_basedir")) {
- $pluginhost = PluginHost::getInstance();
- foreach ($pluginhost->get_plugins() as $plugin) {
- $flags = $plugin->flags();
-
- if (isset($flags["needs_curl"]) && $flags["needs_curl"]) {
- $any_needs_curl = true;
- break;
- }
- }
- }
-
- //if ($_REQUEST["debug"]) print "";
-
- if (!$any_needs_curl) {
-
- $sth = $this->pdo->prepare("SELECT cache_images," . SUBSTRING_FOR_DATE . "(last_updated,1,19) AS last_updated
- FROM ttrss_feeds WHERE id = ?");
- $sth->execute([$feed]);
-
- if ($row = $sth->fetch()) {
- $last_updated = strtotime($row["last_updated"]);
- $cache_images = $row["cache_images"];
-
- if (!$cache_images && time() - $last_updated > 120) {
- RSSUtils::update_rss_feed($feed, true);
- } else {
- $sth = $this->pdo->prepare("UPDATE ttrss_feeds
- SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
- WHERE id = ?");
- $sth->execute([$feed]);
- }
- }
- } else {
- $sth = $this->pdo->prepare("UPDATE ttrss_feeds
- SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
- WHERE id = ?");
- $sth->execute([$feed]);
- }
+ $sth = $this->pdo->prepare("UPDATE ttrss_feeds
+ SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+ WHERE id = ?");
+ $sth->execute([$feed]);
}
if ($method_split[0] == "MarkAllReadGR") {
@@ -286,7 +247,7 @@ class Feeds extends Handler_Protected {
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
- $result = $qfh_ret[0];
+ $result = $qfh_ret[0]; // this could be either a PDO query result or a -1 if first id changed
$feed_title = $qfh_ret[1];
$feed_site_url = $qfh_ret[2];
$last_error = $qfh_ret[3];
@@ -316,432 +277,402 @@ class Feeds extends Handler_Protected {
$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;
-
- if ($label_cache) {
- $label_cache = json_decode($label_cache, true);
-
- if ($label_cache) {
- if ($label_cache["no-labels"] == 1)
- $labels = array();
- else
- $labels = $label_cache;
- }
- }
-
- if (!is_array($labels)) $labels = Article::get_article_labels($id);
-
- $labels_str = "";
- $labels_str .= Article::format_article_labels($labels);
- $labels_str .= "";
-
- if (count($topmost_article_ids) < 3) {
- array_push($topmost_article_ids, $id);
- }
-
- $class = "";
-
- if ($line["unread"]) {
- $class .= " Unread";
- ++$num_unread;
- }
-
- if ($line["marked"]) {
- $marked_pic = "";
- $class .= " marked";
- } else {
- $marked_pic = "";
- }
-
- if ($line["published"]) {
- $published_pic = "";
- $class .= " published";
- } else {
- $published_pic = "";
- }
-
- $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));
-
- $score = $line["score"];
-
- $score_pic = "images/" . get_score_pic($score);
-
- $score_pic = "";
- if ($score > 500) {
- $hlc_suffix = "high";
- } else if ($score < -100) {
- $hlc_suffix = "low";
- } else {
- $hlc_suffix = "";
- }
+ if (is_object($result)) {
- $entry_author = $line["author"];
+ while ($line = $result->fetch()) {
- if ($entry_author) {
- $entry_author = " — $entry_author";
- }
+ ++$headlines_count;
- $has_feed_icon = feeds::feedHasIcon($feed_id);
+ $line["content_preview"] = "— " . truncate_string(strip_tags($line["content"]), 250);
- if ($has_feed_icon) {
- $feed_icon_img = "";
- } else {
- $feed_icon_img = "";
- }
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+ $line = $p->hook_query_headlines($line, 250, false);
+ }
- $entry_site_url = $line["site_url"];
+ if (get_pref('SHOW_CONTENT_PREVIEW')) {
+ $content_preview = $line["content_preview"];
+ }
- //setting feed headline background color, needs to change text color based on dark/light
- $fav_color = $line['favicon_avg_color'];
+ $id = $line["id"];
+ $feed_id = $line["feed_id"];
+ $label_cache = $line["label_cache"];
+ $labels = false;
- require_once "colors.php";
+ $mouseover_attrs = "onmouseover='postMouseIn(event, $id)' onmouseout='postMouseOut($id)'";
- if ($fav_color && $fav_color != 'fail') {
- if (!isset($rgba_cache[$feed_id])) {
- $rgba_cache[$feed_id] = join(",", _color_unpack($fav_color));
- }
- }
+ if ($label_cache) {
+ $label_cache = json_decode($label_cache, true);
- if (!get_pref('COMBINED_DISPLAY_MODE')) {
+ if ($label_cache) {
+ if ($label_cache["no-labels"] == 1)
+ $labels = array();
+ else
+ $labels = $label_cache;
+ }
+ }
- if ($vfeed_group_enabled) {
- if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
+ if (!is_array($labels)) $labels = Article::get_article_labels($id);
- $vgroup_last_feed = $feed_id;
+ $labels_str = "";
+ $labels_str .= Article::format_article_labels($labels);
+ $labels_str .= "";
- $vf_catchup_link = "".__('mark feed as read')."";
+ if (count($topmost_article_ids) < 3) {
+ array_push($topmost_article_ids, $id);
+ }
- $reply['content'] .= "
";
+ $class = "";
+
+ if ($line["unread"]) {
+ $class .= " Unread";
+ ++$num_unread;
+ }
+
+ $marked_pic_src = $line["marked"] ? "mark_set.png" : "mark_unset.png";
+ $class .= $line["marked"] ? " marked" : "";
+ $marked_pic = "";
+ $published_pic_src = $line["published"] ? "pub_set.png" : "pub_unset.png";
+ $class .= $line["published"] ? " published" : "";
+ $published_pic = "";
- }
- }
+ $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));
- $mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
- onmouseout='postMouseOut($id)'";
+ $score = $line["score"];
- $reply['content'] .= "";
- if (!$vfeed_group_enabled) {
- if (@$line["feed_title"]) {
- $rgba = @$rgba_cache[$feed_id];
+ if (!$vfeed_group_enabled) {
+ if (@$line["feed_title"]) {
+ $rgba = @$rgba_cache[$feed_id];
- $reply['content'] .= "".
- truncate_string($line["feed_title"],30)."";
- }
- }
+ $reply['content'] .= "".
+ truncate_string($line["feed_title"],30)."";
+ }
+ }
- $reply['content'] .= "";
+ $reply['content'] .= "";
- $reply['content'] .= "$updated_fmt
+ $reply['content'] .= "$updated_fmt
";
- $reply['content'] .= "";
+ $reply['content'] .= "
";
- $reply['content'] .= $score_pic;
+ $reply['content'] .= $score_pic;
- if ($line["feed_title"] && !$vfeed_group_enabled) {
+ if ($line["feed_title"] && !$vfeed_group_enabled) {
- $reply['content'] .= "
$feed_icon_img";
- }
+ }
- $reply['content'] .= "
";
- $reply['content'] .= "
";
+ $reply['content'] .= "";
+ $reply['content'] .= "";
- } else {
+ } else {
- if ($line["tag_cache"])
- $tags = explode(",", $line["tag_cache"]);
- else
- $tags = false;
+ if ($line["tag_cache"])
+ $tags = explode(",", $line["tag_cache"]);
+ else
+ $tags = false;
- $line["content"] = sanitize($line["content"],
- $line['hide_images'], false, $entry_site_url, $highlight_words, $line["id"]);
+ $line["content"] = sanitize($line["content"],
+ $line['hide_images'], false, $entry_site_url, $highlight_words, $line["id"]);
- foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
- $line = $p->hook_render_article_cdm($line);
- }
+ 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) {
+ $line['content'] = rewrite_cached_urls($line['content']);
- $vgroup_last_feed = $feed_id;
+ if ($vfeed_group_enabled && $line["feed_title"]) {
+ if ($feed_id != $vgroup_last_feed) {
- $vf_catchup_link = "".__('mark feed as read')."";
+ $vgroup_last_feed = $feed_id;
- $feed_icon_src = Feeds::getFeedIcon($feed_id);
- $feed_icon_img = "";
+ $vf_catchup_link = "".__('mark feed as read')."";
- $reply['content'] .= "";
+ $feed_icon_src = Feeds::getFeedIcon($feed_id);
+ $feed_icon_img = "";
- }
- }
+ $reply['content'] .= "";
- $mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
- onmouseout='postMouseOut($id)'";
+ }
+ }
- $expanded_class = $expand_cdm ? "expanded" : "expandable";
+ $content_encoded = htmlspecialchars($line["content"]);
- $tmp_content = "";
+ $expanded_class = get_pref("CDM_EXPANDED") ? "expanded" : "expandable";
+ $tmp_content = "
";
- $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);
- }
+ 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;
- }
+ $reply['content'] .= $tmp_content;
+ }
- ++$lnum;
+ ++$lnum;
+ }
}
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PE", $timing_info);
@@ -1013,6 +944,8 @@ class Feeds extends Handler_Protected {
}
function quickAddFeed() {
+ print "
";
- print "";
-
print "
- ";
+ ";
if (!(defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER)) {
print "";
@@ -1089,6 +1020,8 @@ class Feeds extends Handler_Protected {
print "
";
+ print "";
+
//return;
}
@@ -1146,6 +1079,8 @@ class Feeds extends Handler_Protected {
$active_feed_id = sprintf("%d", $this->params[0]);
$is_cat = $this->params[1] != "false";
+ print "";
}
function update_debugger() {
header("Content-type: text/html");
+ Debug::set_enabled(true);
+ Debug::set_loglevel($_REQUEST["xdebug"]);
+
$feed_id = (int)$_REQUEST["feed_id"];
@$do_update = $_REQUEST["action"] == "do_update";
$csrf_token = $_REQUEST["csrf_token"];
@@ -1276,6 +1216,7 @@ class Feeds extends Handler_Protected {
if ($feed > 0) {
$children = Feeds::getChildCategories($feed, $owner_uid);
array_push($children, $feed);
+ $children = array_map("intval", $children);
$children = join(",", $children);
@@ -1442,7 +1383,7 @@ class Feeds extends Handler_Protected {
} else if ($n_feed >= 0) {
if ($n_feed != 0) {
- $match_part = "feed_id = '$n_feed'";
+ $match_part = "feed_id = " . (int)$n_feed;
} else {
$match_part = "feed_id IS NULL";
}
@@ -1513,6 +1454,10 @@ class Feeds extends Handler_Protected {
$contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
+ foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SUBSCRIBE_FEED) as $plugin) {
+ $contents = $plugin->hook_subscribe_feed($contents, $url, $auth_login, $auth_pass);
+ }
+
if (!$contents) {
if (preg_match("/cloudflare\.com/", $fetch_last_error_content)) {
$fetch_last_error .= " (feed behind Cloudflare)";
@@ -1521,10 +1466,6 @@ class Feeds extends Handler_Protected {
return array("code" => 5, "message" => $fetch_last_error);
}
- foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SUBSCRIBE_FEED) as $plugin) {
- $contents = $plugin->hook_subscribe_feed($contents, $url, $auth_login, $auth_pass);
- }
-
if (is_html($contents)) {
$feedUrls = get_feeds_from_html($url, $contents);
@@ -1551,7 +1492,7 @@ class Feeds extends Handler_Protected {
(owner_uid,feed_url,title,cat_id, auth_login,auth_pass,update_method,auth_pass_encrypted)
VALUES (?, ?, ?, ?, ?, ?, 0, false)");
- $sth->execute([$_SESSION['uid'], $url, "[Unknown]", $cat_id, $auth_login, $auth_pass]);
+ $sth->execute([$_SESSION['uid'], $url, "[Unknown]", $cat_id, (string)$auth_login, (string)$auth_pass]);
$sth = $pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
AND owner_uid = ?");
@@ -1677,7 +1618,7 @@ class Feeds extends Handler_Protected {
$cat_feeds = array();
while ($line = $sth->fetch()) {
- array_push($cat_feeds, "feed_id = " . $line["id"]);
+ array_push($cat_feeds, "feed_id = " . (int)$line["id"]);
}
if (count($cat_feeds) == 0) return 0;
@@ -1892,8 +1833,9 @@ class Feeds extends Handler_Protected {
if ($include_children) {
# sub-cats
$subcats = Feeds::getChildCategories($feed, $owner_uid);
-
array_push($subcats, $feed);
+ $subcats = array_map("intval", $subcats);
+
$query_strategy_part = "cat_id IN (".
implode(",", $subcats).")";
@@ -2101,9 +2043,9 @@ class Feeds extends Handler_Protected {
$sanity_interval_qpart
$first_id_query_strategy_part ORDER BY $order_by LIMIT 1";
- if ($_REQUEST["debug"]) {
+ /*if ($_REQUEST["debug"]) {
print $query;
- }
+ }*/
$res = $pdo->query($query);
@@ -2149,7 +2091,7 @@ class Feeds extends Handler_Protected {
$query_strategy_part ORDER BY $order_by
$limit_query_part $offset_query_part";
- if ($_REQUEST["debug"]) print $query;
+ //if ($_REQUEST["debug"]) print $query;
$res = $pdo->query($query);