$reply .= "<span class=\"main\">";
$reply .= "<span id='selected_prompt'></span>";
- $reply .= "
+ $reply .= "<span class=\"sel_links\">
<a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
<a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>,
<a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>,
<a href=\"#\" onclick=\"$sel_none_link\">".__('None')."</a></li>";
- $reply .= " ";
+ $reply .= "</span> ";
$reply .= "<select dojoType=\"dijit.form.Select\"
onchange=\"headlineActionsChange(this)\">";
private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
$next_unread_feed, $offset, $vgr_last_feed = false,
- $override_order = false, $include_children = false, $check_first_id = false) {
+ $override_order = false, $include_children = false, $check_first_id = false,
+ $skip_first_id_check = false) {
$disable_cache = false;
if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
// Update the feed if required with some basic flood control
- $result = $this->dbh->query(
- "SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
- FROM ttrss_feeds WHERE id = '$feed'");
+ $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 "<!-- any_needs_curl: $any_needs_curl -->";
+
+ if (!$any_needs_curl) {
+
+ $result = $this->dbh->query(
+ "SELECT cache_images," . SUBSTRING_FOR_DATE . "(last_updated,1,19) AS last_updated
+ FROM ttrss_feeds WHERE id = '$feed'");
if ($this->dbh->num_rows($result) != 0) {
$last_updated = strtotime($this->dbh->fetch_result($result, 0, "last_updated"));
update_rss_feed($feed, true, true);
} else {
$this->dbh->query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
- WHERE id = '$feed'");
+ WHERE id = '$feed'");
}
}
+ } else {
+ $this->dbh->query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+ WHERE id = '$feed'");
+ }
}
if ($method_split[0] == "MarkAllReadGR") {
}
@$search = $this->dbh->escape_string($_REQUEST["query"]);
+ @$search_language = $this->dbh->escape_string($_REQUEST["search_language"]); // PGSQL only
if ($search) {
$disable_cache = true;
"view_mode" => $view_mode,
"cat_view" => $cat_view,
"search" => $search,
+ "search_language" => $search_language,
"override_order" => $override_order,
"offset" => $offset,
"include_children" => $include_children,
- "check_first_id" => $check_first_id
+ "check_first_id" => $check_first_id,
+ "skip_first_id_check" => $skip_first_id_check
);
$qfh_ret = queryFeedHeadlines($params);
$feed, $cat_view, $search, $view_mode,
$last_error, $last_updated);
- $headlines_count = $this->dbh->num_rows($result);
-
- /* if (get_pref('COMBINED_DISPLAY_MODE')) {
- $button_plugins = array();
- foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
- $pclass = "button_" . trim($p);
-
- if (class_exists($pclass)) {
- $plugin = new $pclass();
- array_push($button_plugins, $plugin);
- }
- }
- } */
+ $headlines_count = is_numeric($result) ? 0 : $this->dbh->num_rows($result);
if ($offset == 0) {
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINES_BEFORE) as $p) {
}
}
- $reply['content'] = array();
+ $reply['content'] = '';
- if (!is_numeric($result) && $this->dbh->num_rows($result) > 0) {
+ if ($headlines_count > 0) {
$lnum = $offset;
$expand_cdm = get_pref('CDM_EXPANDED');
while ($line = $this->dbh->fetch_assoc($result)) {
- $headline_row = '';
$line["content_preview"] = "— " . truncate_string(strip_tags($line["content"]), 250);
$vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
- $
feed_title_row = "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
+ $
reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
"<div style='float : right'>$feed_icon_img</div>".
- "<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">".
+ "<a class='title' href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
$line["feed_title"]."</a>
$vf_catchup_link</div>";
- array_push($reply['content'], array('id' => 0, 'kind' => 'feed_title', 'html' => $feed_title_row));
}
}
$mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
onmouseout='postMouseOut($id)'";
- $
headline_row .= "<div class='hl $class' orig-feed-id='$feed_id' id='RROW-$id' $mouseover_attrs>";
+ $
reply['content'] .= "<div class='hl $class' orig-feed-id='$feed_id' id='RROW-$id' $mouseover_attrs>";
- $
headline_row .= "<div class='hlLeft'>";
+ $
reply['content'] .= "<div class='hlLeft'>";
- $headline_row .= "<input dojoType=\"dijit.form.CheckBox\"
+ $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"
class='rchk'>";
- $headline_row .= "$marked_pic";
- $headline_row .= "$published_pic";
+ $reply['content'] .= "$marked_pic";
+ $reply['content'] .= "$published_pic";
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
- $
headline_row .= "<div onclick='return hlClicked(event, $id)'
+ $
reply['content'] .= "<div onclick='return hlClicked(event, $id)'
class=\"hlTitle\"><span class='hlContent $hlc_suffix'>";
- $
headline_row .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\"
+ $
reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\"
href=\"" . htmlspecialchars($line["link"]) . "\"
onclick=\"\">" .
truncate_string($line["title"], 200);
if (get_pref('SHOW_CONTENT_PREVIEW')) {
- $headline_row .= "<span class=\"contentPreview\">" . $line["content_preview"] . "</span>";
+ $reply['content'] .= "<span class=\"contentPreview\">" . $line["content_preview"] . "</span>";
}
- $headline_row .= "</a></span>";
+ $reply['content'] .= "</a></span>";
- $headline_row .= $labels_str;
+ $reply['content'] .= $labels_str;
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
if (!$vfeed_group_enabled) {
if (@$line["feed_title"]) {
$rgba = @$rgba_cache[$feed_id];
- $headline_row .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed($feed_id)\">".
+ $reply['content'] .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed({feed:$feed_id})\">".
truncate_string($line["feed_title"],30)."</a></span>";
}
}
- $headline_row .= "<span class=\"hlUpdated\">";
+ $reply['content'] .= "<span class=\"hlUpdated\">";
- $
headline_row .= "<div title='$date_entered_fmt'>$updated_fmt</div>
+ $
reply['content'] .= "<div title='$date_entered_fmt'>$updated_fmt</div>
</span>";
- $
headline_row .= "<div class=\"hlRight\">";
+ $
reply['content'] .= "<div class=\"hlRight\">";
- $headline_row .= $score_pic;
+ $reply['content'] .= $score_pic;
if ($line["feed_title"] && !$vfeed_group_enabled) {
- $headline_row .= "<span onclick=\"viewfeed($feed_id)\"
+ $reply['content'] .= "<span onclick=\"viewfeed({feed:$feed_id})\"
style=\"cursor : pointer\"
title=\"".htmlspecialchars($line['feed_title'])."\">
$feed_icon_img</span>";
}
- $headline_row .= "</div>";
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
+ $reply['content'] .= "</div>";
} else {
//$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
}
- $
feed_title_row = "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
+ $
reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>".
- "<a href=\"#\" class='title' onclick=\"viewfeed($feed_id)\">".
+ "<a href=\"#\" class='title' onclick=\"viewfeed({feed:$feed_id})\">".
$line["feed_title"]."</a> $vf_catchup_link</div>";
- array_push($reply['content'], array('id' => 0, 'kind' => 'feed_title', 'html' => $feed_title_row));
}
}
$expanded_class = $expand_cdm ? "expanded" : "expandable";
- $
headline_row .= "<div class=\"cdm $hlc_suffix $expanded_class $class\"
+ $
reply['content'] .= "<div class=\"cdm $hlc_suffix $expanded_class $class\"
id=\"RROW-$id\" orig-feed-id='$feed_id' $mouseover_attrs>";
- $
headline_row .= "<div class=\"cdmHeader\">";
- $
headline_row .= "<div style=\"vertical-align : middle\">";
+ $
reply['content'] .= "<div class=\"cdmHeader\">";
+ $
reply['content'] .= "<div style=\"vertical-align : middle\">";
- $headline_row .= "<input dojoType=\"dijit.form.CheckBox\"
+ $reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\"
class='rchk'>";
- $headline_row .= "$marked_pic";
- $headline_row .= "$published_pic";
+ $reply['content'] .= "$marked_pic";
+ $reply['content'] .= "$published_pic";
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
if ($highlight_words && count($highlight_words > 0)) {
foreach ($highlight_words as $word) {
}
}
- $headline_row .= "<span id=\"RTITLE-$id\"
+ $reply['content'] .= "<span id=\"RTITLE-$id\"
onclick=\"return cdmClicked(event, $id);\"
class=\"titleWrap $hlc_suffix\">
<a class=\"title $hlc_suffix\"
$line["title"] .
"</a> <span class=\"author\">$entry_author</span>";
- $headline_row .= $labels_str;
+ $reply['content'] .= $labels_str;
- $headline_row .= "<span class='collapseBtn' style='display : none'>
+ $reply['content'] .= "<span class='collapseBtn' style='display : none'>
<img src=\"images/collapse.png\" onclick=\"cdmCollapseArticle(event, $id)\"
title=\"".__("Collapse article")."\"/></span>";
else
$excerpt_hidden = "style=\"display : none\"";
- $headline_row .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\">" . $content_preview . "</span>";
+ $reply['content'] .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\">" . $content_preview . "</span>";
- $headline_row .= "</span>";
+ $reply['content'] .= "</span>";
if (!$vfeed_group_enabled) {
if (@$line["feed_title"]) {
$rgba = @$rgba_cache[$feed_id];
- $
headline_row .= "<div class=\"hlFeed\">
+ $
reply['content'] .= "<div class=\"hlFeed\">
<a href=\"#\" style=\"background-color: rgba($rgba,0.3)\"
- onclick=\"viewfeed($feed_id)\">".
+ onclick=\"viewfeed({feed:$feed_id})\">".
truncate_string($line["feed_title"],30)."</a>
</div>";
}
}
- $headline_row .= "<span class='updated' title='$date_entered_fmt'>
+ $reply['content'] .= "<span class='updated' title='$date_entered_fmt'>
$updated_fmt</span>";
- $
headline_row .= "<div class='scoreWrap' style=\"vertical-align : middle\">";
- $headline_row .= "$score_pic";
+ $
reply['content'] .= "<div class='scoreWrap' style=\"vertical-align : middle\">";
+ $reply['content'] .= "$score_pic";
if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
- $headline_row .= "<span style=\"cursor : pointer\"
+ $reply['content'] .= "<span style=\"cursor : pointer\"
title=\"".htmlspecialchars($line["feed_title"])."\"
- onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
+ onclick=\"viewfeed({feed:$feed_id})\">$feed_icon_img</span>";
}
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
- $
headline_row .= "<div class=\"cdmContent\" $content_hidden
+ $
reply['content'] .= "<div class=\"cdmContent\" $content_hidden
onclick=\"return cdmClicked(event, $id);\"
id=\"CICD-$id\">";
- $
headline_row .= "<div id=\"POSTNOTE-$id\">";
+ $
reply['content'] .= "<div id=\"POSTNOTE-$id\">";
if ($line['note']) {
- $headline_row .= format_article_note($id, $line['note']);
+ $reply['content'] .= format_article_note($id, $line['note']);
}
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
if (!$line['lang']) $line['lang'] = 'en';
- $
headline_row .= "<div class=\"cdmContentInner\" lang=\"".$line['lang']."\">";
+ $
reply['content'] .= "<div class=\"cdmContentInner\" lang=\"".$line['lang']."\">";
if ($line["orig_feed_id"]) {
$tmp_result = $this->dbh->query("SELECT * FROM ttrss_archived_feeds
- WHERE id = ".$line["orig_feed_id"]);
+ WHERE id = ".$line["orig_feed_id"] . " AND owner_uid = " . $_SESSION["uid"]);
if ($this->dbh->num_rows($tmp_result) != 0) {
- $
headline_row .= "<div clear='both'>";
- $headline_row .= __("Originally from:");
+ $
reply['content'] .= "<div clear='both'>";
+ $reply['content'] .= __("Originally from:");
- $headline_row .= " ";
+ $reply['content'] .= " ";
$tmp_line = $this->dbh->fetch_assoc($tmp_result);
- $
headline_row .= "<a target='_blank'
+ $
reply['content'] .= "<a target='_blank'
href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
$tmp_line['title'] . "</a>";
- $headline_row .= " ";
+ $reply['content'] .= " ";
- $
headline_row .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
- $
headline_row .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.png'></a>";
+ $
reply['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
+ $
reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.png'></a>";
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
}
}
- $headline_row .= "<span id=\"CWRAP-$id\">";
+ $reply['content'] .= "<span id=\"CWRAP-$id\">";
// if (!$expand_cdm) {
- $headline_row .= "<span id=\"CENCW-$id\" style=\"display : none\">";
- $headline_row .= htmlspecialchars($line["content"]);
- $headline_row .= "</span.";
+ $reply['content'] .= "<span id=\"CENCW-$id\" style=\"display : none\">";
+ $reply['content'] .= htmlspecialchars($line["content"]);
+ $reply['content'] .= "</span.";
// } else {
-// $headline_row .= $line["content"];
+// $reply['content'] .= $line["content"];
// }
- $headline_row .= "</span>";
+ $reply['content'] .= "</span>";
- $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
+ $reply['content'] .= "</div>";
+
+ $reply['content'] .= "<div class=\"cdmIntermediate\">";
- $headline_row .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
+ $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
+ $reply['content'] .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
- $
headline_row .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">";
+ $
reply['content'] .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">";
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
- $headline_row .= $p->hook_article_left_button($line);
+ $reply['content'] .= $p->hook_article_left_button($line);
}
$tags_str = format_tags_string($tags, $id);
- $headline_row .= "<img src='images/tag.png' alt='Tags' title='Tags'>
+ $reply['content'] .= "<span class='left'>";
+
+ $reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'>
<span id=\"ATSTR-$id\">$tags_str</span>
<a title=\"".__('Edit tags for this article')."\"
href=\"#\" onclick=\"editArticleTags($id)\">(+)</a>";
}
}
- if ($entry_comments) $headline_row .= " ($entry_comments)";
+ if ($entry_comments) $reply['content'] .= " ($entry_comments)";
- $headline_row .= "<div style=\"float : right\">";
+ $reply['content'] .= "</span>";
+ $reply['content'] .= "<div>";
-// $headline_row .= "$marked_pic";
-// $headline_row .= "$published_pic";
+// $reply['content'] .= "$marked_pic";
+// $reply['content'] .= "$published_pic";
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
- $headline_row .= $p->hook_article_button($line);
+ $reply['content'] .= $p->hook_article_button($line);
}
- $headline_row .= "</div>";
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
+ $reply['content'] .= "</div>";
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
- $headline_row .= "</div>";
+ $reply['content'] .= "</div>";
}
- array_push($reply['content'], array("id" => (int)$line['id'], 'html' => $headline_row));
-
++$lnum;
}
}
if (!$offset && $message) {
- $
headline_row = "<div class='whiteBox'>$message";
+ $
reply['content'] = "<div class='whiteBox'>$message";
- $
headline_row .= "<p><span class=\"insensitive\">";
+ $
reply['content'] .= "<p><span class=\"insensitive\">";
$result = $this->dbh->query("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']);
$last_updated = $this->dbh->fetch_result($result, 0, "last_updated");
$last_updated = make_local_datetime($last_updated, false);
- $headline_row .= sprintf(__("Feeds last updated at %s"), $last_updated);
+ $reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
$result = $this->dbh->query("SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
$num_errors = $this->dbh->fetch_result($result, 0, "num_errors");
if ($num_errors > 0) {
- $headline_row .= "<br/>";
- $
headline_row .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
+ $reply['content'] .= "<br/>";
+ $
reply['content'] .= "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
__('Some feeds have update errors (click for details)')."</a>";
}
- $headline_row .= "</span></p></div>";
+ $reply['content'] .= "</span></p></div>";
- //array_push($reply['content'], array("id" => 0, "kind" => "status_message", "html" => $headline_row));
- array_push($reply['content'], array("id" => 0, 'kind' => 'status_message', 'html' => $headline_row));
}
} else if (is_numeric($result) && $result == -1) {
$reply['first_id_changed'] = true;
$reply['headlines'] = array();
$override_order = false;
+ $skip_first_id_check = false;
switch ($order_by) {
case "title":
break;
case "date_reverse":
$override_order = "score DESC, date_entered, updated";
+ $skip_first_id_check = true;
break;
case "feed_dates":
$override_order = "updated DESC";
$ret = $this->format_headlines_list($feed, $method,
$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
- $vgroup_last_feed, $override_order, true, $check_first_id);
+ $vgroup_last_feed, $override_order, true, $check_first_id, $skip_first_id_check);
//$topmost_article_ids = $ret[0];
$headlines_count = $ret[1];
//$reply['headlines']['content'] =& $ret[5]['content'];
//$reply['headlines']['toolbar'] =& $ret[5]['toolbar'];
- $reply['headlines'] =& $ret[5];
+ $reply['headlines'] = $ret[5];
if (!$next_unread_feed)
$reply['headlines']['id'] = $feed;
$reply['headlines']['is_cat'] = false;
$reply['headlines']['toolbar'] = '';
+
$reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');
$reply['headlines']['content'] .= "<p><span class=\"insensitive\">";
private function generate_error_feed($error) {
$reply = array();
- $reply['headlines']['id'] = -6;
+ $reply['headlines']['id'] = -7;
$reply['headlines']['is_cat'] = false;
$reply['headlines']['toolbar'] = '';
print "<hr/><span style='float : right'>".T_sprintf('in %s', getFeedTitle($active_feed_id, $is_cat))."</span>";
+ if (DB_TYPE == "pgsql") {
+ print "<hr/>";
+ print_select("search_language", "", Pref_Feeds::$feed_languages,
+ "dojoType='dijit.form.Select' title=\"".__('Used for word stemming')."\"");
+ }
+
print "</div>";
print "<div class=\"dlgButtons\">";
git.wh0rd.org / tt-rss.git / blobdiff