"</option>";
}
+ if ($pluginhost->get_plugin("mailto")) {
+ $reply .= "<option value=\"mailtoArticle(false)\">".__('Forward by email').
+ "</option>";
+ }
+
$reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
// Update the feed if required with some basic flood control
$result = db_query($this->link,
- "SELECT cache_images,cache_content,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+ "SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE id = '$feed'");
if (db_num_rows($result) != 0) {
$last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));
$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
- $cache_content = sql_bool_to_bool(db_fetch_result($result, 0, "cache_content"));
- if (!$cache_images && !$cache_content && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {
+ if (!$cache_images && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {
include "rssfuncs.php";
update_rss_feed($this->link, $feed, true, true);
} else {
$feed_title = $qfh_ret[1];
$feed_site_url = $qfh_ret[2];
$last_error = $qfh_ret[3];
- $cache_content = true;
$vgroup_last_feed = $vgr_last_feed;
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
+ $expand_cdm = get_pref($this->link, 'CDM_EXPANDED');
+
while ($line = db_fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/pub_set.svg\" alt=\"\">";
}
+ $entry_site_url = $line["site_url"];
+
if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
$cur_feed_title = htmlspecialchars($cur_feed_title);
- $vf_catchup_link = "(<a onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
+ $vf_catchup_link = "(<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('Mark as read')."</a>)";
$reply['content'] .= "<div class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>".
- "<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+ "<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a> $vf_catchup_link</div>";
}
$reply['content'] .= $labels_str;
- if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED') &&
- defined('_SHOW_FEED_TITLE_IN_VFEEDS')) {
- if (@$line["feed_title"]) {
- $reply['content'] .= "<span class=\"hlFeed\">
- (<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
- $line["feed_title"]."</a>)
- </span>";
- }
- }
-
$reply['content'] .= "</div>";
- $reply['content'] .= "<span class=\"hlUpdated\">$updated_fmt</span>";
+ $reply['content'] .= "<span class=\"hlUpdated\">";
+
+ if (@$line["feed_title"]) {
+ $reply['content'] .= "<div class=\"hlFeed\">
+ <a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+ $line["feed_title"]."</a>
+ </div>";
+ }
+
+ $reply['content'] .= "$updated_fmt</span>";
$reply['content'] .= "<div class=\"hlRight\">";
$reply['content'] .= $score_pic;
unset($line["tag_cache"]);
$line["content"] = sanitize($this->link, $line["content_preview"],
- false, false, $feed_site_url);
+ sql_bool_to_bool($line['hide_images']), false, $entry_site_url);
foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_CDM) as $p) {
$line = $p->hook_render_article_cdm($line);
$cur_feed_title = htmlspecialchars($cur_feed_title);
- $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
+ $vf_catchup_link = "(<a class='catchup' onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
$has_feed_icon = feed_has_icon($feed_id);
$reply['content'] .= "<div class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>".
- "<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+ "<a href=\"#\" class='title' onclick=\"viewfeed($feed_id)\">".
$line["feed_title"]."</a> $vf_catchup_link</div>";
}
}
- $expand_cdm = get_pref($this->link, 'CDM_EXPANDED');
-
$mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
- $reply['content'] .= "<div class=\"$class\" $label_row_style
+ $expanded_class = $expand_cdm ? "expanded" : "";
+
+ $reply['content'] .= "<div class=\"cdm $expanded_class $class\"
id=\"RROW-$id\" $mouseover_attrs'>";
$reply['content'] .= "<div class=\"cdmHeader\">";
- $reply['content'] .= "<div>";
+ $reply['content'] .= "<div style=\"vertical-align : middle\">";
$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
- type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"
+ type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\"
id=\"RCHK-$id\">";
$reply['content'] .= "$marked_pic";
target=\"_blank\" href=\"".
htmlspecialchars($line["link"])."\">".
$line["title"] .
- " $entry_author</a>";
+ " <span class=\"author\">$entry_author</span></a>";
$reply['content'] .= $labels_str;
- if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED') &&
- defined('_SHOW_FEED_TITLE_IN_VFEEDS')) {
- if (@$line["feed_title"]) {
- $reply['content'] .= "<span class=\"hlFeed\">
- (<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
- $line["feed_title"]."</a>)
- </span>";
- }
- }
+ $reply['content'] .= "<span class='collapseBtn' style='display : none'>
+ <img src=\"images/collapse.png\" onclick=\"cdmCollapseArticle(event, $id)\"
+ title=\"".__("Collapse article")."\"/></span>";
if (!$expand_cdm)
$content_hidden = "style=\"display : none\"";
$reply['content'] .= "<span $excerpt_hidden
id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>";
-
$reply['content'] .= "</span>";
- $reply['content'] .= "<div>";
+ if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+ if (@$line["feed_title"]) {
+ $reply['content'] .= "<div class=\"hlFeed\">
+ <a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+ $line["feed_title"]."</a>
+ </div>";
+ }
+ }
+
$reply['content'] .= "<span class='updated'>$updated_fmt</span>";
+
+ $reply['content'] .= "<div style=\"vertical-align : middle\">";
$reply['content'] .= "$score_pic";
if (!get_pref($this->link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
onclick=\"return cdmClicked(event, $id);\"
id=\"CICD-$id\">";
+ $reply['content'] .= "<div id=\"POSTNOTE-$id\">";
+ if ($line['note']) {
+ $reply['content'] .= format_article_note($id, $line['note']);
+ }
+ $reply['content'] .= "</div>";
+
+
$reply['content'] .= "<div class=\"cdmContentInner\">";
if ($line["orig_feed_id"]) {
}
}
- $feed_site_url = $line["site_url"];
+ $reply['content'] .= "<span id=\"CWRAP-$id\">";
- if ($cache_content && $line["cached_content"] != "") {
- $line["content_preview"] =& $line["cached_content"];
- }
+ if (!$expand_cdm) {
+ $reply['content'] .= "<span id=\"CENCW-$id\">";
+ $reply['content'] .= htmlspecialchars($line["content"]);
+ $reply['content'] .= "</span.";
- $reply['content'] .= "<div id=\"POSTNOTE-$id\">";
- if ($line['note']) {
- $reply['content'] .= format_article_note($id, $line['note']);
+ } else {
+ $reply['content'] .= $line["content"];
}
- $reply['content'] .= "</div>";
- $reply['content'] .= "<span id=\"CWRAP-$id\">";
- $reply['content'] .= $line["content"];
$reply['content'] .= "</span>";
-/* $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM
- ttrss_feeds WHERE id = ".
- (($line['feed_id'] == null) ? $line['orig_feed_id'] :
- $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
-
- $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result,
- 0, "always_display_enclosures")); */
-
$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
$reply['content'] .= format_article_enclosures($this->link, $id, $always_display_enclosures,
$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
$vgroup_last_feed, $override_order, true);
- $topmost_article_ids = $ret[0];
+ //$topmost_article_ids = $ret[0];
$headlines_count = $ret[1];
$returned_feed = $ret[2];
$disable_cache = $ret[3];
"vgroup_last_feed" => $vgroup_last_feed,
"disable_cache" => (bool) $disable_cache);
- if ($_REQUEST["debug"]) $timing_info = print_checkpoint("20", $timing_info);
-
- if (is_array($topmost_article_ids) && !get_pref($this->link, 'COMBINED_DISPLAY_MODE') && !$_SESSION["bw_limit"]) {
- $articles = array();
-
- foreach ($topmost_article_ids as $id) {
- array_push($articles, format_article($this->link, $id, false));
- }
-
- $reply['articles'] = $articles;
- }
-
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("30", $timing_info);
$reply['runtime-info'] = make_runtime_info($this->link);
return $reply;
}
-
}
?>
git.wh0rd.org / tt-rss.git / blobdiff