if (DB_TYPE == "pgsql") {
/* $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
marked = false AND feed_id = '$feed_id' AND
- (SELECT date_entered FROM ttrss_entries WHERE
+ (SELECT date_updated FROM ttrss_entries WHERE
id = ref_id) < NOW() - INTERVAL '$purge_interval days'"); */
$pg_version = get_pgsql_version($link);
marked = false AND
feed_id = '$feed_id' AND
$query_limit
- ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
+ ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
} else {
marked = false AND
feed_id = '$feed_id' AND
$query_limit
- ttrss_entries.date_entered < NOW() - INTERVAL '$purge_interval days'");
+ ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
}
$rows = pg_affected_rows($result);
/* $result = db_query($link, "DELETE FROM ttrss_user_entries WHERE
marked = false AND feed_id = '$feed_id' AND
- (SELECT date_entered FROM ttrss_entries WHERE
+ (SELECT date_updated FROM ttrss_entries WHERE
id = ref_id) < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)"); */
$result = db_query($link, "DELETE FROM ttrss_user_entries
marked = false AND
feed_id = '$feed_id' AND
$query_limit
- ttrss_entries.date_entered < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
+ ttrss_entries.date_updated < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
$rows = mysql_affected_rows($link);
$site_url = $rss->channel["link"];
}
- if (get_pref($link, 'ENABLE_FEED_ICONS', $owner_uid, false)) {
- if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
- _debug("update_rss_feed: checking favicon...");
- }
-
- check_feed_favicon($site_url, $feed, $link);
+ if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+ _debug("update_rss_feed: checking favicon...");
}
+ check_feed_favicon($site_url, $feed, $link);
+
if (!$registered_title || $registered_title == "[Unknown]") {
if ($use_simplepie) {
content,
content_hash,
no_orig_date,
+ date_updated,
date_entered,
comments,
num_comments,
'$entry_content',
'$content_hash',
$no_orig_date,
- NOW(),
+ NOW(),
+ NOW(),
'$entry_comments',
'$num_comments',
'$entry_author')");
} else {
// we keep encountering the entry in feeds, so we need to
- // update date_entered column so that we don't get horrible
+ // update date_updated column so that we don't get horrible
// dupes when the entry gets purged and reinserted again e.g.
// in the case of SLOW SLOW OMG SLOW updating feeds
$base_entry_id = db_fetch_result($result, 0, "id");
- db_query($link, "UPDATE ttrss_entries SET date_entered = NOW()
+ db_query($link, "UPDATE ttrss_entries SET date_updated = NOW()
WHERE id = '$base_entry_id'");
}
$result = db_query($link, "SELECT
id,content_hash,no_orig_date,title,
- ".SUBSTRING_FOR_DATE."(date_entered,1,19) as date_entered,
+ ".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated,
".SUBSTRING_FOR_DATE."(updated,1,19) as updated,
num_comments
FROM
$orig_content_hash = db_fetch_result($result, 0, "content_hash");
$orig_title = db_fetch_result($result, 0, "title");
$orig_num_comments = db_fetch_result($result, 0, "num_comments");
- $orig_date_entered = strtotime(db_fetch_result($result,
- 0, "date_entered"));
+ $orig_date_updated = strtotime(db_fetch_result($result,
+ 0, "date_updated"));
$ref_id = db_fetch_result($result, 0, "id");
$entry_ref_id = $ref_id;
print $color_str; */
print "<li id=\"FEEDR-$feed_id\" class=\"$class\">";
- if (get_pref($link, 'ENABLE_FEED_ICONS')) {
- print "$feed_icon";
- }
-
+ print "$feed_icon";
print "<span $rtl_tag id=\"FEEDN-$feed_id\">$feed</span>";
if ($unread != 0) {
}
}
}
- return false;
+ return '';
}
function getAllCounters($link, $omode = "flc", $active_feed = false) {
if (!$omode) $omode = "flc";
-
- getGlobalCounters($link);
- getVirtCounters($link);
- if (strchr($omode, "l")) getLabelCounters($link);
- if (strchr($omode, "f")) getFeedCounters($link, $active_feed);
- if (strchr($omode, "t")) getTagCounters($link);
+ $data = getGlobalCounters($link);
+
+ $data = array_merge($data, getVirtCounters($link));
+
+ if (strchr($omode, "l")) $data = array_merge($data, getLabelCounters($link));
+ if (strchr($omode, "f")) $data = array_merge($data, getFeedCounters($link, $active_feed));
+ if (strchr($omode, "t")) $data = array_merge($data, getTagCounters($link));
if (strchr($omode, "c")) {
if (get_pref($link, 'ENABLE_FEED_CATS')) {
- getCategoryCounters($link);
+ $data = array_merge($data, getCategoryCounters($link));
}
}
+
+ return $data;
}
function getCategoryCounters($link) {
- # two special categories are -1 and -2 (all virtuals; all labels)
-
-/* $ctr = getCategoryUnread($link, -1);
+ $ret_arr = array();
- print "<counter type=\"category\" id=\"-1\" counter=\"$ctr\"/>"; */
+ /* Labels category */
- $ctr = getCategoryUnread($link, -2);
+ $cv = array("id" => -2, "cat" => true,
+ "counter" => getCategoryUnread($link, -2));
- print "<counter type=\"category\" id=\"-2\" counter=\"$ctr\"/>";
+ array_push($ret_arr, $cv);
$age_qpart = getMaxAgeSubquery();
while ($line = db_fetch_assoc($result)) {
$line["cat_id"] = (int) $line["cat_id"];
- print "<counter type=\"category\" id=\"".$line["cat_id"]."\" counter=\"".
- $line["unread"]."\"/>";
+ $cv = array("id" => $line["cat_id"], "cat" => true,
+ "counter" => $line["unread"]);
+
+ array_push($ret_arr, $cv);
}
/* Special case: NULL category doesn't actually exist in the DB */
- print "<counter type=\"category\" id=\"0\" counter=\"".
- ccache_find($link, 0, $_SESSION["uid"], true)."\"/>";
+ $cv = array("id" => 0, "cat" => true,
+ "counter" => ccache_find($link, 0, $_SESSION["uid"], true));
+
+ array_push($ret_arr, $cv);
+ return $ret_arr;
}
function getCategoryUnread($link, $cat, $owner_uid = false) {
function getMaxAgeSubquery($days = COUNTERS_MAX_AGE) {
if (DB_TYPE == "pgsql") {
- return "ttrss_entries.date_entered >
+ return "ttrss_entries.date_updated >
NOW() - INTERVAL '$days days'";
} else {
- return "ttrss_entries.date_entered >
+ return "ttrss_entries.date_updated >
DATE_SUB(NOW(), INTERVAL $days DAY)";
}
}
}
function getGlobalCounters($link, $global_unread = -1) {
+ $ret_arr = array();
+
if ($global_unread == -1) {
$global_unread = getGlobalUnread($link);
}
- print "<counter type=\"global\" id='global-unread'
- counter='$global_unread'/>";
+
+ $cv = array("id" => "global-unread",
+ "counter" => $global_unread);
+
+ array_push($ret_arr, $cv);
$result = db_query($link, "SELECT COUNT(id) AS fn FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
$subscribed_feeds = db_fetch_result($result, 0, "fn");
- print "<counter type=\"global\" id='subscribed-feeds'
- counter='$subscribed_feeds'/>";
+ $cv = array("id" => "subscribed-feeds",
+ "counter" => $subscribed_feeds);
+ array_push($ret_arr, $cv);
+
+ return $ret_arr;
}
function getSubscribedFeeds($link) {
}
function getTagCounters($link) {
+
+ $ret_arr = array();
$age_qpart = getMaxAgeSubquery();
foreach (array_keys($tags) as $tag) {
$unread = $tags[$tag];
$tag = htmlspecialchars($tag);
- print "<counter type=\"tag\" id=\"$tag\" counter=\"$unread\"/>";
- }
+
+ $cv = array("id" => $tag,
+ "tag" => true,
+ "counter" => $unread);
+
+ array_push($ret_arr, $cv);
+ }
+
+ return $ret_arr;
}
- function getVirtCounters($link, $ret_mode = false) {
+ function getVirtCounters($link) {
$ret_arr = array();
for ($i = 0; $i >= -4; $i--) {
$count = getFeedUnread($link, $i);
+
+ $cv = array("id" => $i,
+ "counter" => $count,
+ "description" => getFeedTitle($link, $i));
- if (!$ret_mode) {
-
- if (get_pref($link, 'EXTENDED_FEEDLIST')) {
- $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $i) . " total)\"";
- } else {
- $xmsg_part = "";
- }
+ if (get_pref($link, 'EXTENDED_FEEDLIST'))
+ $cv["xmsg"] = getFeedArticles($link, $i)." ".__("total");
- print "<counter type=\"label\" id=\"$i\" counter=\"$count\" $xmsg_part/>";
- } else {
- $ret_arr[$i]["counter"] = $count;
- $ret_arr[$i]["description"] = getFeedTitle($link, $i);
- }
+ array_push($ret_arr, $cv);
}
return $ret_arr;
}
- function getLabelCounters($link, $ret_mode = false) {
+ function getLabelCounters($link) {
+
+ $ret_arr = array();
$age_qpart = getMaxAgeSubquery();
$label_name = $line["caption"];
$count = getFeedUnread($link, $id);
-
- if (!$ret_mode) {
- if (get_pref($link, 'EXTENDED_FEEDLIST')) {
- $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
- } else {
- $xmsg_part = "";
- }
+ $cv = array("id" => $id,
+ "counter" => $count,
+ "description" => $label_name);
- print "<counter type=\"label\" id=\"$id\" counter=\"$count\" $xmsg_part/>";
+ if (get_pref($link, 'EXTENDED_FEEDLIST'))
+ $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
- } else {
- $ret_arr[$id]["counter"] = $count;
- $ret_arr[$id]["description"] = $label_name;
- }
+ array_push($ret_arr, $cv);
}
return $ret_arr;
function getFeedCounters($link, $active_feed = false) {
+ $ret_arr = array();
+
$age_qpart = getMaxAgeSubquery();
$query = "SELECT ttrss_feeds.id,
$last_updated = date($short_date, strtotime($line["last_updated"]));
}
- $last_updated = htmlspecialchars($last_updated);
-
$has_img = feed_has_icon($id);
$tmp_result = db_query($link,
$count += db_fetch_result($tmp_result, 0, "unread");
- if ($last_error) {
- $error_part = "error=\"$last_error\"";
- } else {
- $error_part = "";
- }
+ $cv = array("id" => $id,
+ "updated" => $last_updated,
+ "counter" => $count,
+ "has_img" => (int) $has_img);
- if ($has_img) {
- $has_img_part = "hi=\"$has_img\"";
- } else {
- $has_img_part = "";
- }
+ if ($last_error)
+ $cv["error"] = $last_error;
- if ($active_feed && $id == $active_feed) {
- $has_title_part = "title=\"" . htmlspecialchars($line["title"]) . "\"";
- } else {
- $has_title_part = "";
- }
+ if (get_pref($link, 'EXTENDED_FEEDLIST'))
+ $cv["xmsg"] = getFeedArticles($link, $id)." ".__("total");
- if (get_pref($link, 'EXTENDED_FEEDLIST')) {
- $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
- }
+ if ($active_feed && $id == $active_feed)
+ $cv["title"] = $line["title"];
+
+ array_push($ret_arr, $cv);
- print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $xmsg_part $has_title_part/>";
}
+
+ return $ret_arr;
}
function get_script_dt_add() {
-/* if (strpos(VERSION, ".99") === false) {
- return VERSION;
- } else {
- return time();
- } */
return time();
}
return ((!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME);
}
- function print_init_params($link) {
- print "<init-params>";
- if ($_SESSION["stored-params"]) {
- foreach (array_keys($_SESSION["stored-params"]) as $key) {
- if ($key) {
- $value = htmlspecialchars($_SESSION["stored-params"][$key]);
- print "<param key=\"$key\" value=\"$value\"/>";
- }
- }
- }
-
- print "<param key=\"theme\" value=\"".get_user_theme($link)."\"/>";
- print "<param key=\"theme_options\" value=\"".get_user_theme_options($link)."\"/>";
- print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
- print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
- print "<param key=\"daemon_refresh_only\" value=\"true\"/>";
-
- print "<param key=\"sign_progress\" value=\"".
- theme_image($link, "images/indicator_white.gif")."\"/>";
-
- print "<param key=\"sign_progress_tiny\" value=\"".
- theme_image($link, "images/indicator_tiny.gif")."\"/>";
-
- print "<param key=\"sign_excl\" value=\"".
- theme_image($link, "images/sign_excl.png")."\"/>";
-
- print "<param key=\"sign_info\" value=\"".
- theme_image($link, "images/sign_info.png")."\"/>";
-
- print "<param key=\"on_catchup_show_next_feed\" value=\"" .
- get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
-
- print "<param key=\"hide_read_feeds\" value=\"" .
- (int) get_pref($link, "HIDE_READ_FEEDS") . "\"/>";
+ function make_init_param($param, $value) {
+ return array("param" => $param, "value" => $value);
+ }
- print "<param key=\"enable_feed_cats\" value=\"" .
- (int) get_pref($link, "ENABLE_FEED_CATS") . "\"/>";
+ function print_init_params($link) {
+ print "<init-params><![CDATA[";
- print "<param key=\"feeds_sort_by_unread\" value=\"" .
- (int) get_pref($link, "FEEDS_SORT_BY_UNREAD") . "\"/>";
+ $params = array();
- print "<param key=\"confirm_feed_catchup\" value=\"" .
- (int) get_pref($link, "CONFIRM_FEED_CATCHUP") . "\"/>";
+ array_push($params, make_init_param("theme", get_user_theme($link)));
+ array_push($params, make_init_param("theme_options", get_user_theme_options($link)));
+ array_push($params, make_init_param("daemon_enabled", ENABLE_UPDATE_DAEMON));
+ array_push($params, make_init_param("feeds_frame_refresh", FEEDS_FRAME_REFRESH));
+ array_push($params, make_init_param("daemon_refresh_only", true));
- print "<param key=\"cdm_auto_catchup\" value=\"" .
- (int) get_pref($link, "CDM_AUTO_CATCHUP") . "\"/>";
+ array_push($params, make_init_param("sign_progress",
+ theme_image($link, "images/indicator_white.gif")));
- print "<param key=\"fresh_article_max_age\" value=\"" .
- (int) get_pref($link, "FRESH_ARTICLE_MAX_AGE") . "\"/>";
+ array_push($params, make_init_param("sign_progress_tiny",
+ theme_image($link, "images/indicator_white.gif")));
- print "<param key=\"icons_url\" value=\"" . ICONS_URL . "\"/>";
+ array_push($params, make_init_param("sign_excl",
+ theme_image($link, "images/sign_excl.png")));
- print "<param key=\"cookie_lifetime\" value=\"" . SESSION_COOKIE_LIFETIME . "\"/>";
+ array_push($params, make_init_param("sign_info",
+ theme_image($link, "images/sign_info.png")));
- print "<param key=\"default_view_mode\" value=\"" .
- get_pref($link, "_DEFAULT_VIEW_MODE") . "\"/>";
+ foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
+ "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
+ "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
+ "HIDE_READ_SHOWS_SPECIAL", "HIDE_FEEDLIST") as $param) {
- print "<param key=\"default_view_limit\" value=\"" .
- (int) get_pref($link, "_DEFAULT_VIEW_LIMIT") . "\"/>";
+ array_push($params, make_init_param(strtolower($param),
+ (int) get_pref($link, $param)));
+ }
- print "<param key=\"default_view_order_by\" value=\"" .
- get_pref($link, "_DEFAULT_VIEW_ORDER_BY") . "\"/>";
+ array_push($params, make_init_param("icons_url", ICONS_URL));
- print "<param key=\"prefs_active_tab\" value=\"" .
- get_pref($link, "_PREFS_ACTIVE_TAB") . "\"/>";
+ array_push($params, make_init_param("cookie_lifetime", SESSION_COOKIE_LIFETIME));
- print "<param key=\"infobox_disable_overlay\" value=\"" .
- get_pref($link, "_INFOBOX_DISABLE_OVERLAY") . "\"/>";
+ array_push($params, make_init_param("default_view_mode",
+ get_pref($link, "_DEFAULT_VIEW_MODE")));
- print "<param key=\"icons_location\" value=\"" .
- ICONS_URL . "\"/>";
+ array_push($params, make_init_param("default_view_limit",
+ (int) get_pref($link, "_DEFAULT_VIEW_LIMIT")));
- print "<param key=\"hide_read_shows_special\" value=\"" .
- (int) get_pref($link, "HIDE_READ_SHOWS_SPECIAL") . "\"/>";
+ array_push($params, make_init_param("default_view_order_by",
+ get_pref($link, "_DEFAULT_VIEW_ORDER_BY")));
- print "<param key=\"hide_feedlist\" value=\"" .
- (int) get_pref($link, "HIDE_FEEDLIST") . "\"/>";
+ array_push($params, make_init_param("prefs_active_tab",
+ get_pref($link, "_PREFS_ACTIVE_TAB")));
- print "<param key=\"bw_limit\" value=\"".
- (int) $_SESSION["bw_limit"]."\"/>";
+ array_push($params, make_init_param("infobox_disable_overlay",
+ get_pref($link, "_INFOBOX_DISABLE_OVERLAY")));
-// print "<param key=\"sync_counters\" value=\"" .
-// (int) get_pref($link, "SYNC_COUNTERS") . "\"/>";
+ array_push($params, make_init_param("bw_limit",
+ (int) $_SESSION["bw_limit"]));
- print "<param key=\"sync_counters\" value=\"1\"/>";
+ array_push($params, make_init_param("sync_counters", 1));
- print "<param key=\"offline_enabled\" value=\"".
- (int) get_pref($link, "ENABLE_OFFLINE_READING") . "\"/>";
+ array_push($params, make_init_param("offline_enabled",
+ (int) get_pref($link, "ENABLE_OFFLINE_READING")));
$result = db_query($link, "SELECT COUNT(*) AS cf FROM
ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
$num_feeds = db_fetch_result($result, 0, "cf");
- print "<param key=\"num_feeds\" value=\"".
- (int)$num_feeds. "\"/>";
+ array_push($params, make_init_param("num_feeds",
+ (int) $num_feeds));
- print "<param key=\"collapsed_feedlist\" value=\"" .
- (int) get_pref($link, "_COLLAPSED_FEEDLIST") . "\"/>";
+ array_push($params, make_init_param("collapsed_feedlist",
+ (int) get_pref($link, "_COLLAPSED_FEEDLIST")));
- print "</init-params>";
+ print json_encode($params);
+
+ print "]]></init-params>";
}
function print_runtime_info($link) {
if ($view_mode == "marked") {
$view_query_part = " marked = true AND ";
}
-
+
+ if ($view_mode == "published") {
+ $view_query_part = " published = true AND ";
+ }
+
if ($view_mode == "unread") {
$view_query_part = " unread = true AND ";
}
}
if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
- $order_by = "updated";
+ $order_by = "date_entered";
} else {
- $order_by = "updated DESC";
+ $order_by = "date_entered DESC";
}
if ($view_mode != "noscores") {
}
$query = "SELECT DISTINCT
+ date_entered,
guid,
ttrss_entries.id,ttrss_entries.title,
updated,
}
function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat,
- $limit, $search, $search_mode, $match_on) {
+ $limit, $search, $search_mode, $match_on, $view_mode = false) {
$note_style = "float : right; background-color : #fff7d5; border-width : 1px; ".
"padding : 5px; border-style : dashed; border-color : #e7d796;".
if (!$limit) $limit = 30;
$qfh_ret = queryFeedHeadlines($link, $feed,
- $limit, false, $is_cat, $search, $search_mode, $match_on, "updated DESC", 0,
- $owner_uid);
+ $limit, $view_mode, $is_cat, $search, $search_mode,
+ $match_on, "date_entered DESC", 0, $owner_uid);
$result = $qfh_ret[0];
$feed_title = htmlspecialchars($qfh_ret[1]);
print sanitize_rss($link, $line["content_preview"], false, $owner_uid);
print "]]></description>";
-
+
+ $enclosures = get_article_enclosures($link, $line["id"]);
+
+ foreach ($enclosures as $e) {
+ $type = htmlspecialchars($e['content_type']);
+ $url = htmlspecialchars($e['content_url']);
+ $length = $e['duration'];
+ print "<enclosure url=\"$url\" type=\"$type\" length=\"$length\"/>";
+ }
+
print "</item>";
}
$affected_ids = array();
if (DB_TYPE == "pgsql") {
- $interval_query = "ttrss_entries.date_entered > NOW() - INTERVAL '$days days'";
+ $interval_query = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
} else if (DB_TYPE == "mysql") {
- $interval_query = "ttrss_entries.date_entered > DATE_SUB(NOW(), INTERVAL $days DAY)";
+ $interval_query = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
}
$result = db_query($link, "SELECT ttrss_entries.title,
ttrss_feeds.title AS feed_title,
- date_entered,
+ date_updated,
ttrss_user_entries.ref_id,
link,
SUBSTRING(content, 1, 120) AS excerpt,
AND $interval_query
AND ttrss_user_entries.owner_uid = $user_id
AND unread = true
- ORDER BY ttrss_feeds.title, date_entered DESC
+ ORDER BY ttrss_feeds.title, date_updated DESC
LIMIT $limit");
$cur_feed_title = "";
function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
$feed_id, $is_cat, $search, $match_on,
- $search_mode) {
+ $search_mode, $view_mode) {
print "<div class=\"headlinesSubToolbar\">";
if (!$bottom) {
$target = "target=\"_blank\"";
}
- print "<a $target href=\"$feed_site_url\">".
+ print "<a title=\"".__("Visit the website")."\"$target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>";
} else {
if ($feed_id < -10) {
$search_q = "&q=$search&m=$match_on&smode=$search_mode";
}
+ $rss_link = "backend.php?op=rss&id=$feed_id&is_cat=$is_cat&view-mode=$view_mode$search_q";
+
print "
- <a target=\"_blank\"
- href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
- <img class=\"noborder\"
- alt=\"".__('Generated feed')."\" src=\"images/feed-icon-12x12.png\">
- </a>";
+ <a target=\"_blank\"
+ title=\"".__("View as RSS feed")."\"
+ href=\"$rss_link\">
+ <img class=\"noborder\" src=\"images/feed-icon-12x12.png\"></a>";
print "</div>";
print_labels_headlines_dropdown($link, $feed_id);
+ print "<li class=\"insensitive\">".__('Feed:')."</li>";
+ print "<li onclick=\"window.open('$rss_link')\"> ".__('View as RSS')."</li>";
+
print "</ul>";
print "</div>";
}
print_headline_subtoolbar($link, $feed_site_url, $feed_title,
- $feed, $cat_view, $search, $match_on, $search_mode);
+ $feed, $cat_view, $search, $match_on, $search_mode, $view_mode);
print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
}
/* Labels */
- if (!$cat_id || $cat_id == -2) {
+ if ($cat_id == -4 || $cat_id == -2) {
$counters = getLabelCounters($link, true);
foreach (array_keys($counters) as $id) {
/* Virtual feeds */
- if (!$cat_id || $cat_id == -1) {
+ if ($cat_id == -4 || $cat_id == -1) {
foreach (array(-1, -2, -3, -4, 0) as $i) {
$unread = getFeedUnread($link, $i);
$limit_qpart = "";
}
- if (!$cat_id) {
+ if ($cat_id == -4 || $cat_id == -3) {
$result = db_query($link, "SELECT
id, feed_url, cat_id, title, ".
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] .
" ORDER BY cat_id, title " . $limit_qpart);
} else {
+
+ if ($cat_id)
+ $cat_qpart = "cat_id = '$cat_id'";
+ else
+ $cat_qpart = "cat_id IS NULL";
+
$result = db_query($link, "SELECT
id, feed_url, cat_id, title, ".
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE
- cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] .
+ $cat_qpart AND owner_uid = " . $_SESSION["uid"] .
" ORDER BY cat_id, title " . $limit_qpart);
}
return $headlines;
}
+ function generate_dashboard_feed($link) {
+ print "<headlines id=\"-5\" is_cat=\"\">";
+
+ print '<![CDATA[<div id="headlinesContainer">';
+
+ print "<div class='whiteBox'>".__('No feed selected.');
+
+ print "<p class=\"small\"><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']);
+
+ $last_updated = db_fetch_result($result, 0, "last_updated");
+
+ if (get_pref($link, 'HEADLINES_SMART_DATE')) {
+ $last_updated = smart_date_time(strtotime($last_updated));
+ } else {
+ $last_updated = date($short_date, strtotime($last_updated));
+ }
+
+ printf(__("Feeds last updated at %s"), $last_updated);
+
+ $result = db_query($link, "SELECT COUNT(id) AS num_errors
+ FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
+
+ $num_errors = db_fetch_result($result, 0, "num_errors");
+
+ if ($num_errors > 0) {
+ print "<br/>";
+ print "<a class=\"insensitive\" href=\"#\" onclick=\"showFeedsWithErrors()\">".
+ __('Some feeds have update errors (click for details)')."</a>";
+ }
+ print "</span></p>";
+
+ print "</div>]]>";
+ print "</headlines>";
+
+ print "<headlines-count value=\"0\"/>";
+ print "<vgroup-last-feed value=\"0\"/>";
+ print "<headlines-unread value=\"0\"/>";
+ print "<disable-cache value=\"1\"/>";
+
+ }
?>