}
private function format_headline_subtoolbar($feed_site_url, $feed_title,
- $feed_id, $is_cat, $search, $match_on,
+ $feed_id, $is_cat, $search,
$search_mode, $view_mode, $error) {
$page_prev_link = "viewFeedGoPage(-1)";
if ($is_cat) $cat_q = "&is_cat=$is_cat";
if ($search) {
- $search_q = "&q=$search&m=$match_on&smode=$search_mode";
+ $search_q = "&q=$search&smode=$search_mode";
} else {
$search_q = "";
}
"</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>";
$reply = array();
- $timing_info = getmicrotime();
+ $timing_info = microtime(true);
$topmost_article_ids = array();
// 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 {
}
}
- if (is_numeric($feed) && $feed > 0) {
-
- $result = db_query($this->link, "SELECT rtl_content FROM ttrss_feeds
- WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
-
- if (db_num_rows($result) == 1) {
- $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
- } else {
- $rtl_content = false;
- }
-
- if ($rtl_content) {
- $rtl_tag = "dir=\"RTL\"";
- } else {
- $rtl_tag = "";
- }
- } else {
- $rtl_tag = "";
- $rtl_content = false;
- }
-
- @$search = db_escape_string($_REQUEST["query"]);
+ @$search = db_escape_string($this->link, $_REQUEST["query"]);
if ($search) {
$disable_cache = true;
}
- @$search_mode = db_escape_string($_REQUEST["search_mode"]);
- $match_on = "both"; // deprecated, TODO: remove
+ @$search_mode = db_escape_string($this->link, $_REQUEST["search_mode"]);
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
$search_mode = $method;
}
// error_log("search_mode: " . $search_mode);
- $qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,
- $search, $search_mode, $match_on, $override_order, $offset, 0,
- false, 0, $include_children);
+
+ if (!$cat_view && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX) {
+ global $pluginhost;
+
+ $handler = $pluginhost->get_feed_handler(
+ PluginHost::feed_to_pfeed_id($feed));
+
+ // function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false) {
+
+ if ($handler) {
+ $options = array(
+ "limit" => $limit,
+ "view_mode" => $view_mode,
+ "cat_view" => $cat_view,
+ "search" => $search,
+ "search_mode" => $search_mode,
+ "override_order" => $override_order,
+ "offset" => $offset,
+ "owner_uid" => $_SESSION["uid"],
+ "filter" => false,
+ "since_id" => 0,
+ "include_children" => $include_children);
+
+ $qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed),
+ $options);
+ }
+
+ } else {
+ $qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,
+ $search, $search_mode, $override_order, $offset, 0,
+ false, 0, $include_children);
+ }
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
$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;
$reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,
$feed_title,
- $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
+ $feed, $cat_view, $search, $search_mode, $view_mode,
$last_error);
$headlines_count = db_num_rows($result);
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";
if ($line["marked"] == "t" || $line["marked"] == "1") {
$marked_pic = "<img id=\"FMPIC-$id\"
- src=\"".theme_image($this->link, 'images/mark_set.svg')."\"
+ src=\"images/mark_set.svg\"
class=\"markedPic\" alt=\"Unstar article\"
onclick='javascript:toggleMark($id)'>";
} else {
$marked_pic = "<img id=\"FMPIC-$id\"
- src=\"".theme_image($this->link, 'images/mark_unset.svg')."\"
+ src=\"images/mark_unset.svg\"
class=\"markedPic\" alt=\"Star article\"
onclick='javascript:toggleMark($id)'>";
}
if ($line["published"] == "t" || $line["published"] == "1") {
- $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,
- 'images/pub_set.svg')."\"
+ $published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_set.svg\"
class=\"markedPic\"
alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>";
} else {
- $published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,
- 'images/pub_unset.svg')."\"
+ $published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_unset.svg\"
class=\"markedPic\"
alt=\"Publish article\" onclick='javascript:togglePub($id)'>";
}
# $content_link = "<a href=\"javascript:viewContentUrl('".$line["link"]."');\">" .
# $line["title"] . "</a>";
- $updated_fmt = make_local_datetime($this->link, $line["updated_noms"], false);
+ $updated_fmt = make_local_datetime($this->link, $line["updated"], false);
+ $date_entered_fmt = T_sprintf("Imported at %s",
+ make_local_datetime($this->link, $line["date_entered"], false));
if (get_pref($this->link, 'SHOW_CONTENT_PREVIEW')) {
$content_preview = truncate_string(strip_tags($line["content_preview"]),
$score = $line["score"];
- $score_pic = theme_image($this->link,
- "images/" . get_score_pic($score));
+ $score_pic = "images/" . get_score_pic($score);
/* $score_title = __("(Click to change)");
$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
$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>";
}
}
- $mouseover_attrs = "onmouseover='postMouseIn($id)'
+ $mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
onmouseout='postMouseOut($id)'";
$reply['content'] .= "<div class='$class' id='RROW-$id' $label_row_style $mouseover_attrs>";
$reply['content'] .= $labels_str;
- if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED') &&
- defined('_SHOW_FEED_TITLE_IN_VFEEDS')) {
+ $reply['content'] .= "</div>";
+
+ $reply['content'] .= "<span class=\"hlUpdated\">";
+
+ if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
if (@$line["feed_title"]) {
- $reply['content'] .= "<span class=\"hlFeed\">
-
(<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
- $line["feed_title"]."</a>)
- </span>";
+ $reply['content'] .= "<div class=\"hlFeed\">
+ <a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+ truncate_string($line["feed_title"],30)."</a>
+ </div>";
}
}
- $reply['content'] .= "</div>";
+ $reply['content'] .= "<span title='$date_entered_fmt'>$updated_fmt</span>
+ </span>";
- $reply['content'] .= "<span class=\"hlUpdated\">$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)'
+ $mouseover_attrs = "onmouseover='postMouseIn(event, $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";
$reply['content'] .= "</div>";
- $reply['content'] .= "<div id=\"PTITLE-FULL-$id\" style=\"display : none\">" .
- htmlspecialchars(strip_tags($line['title'])) . "</div>";
-
$reply['content'] .= "<span id=\"RTITLE-$id\"
onclick=\"return cdmClicked(event, $id);\"
class=\"titleWrap$hlc_suffix\">
<a class=\"title\"
- title=\"".htmlspecialchars($line['title'])."\"
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>";
- $reply['content'] .= "<span class='updated'>$updated_fmt</span>";
+ if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+ if (@$line["feed_title"]) {
+ $reply['content'] .= "<div class=\"hlFeed\">
+ <a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+ truncate_string($line["feed_title"],30)."</a>
+ </div>";
+ }
+ }
+
+ $reply['content'] .= "<span class='updated' title='$date_entered_fmt'>
+ $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\" style=\"display : none\">";
+ $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']);
- }
- $reply['content'] .= "</div>";
+// } else {
+// $reply['content'] .= $line["content"];
+// }
- $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,
- $line["content"]);
+ $reply['content'] .= format_article_enclosures($this->link, $id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
$reply['content'] .= "</div>";
$reply['content'] .= "<div class=\"cdmFooter\">";
- $tags_str = format_tags_string($tags, $id);
+ $tags_str = format_tags_string($line["tags"], $id);
- $reply['content'] .= "<img src='".theme_image($this->link,
- 'images/tag.png')."' alt='Tags' title='Tags'>
+ $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, $feed_id, true)\">(+)</a>";
$message = __("No starred articles found to display.");
break;
default:
- if ($feed < -10) {
+ if ($feed < LABEL_BASE_INDEX) {
$message = __("No articles found to display. You can assign articles to labels manually (see the Actions menu above) or use a filter.");
} else {
$message = __("No articles found to display.");
if (!$offset && $message) {
$reply['content'] .= "<div class='whiteBox'>$message";
- $reply['content'] .= "<p class=\"small\"><span class=\"insensitive\">";
+ $reply['content'] .= "<p><span class=\"insensitive\">";
$result = db_query($this->link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']);
function catchupAll() {
db_query($this->link, "UPDATE ttrss_user_entries SET
- last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);
+ last_read = NOW(), unread = false WHERE unread = true AND owner_uid = " . $_SESSION["uid"]);
ccache_zero_all($this->link, $_SESSION["uid"]);
}
- function collapse() {
- $cat_id = db_escape_string($_REQUEST["cid"]);
- $mode = (int) db_escape_string($_REQUEST['mode']);
- toggle_collapse_cat($this->link, $cat_id, $mode);
- }
-
function view() {
- $timing_info = getmicrotime();
+ $timing_info = microtime(true);
$reply = array();
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("0", $timing_info);
- $omode = db_escape_string($_REQUEST["omode"]);
+ $omode = db_escape_string($this->link, $_REQUEST["omode"]);
- $feed = db_escape_string($_REQUEST["feed"]);
- $method = db_escape_string($_REQUEST["m"]);
- $view_mode = db_escape_string($_REQUEST["view_mode"]);
+ $feed = db_escape_string($this->link, $_REQUEST["feed"]);
+ $method = db_escape_string($this->link, $_REQUEST["m"]);
+ $view_mode = db_escape_string($this->link, $_REQUEST["view_mode"]);
$limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT");
@$cat_view = $_REQUEST["cat"] == "true";
- @$next_unread_feed = db_escape_string($_REQUEST["nuf"]);
- @$offset = db_escape_string($_REQUEST["skip"]);
- @$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
- $order_by = db_escape_string($_REQUEST["order_by"]);
+ @$next_unread_feed = db_escape_string($this->link, $_REQUEST["nuf"]);
+ @$offset = db_escape_string($this->link, $_REQUEST["skip"]);
+ @$vgroup_last_feed = db_escape_string($this->link, $_REQUEST["vgrlf"]);
+ $order_by = db_escape_string($this->link, $_REQUEST["order_by"]);
if (is_numeric($feed)) $feed = (int) $feed;
$result = false;
- if ($feed < -10) {
- $label_feed = -11-$feed;
+ if ($feed < LABEL_BASE_INDEX) {
+ $label_feed = feed_to_label_id($feed);
$result = db_query($this->link, "SELECT id FROM ttrss_labels2 WHERE
id = '$label_feed' AND owner_uid = " . $_SESSION['uid']);
} else if (!$cat_view && is_numeric($feed) && $feed > 0) {
set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);
set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);
+ /* bump login timestamp if needed */
+ if (time() - $_SESSION["last_login_update"] > 3600) {
+ db_query($this->link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
+ $_SESSION["uid"]);
+ $_SESSION["last_login_update"] = time();
+ }
+
if (!$cat_view && is_numeric($feed) && $feed > 0) {
db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()
WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
$override_order = false;
- if (get_pref($this->link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
- $date_sort_field = "updated";
- } else {
- $date_sort_field = "date_entered";
- }
-
switch ($order_by) {
- case "date":
- if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
- $override_order = "$date_sort_field";
- } else {
- $override_order = "$date_sort_field DESC";
- }
+ case "date_reverse":
+ $override_order = "date_entered DESC, updated";
break;
-
- case "title":
- if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
- $override_order = "title DESC, $date_sort_field";
- } else {
- $override_order = "title, $date_sort_field DESC";
- }
- break;
-
- case "score":
- if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
- $override_order = "score, $date_sort_field";
- } else {
- $override_order = "score DESC, $date_sort_field DESC";
- }
+ case "feed_dates":
+ $override_order = "updated DESC";
break;
}
$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);
$reply['headlines']['toolbar'] = '';
$reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');
- $reply['headlines']['content'] .= "<p class=\"small\"><span class=\"insensitive\">";
+ $reply['headlines']['content'] .= "<p><span class=\"insensitive\">";
$result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']);
return $reply;
}
-
}
?>
git.wh0rd.org / tt-rss.git / blobdiff