define('MAGPIE_USER_AGENT_EXT', ' (Tiny Tiny RSS/' . VERSION . ')');
define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
+ define('MAGPIE_CACHE_AGE', 60*15); // 15 minutes
require_once "simplepie/simplepie.inc";
require_once "magpierss/rss_fetch.inc";
$entry_content = $item["content:escaped"];
if (!$entry_content) $entry_content = $item["content:encoded"];
+ if (!$entry_content) $entry_content = $item["content"]["encoded"];
if (!$entry_content) $entry_content = $item["content"];
// Magpie bugs are getting ridiculous
if (!$entry_content) $entry_content = $item["atom_content"];
if (!$entry_content) $entry_content = $item["summary"];
- if (!$entry_content) $entry_content = $item["description"];
+
+ if (!$entry_content ||
+ strlen($entry_content) < strlen($item["description"])) {
+ $entry_content = $item["description"];
+ };
// WTF
if (is_array($entry_content)) {
}
} else {
+ // <enclosure>
+
$e_ctr = $item['enclosure#'];
if ($e_ctr > 0) {
}
}
+ // <media:content>
+ // can there be many of those? -fox
+
+ $m_ctr = $item['media']['content#'];
+
+ if ($m_ctr > 0) {
+ $e_item = array($item['media']['content@url'],
+ $item['media']['content@medium'],
+ $item['media']['content@length']);
+
+ array_push($enclosures, $e_item);
+ }
+
+ // FIXME: parse more of those, if needed.
}
# sanitize content
}
if (find_article_filter($article_filters, "filter")) {
+ db_query($link, "COMMIT"); // close transaction in progress
continue;
}
_debug("update_rss_feed: user record not found, creating...");
}
- if (!find_article_filter($article_filters, 'catchup')) {
+ if ($score >= -500 && !find_article_filter($article_filters, 'catchup')) {
$unread = 'true';
$last_read_qpart = 'NULL';
} else {
print "<select name=\"$id\" id='$id' $attributes>";
foreach (array_keys($values) as $v) {
if ($v == $default)
- $sel = "selected";
+ $sel = 'selected="selected"';
else
$sel = "";
print "<span $rtl_tag id=\"FEEDN-$feed_id\">$feed</span>";
if ($unread != 0) {
- $fctr_class = "";
+ $fctr_class = "class=\"feedCtrHasUnread\"";
} else {
- $fctr_class = "class=\"invisible\"";
+ $fctr_class = "class=\"feedCtrNoUnread\"";
}
print " <span $rtl_tag $fctr_class id=\"FEEDCTR-$feed_id\">
(<span id=\"FEEDU-$feed_id\">$unread</span>)</span>";
if (get_pref($link, "EXTENDED_FEEDLIST")) {
+ $total = getFeedArticles($link, $feed_id);
print "<div class=\"feedExtInfo\">
- <span id=\"FLUPD-$feed_id\">$last_updated $error_notify_msg</span></div>";
+ <span id=\"FLUPD-$feed_id\">$last_updated ($total total) $error_notify_msg</span></div>";
}
print "</li>";
$pwd_hash2 = encrypt_password($password, $login);
if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH
- && $_SERVER["REMOTE_USER"]) {
+ && $_SERVER["REMOTE_USER"] && $login != "admin") {
$login = db_escape_string($_SERVER["REMOTE_USER"]);
- $query = "SELECT id,login,access_level
+ $query = "SELECT id,login,access_level,pwd_hash
FROM ttrss_users WHERE
login = '$login'";
$_POST["password"] = "";
$_SESSION["language"] = $_POST["language"];
+ $_SESSION["bw_limit"] = !!$_POST["bw_limit"];
header("Location: " . $_SERVER["REQUEST_URI"]);
exit;
setcookie("ttrss_lang", $_SESSION["language"],
time() + SESSION_COOKIE_LIFETIME);
}
+
+ /* bump counters stamp since we're getting reloaded anyway */
+
+ $_SESSION["get_all_counters_stamp"] = time();
}
} else {
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
if (DB_TYPE == "pgsql") {
- $match_part = "date_entered > NOW() - INTERVAL '$intl hour' ";
+ $match_part = "updated > NOW() - INTERVAL '$intl hour' ";
} else {
- $match_part = "date_entered > DATE_SUB(NOW(),
+ $match_part = "updated > DATE_SUB(NOW(),
INTERVAL $intl HOUR) ";
}
}
function getAllCounters($link, $omode = "flc", $active_feed = false) {
-/* getLabelCounters($link);
- getFeedCounters($link);
- getTagCounters($link);
- getGlobalCounters($link);
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- getCategoryCounters($link);
- } */
- if (!$omode) $omode = "flc";
+ /* getting all counters is a resource intensive operation, so we
+ * rate limit it a little bit */
- getGlobalCounters($link);
- if (strchr($omode, "l")) getLabelCounters($link);
- if (strchr($omode, "f")) getFeedCounters($link, SMART_RPC_COUNTERS, $active_feed);
- if (strchr($omode, "t")) getTagCounters($link);
- if (strchr($omode, "c")) {
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- getCategoryCounters($link);
+
+ if (get_pref($link, "SYNC_COUNTERS") ||
+ time() - $_SESSION["get_all_counters_stamp"] > 5) {
+
+ if (!$omode) $omode = "flc";
+
+ getGlobalCounters($link);
+
+ if (strchr($omode, "l")) getLabelCounters($link);
+ if (strchr($omode, "f")) getFeedCounters($link, SMART_RPC_COUNTERS, $active_feed);
+ if (strchr($omode, "t")) getTagCounters($link);
+ if (strchr($omode, "c")) {
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ getCategoryCounters($link);
+ }
}
+
+ $_SESSION["get_all_counters_stamp"] = time();
}
+
}
function getCategoryCounters($link) {
}
function getFeedUnread($link, $feed, $is_cat = false) {
+ return getFeedArticles($link, $feed, $is_cat, true);
+ }
+
+ function getFeedArticles($link, $feed, $is_cat = false, $unread_only = false) {
$n_feed = sprintf("%d", $feed);
+ if ($unread_only) {
+ $unread_qpart = "unread = true";
+ } else {
+ $unread_qpart = "true";
+ }
+
$age_qpart = getMaxAgeSubquery();
if ($is_cat) {
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE");
if (DB_TYPE == "pgsql") {
- $match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
+ $match_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
} else {
- $match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
+ $match_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
}
} else if ($n_feed > 0) {
$result = db_query($link, "SELECT COUNT(int_id) AS unread
FROM ttrss_user_entries,ttrss_entries
- WHERE unread = true AND
+ WHERE $unread_qpart AND
ttrss_user_entries.ref_id = ttrss_entries.id AND
$age_qpart AND
($match_part) AND
ttrss_user_entries.ref_id = ttrss_entries.id AND
ttrss_feeds.hidden = false AND
$age_qpart AND
- unread = true AND ($match_part) AND ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
+ $unread_qpart AND ($match_part) AND ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
} else {
$result = db_query($link, "SELECT COUNT(post_int_id) AS unread
FROM ttrss_tags,ttrss_user_entries,ttrss_entries
WHERE tag_name = '$feed' AND post_int_id = int_id AND ref_id = ttrss_entries.id
- AND unread = true AND $age_qpart AND
+ AND $unread_qpart AND $age_qpart AND
ttrss_tags.owner_uid = " . $_SESSION["uid"]);
}
$count = getFeedUnread($link, -1);
if (!$ret_mode) {
- print "<counter type=\"label\" id=\"-1\" counter=\"$count\"/>";
+
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ } else {
+ $xmsg_part = "";
+ }
+
+ print "<counter type=\"label\" id=\"-1\" counter=\"$count\" $xmsg_part/>";
} else {
$ret_arr["-1"]["counter"] = $count;
$ret_arr["-1"]["description"] = __("Starred articles");
$count = getFeedUnread($link, -2);
if (!$ret_mode) {
- print "<counter type=\"label\" id=\"-2\" counter=\"$count\"/>";
+
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ } else {
+ $xmsg_part = "";
+ }
+
+ print "<counter type=\"label\" id=\"-2\" counter=\"$count\" $xmsg_part/>";
} else {
$ret_arr["-2"]["counter"] = $count;
$ret_arr["-2"]["description"] = __("Published articles");
$count = getFeedUnread($link, -3);
if (!$ret_mode) {
- print "<counter type=\"label\" id=\"-3\" counter=\"$count\"/>";
+
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ } else {
+ $xmsg_part = "";
+ }
+
+ print "<counter type=\"label\" id=\"-3\" counter=\"$count\" $xmsg_part/>";
} else {
$ret_arr["-3"]["counter"] = $count;
$ret_arr["-3"]["description"] = __("Fresh articles");
$old_counters[$id] = $count;
$lctrs_modified = true;
if (!$ret_mode) {
- print "<counter type=\"label\" id=\"$id\" counter=\"$count\"/>";
+
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ } else {
+ $xmsg_part = "";
+ }
+
+ print "<counter type=\"label\" id=\"$id\" counter=\"$count\" $xmsg_part/>";
} else {
$ret_arr[$id]["counter"] = $count;
$ret_arr[$id]["description"] = $label_name;
$has_title_part = "";
}
- print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $has_title_part/>";
+ if (get_pref($link, 'EXTENDED_FEEDLIST')) {
+ $xmsg_part = "xmsg=\"(" . getFeedArticles($link, $id) . " total)\"";
+ }
+
+ print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $xmsg_part $has_title_part/>";
}
}
print "<param key=\"default_view_limit\" value=\"" .
(int) get_pref($link, "_DEFAULT_VIEW_LIMIT") . "\"/>";
+ print "<param key=\"default_view_order_by\" value=\"" .
+ get_pref($link, "_DEFAULT_VIEW_ORDER_BY") . "\"/>";
+
print "<param key=\"prefs_active_tab\" value=\"" .
get_pref($link, "_PREFS_ACTIVE_TAB") . "\"/>";
print "<param key=\"hide_feedlist\" value=\"" .
(int) get_pref($link, "HIDE_FEEDLIST") . "\"/>";
+ print "<param key=\"bw_limit\" value=\"".
+ (int) $_SESSION["bw_limit"]."\"/>";
+
+ print "<param key=\"sync_counters\" value=\"" .
+ (int) get_pref($link, "SYNC_COUNTERS") . "\"/>";
+
print "</init-params>";
}
if (CHECK_FOR_NEW_VERSION && $_SESSION["access_level"] >= 10) {
- if ($_SESSION["last_version_check"] + 7200 < time()) {
+ if ($_SESSION["last_version_check"] + 86400 < time()) {
$new_version_details = check_for_update($link);
print "<param key=\"new_version_available\" value=\"".
$view_query_part = "";
- if ($view_mode == "adaptive") {
+ if ($view_mode == "adaptive" || $view_query_part == "noscores") {
if ($search) {
$view_query_part = " ";
} else if ($feed != -1) {
$intl = get_pref($link, "FRESH_ARTICLE_MAX_AGE", $owner_uid);
if (DB_TYPE == "pgsql") {
- $query_strategy_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
+ $query_strategy_part .= " AND updated > NOW() - INTERVAL '$intl hour' ";
} else {
- $query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
+ $query_strategy_part .= " AND updated > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
}
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$tmp_result = db_query($link, "SELECT sql_exp FROM ttrss_labels
WHERE id = '$label_id'");
- $query_strategy_part = db_fetch_result($tmp_result, 0, "sql_exp");
+ $query_strategy_part = "(" . db_fetch_result($tmp_result, 0, "sql_exp") . ")";
if (!$query_strategy_part) {
return false;
$order_by = "updated DESC";
}
- $order_by = "score DESC, $order_by";
+ if ($view_mode != "noscores") {
+ $order_by = "score DESC, $order_by";
+ }
if ($override_order) {
$order_by = $override_order;
$offset_query_part = "OFFSET $offset";
}
- if ($vfeed_query_part && defined('_VFEED_GROUP_BY_FEED')) {
+ if ($vfeed_query_part && get_pref($link, 'VFEED_GROUP_BY_FEED', $owner_uid)) {
if (!$override_order) {
$order_by = "ttrss_feeds.title, $order_by";
}
- if ($feed == -3) {
+ // Special output for Fresh feed
+
+/* if ($feed == -3) {
$group_limit_part = "(select count(*) from
ttrss_user_entries AS t1, ttrss_entries AS t2 where
t1.ref_id = t2.id and t1.owner_uid = 2 and
t1.feed_id = ttrss_user_entries.feed_id and
t2.updated > ttrss_entries.updated) <= 5 AND";
- }
+} */
}
$query = "SELECT
$view_query_part
$query_strategy_part ORDER BY $order_by
$limit_query_part $offset_query_part";
-
- $result = db_query($link, $query);
-
+
if ($_GET["debug"]) print $query;
+
+ $result = db_query($link, $query);
} else {
// browsing by tag
".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part
$content_query_part
- ".SUBSTRING_FOR_DATE."(updated,1,19) as updated_noms
+ ".SUBSTRING_FOR_DATE."(updated,1,19) as updated_noms,
+ score
FROM
ttrss_entries,ttrss_user_entries,ttrss_tags
WHERE
if (get_pref($link, "STRIP_UNSAFE_TAGS") || $force_strip_tags) {
$res = strip_tags_long($res,
- "<p><a><i><em><b><strong><
blockquote><br><img><div><span><ul><ol><li>");
+ "<p><a><i><em><b><strong><
code><pre><blockquote><br><img><ul><ol><li>");
// $res = preg_replace("/\r\n|\n|\r/", "", $res);
// $res = strip_tags_long($res, "<p><a><i><em><b><strong><blockquote><br><img><div><span>");
}
+ if (get_pref($link, "STRIP_IMAGES")) {
+
+ $res = preg_replace('/<img[^>]+>/is', '', $res);
+
+ }
+
return $res;
}
} else {
return "New version of Tiny-Tiny RSS ($latest_version) is available:
<div class='milestoneDetails'>$content</div>
- Visit <a target=\"_new\" href=\"http://tt-rss.spb.ru/\">official site</a> for
+ Visit <a target=\"_blank\" href=\"http://tt-rss.spb.ru/\">official site</a> for
download and update information.";
}
$sel_all_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)";
$sel_unread_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)";
$sel_none_link = "javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)";
+ $sel_inv_link = "javascript:invertHeadlineSelection()";
$tog_unread_link = "javascript:selectionToggleUnread()";
$tog_marked_link = "javascript:selectionToggleMarked()";
$sel_unread_link = "javascript:cdmSelectArticles('unread')";
$sel_none_link = "javascript:cdmSelectArticles('none')";
+ $sel_inv_link = "javascript:invertHeadlineSelection()";
+
$tog_unread_link = "javascript:selectionToggleUnread(true)";
$tog_marked_link = "javascript:selectionToggleMarked(true)";
$tog_published_link = "javascript:selectionTogglePublished(true)";
".__('Select:')."
<a href=\"$sel_all_link\">".__('All')."</a>,
<a href=\"$sel_unread_link\">".__('Unread')."</a>,
+ <a href=\"$sel_inv_link\">".__('Invert')."</a>,
<a href=\"$sel_none_link\">".__('None')."</a></li>
<li class=\"vsep\"> </li>
<li class=\"top\">".__('Actions...')."<ul>
print "<td class=\"headlineTitle$rtl_cpart\">";
print "<span id=\"subtoolbar_search\"
- style=\"display : none\">Search: <input
+ style=\"display : none\"><input
id=\"subtoolbar_search_box\"
onblur=\"javascript:enableHotkeys();\"
onfocus=\"javascript:disableHotkeys();\"
if ($feed_site_url) {
if (!$bottom) {
- $target = "target=\"_new\"";
+ $target = "target=\"_blank\"";
}
print "<a $target href=\"$feed_site_url\">".
truncate_string($feed_title,30)."</a>";
if (!$bottom && !$disable_feed) {
print "
- <a target=\"_new\"
+ <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\">
$catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread";
- print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
- <a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>";
-
if ($can_browse) {
- print "<a href=\"#\" onclick=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">";
+ $browse_cat_link = "onclick=\"javascript:viewCategory($cat_id)\"";
+ $inner_title_class = "catTitle";
+ } else {
+ $browse_cat_link = "";
+ $inner_title_class = "catTitleNL";
+ }
+
+ if ($cat_id > 0) {
+ $cat_class = "feedCat";
} else {
- print "<span id=\"FCAP-$cat_id\">";
+ $cat_class = "virtCat";
}
+ print "<li class=\"$cat_class\" id=\"FCAT-$cat_id\">
+ <img onclick=\"toggleCollapseCat($cat_id)\" class=\"catCollapse\"
+ title=\"".__('Click to collapse category')."\"
+ src=\"images/cat-collapse.png\"><span class=\"$inner_title_class\"
+ id=\"FCATN-$cat_id\" $browse_cat_link
+ \">$tmp_category</span>";
+
+ print "<span id=\"FCAP-$cat_id\">";
+
print " <span id=\"FCATCTR-$cat_id\"
class=\"$catctr_class\">($cat_unread)</span> $ellipsis";
- if ($can_browse) {
- print "</a>";
- } else {
- print "</span>";
- }
+ print "</span>";
+
+ //print "</li>";
- print "</li>";
+ print "<ul class=\"feedCatList\" id=\"FCATLIST-$cat_id\" style='$holder_style'>";
- print "<li id=\"feedCatHolder\" class=\"$holder_class\"><ul class=\"feedCatList\" id=\"FCATLIST-$cat_id\" style='$holder_style'>";
}
function outputFeedList($link, $tags = false) {
$cat_hidden = false;
}
-# print "<li class=\"feedCat\">".__('Special')."</li>";
-# print "<li id=\"feedCatHolder\" class=\"feedCatHolder\"><ul class=\"feedCatList\">";
-# print "<li class=\"feedCat\">".
-# "<a id=\"FCATN--1\" href=\"javascript:toggleCollapseCat(-1)\">".
-# __('Special')."</a> <span id='FCAP--1'>$ellipsis</span></li>";
-#
-# print "<li id=\"feedCatHolder\" class=\"feedCatHolder\">
-# <ul class=\"feedCatList\" id='FCATLIST--1' style='$holder_style'>";
-
-# $cat_unread = getCategoryUnread($link, -1);
-# $tmp_category = __("Special");
-# $catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread";
-
printCategoryHeader($link, -1, $cat_hidden, false);
}
"images/pub_set.gif", $link);
if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "</ul>";
+ print "</ul></li>";
}
if (!$tags) {
printCategoryHeader($link, -2, $cat_hidden, false);
-# print "<li class=\"feedCat\">".
-# "<a id=\"FCATN--2\" href=\"javascript:toggleCollapseCat(-2)\">".
-# __('Labels')."</a> <span id='FCAP--2'>$ellipsis</span></li>";
-#
-# print "<li id=\"feedCatHolder\" class=\"feedCatHolder\"><ul class=\"feedCatList\" id='FCATLIST--2' style='$holder_style'>";
} else {
print "<li><hr></li>";
}
if (get_pref($link, 'ENABLE_FEED_CATS')) {
if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
- $order_by_qpart = "category,unread DESC,title";
+ $order_by_qpart = "order_id,category,unread DESC,title";
} else {
- $order_by_qpart = "category,title";
+ $order_by_qpart = "order_id,category,title";
}
} else {
if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
$age_qpart = getMaxAgeSubquery();
- $result = db_query($link, "SELECT ttrss_feeds.*,
+ $query = "SELECT ttrss_feeds.*,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,
(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND unread = true
WHERE
ttrss_feeds.hidden = false AND
ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
- ORDER BY $order_by_qpart");
+ ORDER BY $order_by_qpart";
+
+ $result = db_query($link, $query);
$actid = $_GET["actid"];
$category = $tmp_category;
- $collapsed = $line["collapsed"];
+ $collapsed = sql_bool_to_bool($line["collapsed"]);
// workaround for NULL category
if ($category == __("Uncategorized")) {
}
}
- if ($collapsed == "t" || $collapsed == "1") {
- $holder_class = "feedCatHolder";
- $holder_style = "display:none;";
- $ellipsis = "…";
- } else {
- $holder_class = "feedCatHolder";
- $holder_style = "";
- $ellipsis = "";
- }
-
$cat_id = sprintf("%d", $cat_id);
- $cat_unread = getCategoryUnread($link, $cat_id);
+ printCategoryHeader($link, $cat_id, $collapsed, true);
- $catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread";
-
- print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
- <a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
- <a href=\"#\" onclick=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">
- <span id=\"FCATCTR-$cat_id\"
- class=\"$catctr_class\">($cat_unread)</span> $ellipsis
- </a></li>";
-
- print "<li id=\"feedCatHolder\" class=\"$holder_class\"><ul class=\"feedCatList\" id=\"FCATLIST-$cat_id\" style='$holder_style'>";
}
printFeedEntry($feed_id, $class, $feed, $unread,
if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<li class=\"feedCat\">".__('Tags')."</li>";
- print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
+ print "<ul class=\"feedCatList\">";
}
$age_qpart = getMaxAgeSubquery();
return vsprintf(__(array_shift($args)), $args);
}
- function outputArticleXML($link, $id, $feed_id, $mark_as_read = true) {
+ function outputArticleXML($link, $id, $feed_id, $mark_as_read = true,
+ $zoom_mode = false) {
/* we can figure out feed_id from article id anyway, why do we
* pass feed_id here? */
$feed_id = db_fetch_result($result, 0, "feed_id");
- print "<article id='$id'><![CDATA[";
+ if (!$zoom_mode) { print "<article id='$id'><![CDATA["; };
$result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
$link_target = "";
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
- $link_target = "target=\"_new\"";
+ $link_target = "target=\"_blank\"";
}
$line = db_fetch_assoc($result);
}
}
+ if ($zoom_mode) {
+ header("Content-Type: text/html");
+ print "<html><head>
+ <title>Tiny Tiny RSS - ".$line["title"]."</title>
+ <link rel=\"stylesheet\" type=\"text/css\" href=\"tt-rss.css\">
+ </head><body>";
+ }
+
+
print "<div class=\"postReply\">";
- print "<div class=\"postHeader\">";
+ print "<div class=\"postHeader\" onmouseover=\"enable_resize(true)\"
+ onmouseout=\"enable_resize(false)\">";
$entry_author = $line["author"];
$tags = get_article_tags($link, $id);
$tags_str = "";
+ $tags_nolinks_str = "";
$f_tags_str = "";
$num_tags = 0;
if ($num_tags == $tag_limit) {
$tags_str .= "…";
+ $tags_nolinks_str .= "…";
} else if ($num_tags < $tag_limit) {
$tags_str .= $tag_str;
+ $tags_nolinks_str .= "$tag, ";
}
$f_tags_str .= $tag_str;
}
$tags_str = preg_replace("/, $/", "", $tags_str);
+ $tags_nolinks_str = preg_replace("/, $/", "", $tags_nolinks_str);
$f_tags_str = preg_replace("/, $/", "", $f_tags_str);
$all_tags_div = "<span class='cdmAllTagsCtr'>…<div class='cdmAllTags'>All Tags: $f_tags_str</div></span>";
if (!$entry_comments) $entry_comments = " "; # placeholder
if (!$tags_str) $tags_str = '<span class="tagList">'.__('no tags').'</span>';
+ if (!$tags_nolinks_str) $tags_nolinks_str = '<span class="tagList">'.__('no tags').'</span>';
print "<div style='float : right'>
- <img src='images/tag.png' class='tagsPic' alt='Tags' title='Tags'>
- $tags_str
- <a title=\"Edit tags for this article\"
- href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a></div>
- <div clear='both'>$entry_comments</div>";
+ <img src='images/tag.png' class='tagsPic' alt='Tags' title='Tags'>";
+
+ if (!$zoom_mode) {
+ print "$tags_str
+ <a title=\"".__('Edit tags for this article')."\"
+ href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a>
+ <img src=\"images/art-zoom.png\" class='tagsPic'
+ style=\"cursor : pointer\"
+ onclick=\"zoomToArticle($id)\"
+ alt='Zoom' title='".__('Show article summary in new window')."'>";
+ } else {
+ print "$tags_nolinks_str";
+ }
+ print "</div>";
+ print "<div clear='both'>$entry_comments</div>";
print "</div>";
$line["content"] = sanitize_rss($link, $line["content"]);
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
- $line["content"] = preg_replace("/href=/i", "target=\"_new\" href=", $line["content"]);
+ $line["content"] = preg_replace("/href=/i", "target=\"_blank\" href=", $line["content"]);
}
print $line["content"];
$filename = substr($url, strrpos($url, "/")+1);
- $entry = "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
+ $entry = "";
+
+ if (($ctype == __("audio/mpeg")) &&
+ (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {
+
+ $entry .= "<object type=\"application/x-shockwave-flash\" data=\"extras/button/musicplayer.swf?song_url=$url\" width=\"17\" height=\"17\"> <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object> ";
+
+ }
+
+ $entry .= "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
$filename . " (" . $ctype . ")" . "</a>";
array_push($entries, $entry);
}
- print "]]></article>";
+ if (!$zoom_mode) {
+ print "]]></article>";
+ } else {
+ print "
+ <div style=\"text-align : center\">
+ <input type=\"submit\" onclick=\"return window.close()\"
+ value=\"".__("Close this window")."\"></div>";
+ print "</body></html>";
+
+ }
}
function outputHeadlinesList($link, $feed, $subop, $view_mode, $limit, $cat_view,
- $next_unread_feed, $offset) {
+ $next_unread_feed, $offset, $vgr_last_feed = false,
+ $override_order = false) {
$disable_cache = false;
if ($subop == "undefined") $subop = "";
+ $subop_split = split(":", $subop);
+
if ($subop == "CatchupSelected") {
$ids = split(",", db_escape_string($_GET["ids"]));
$cmode = sprintf("%d", $_GET["cmode"]);
}
}
+ if ($subop_split[0] == "MarkAllReadGR") {
+ catchup_feed($link, $subop_split[1], false);
+ }
+
+
if ($feed_id > 0) {
$result = db_query($link,
"SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
if ($_GET["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
$qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view,
- $search, $search_mode, $match_on, false, $real_offset);
+ $search, $search_mode, $match_on, $override_order, $real_offset);
if ($_GET["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
$feed_site_url = $qfh_ret[2];
$last_error = $qfh_ret[3];
+ $vgroup_last_feed = $vgr_last_feed;
+
if ($feed == -2) {
$feed_site_url = article_publish_url($link);
}
alt=\"Publish article\" onclick='javascript:tPub($id)'>";
}
-# $content_link = "<a target=\"_new\" href=\"".$line["link"]."\">" .
+# $content_link = "<a target=\"_blank\" href=\"".$line["link"]."\">" .
# $line["title"] . "</a>";
- $content_link = "<a href=\"javascript:view($id,$feed_id);\">" .
- $line["title"] . "</a>";
+# $content_link = "<a
+# href=\"" . htmlspecialchars($line["link"]) . "\"
+# onclick=\"view($id,$feed_id);\">" .
+# $line["title"] . "</a>";
# $content_link = "<a href=\"javascript:viewContentUrl('".$line["link"]."');\">" .
# $line["title"] . "</a>";
$entry_author = " - $entry_author";
}
+ $has_feed_icon = is_file(ICONS_DIR . "/$feed_id.ico");
+
+ if ($has_feed_icon) {
+ $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
+ } else {
+ //$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
+ }
+
if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
- if (defined('_VFEED_GROUP_BY_FEED')) {
- if ($line["feed_title"] != $cur_feed_title) {
-/* print "<tr class='feedTitle'><td colspan='7'>".
- $line["feed_title"].
- " (<a href=\"javascript:viewfeed($feed_id, '', false)\">".
- "more</a>)</td></tr>"; */
+ if (get_pref($link, 'VFEED_GROUP_BY_FEED')) {
+ if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
+
+ $cur_feed_title = $line["feed_title"];
+ $vgroup_last_feed = $feed_id;
+
+ $cur_feed_title = htmlspecialchars($cur_feed_title);
+
+ $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>mark as read</a>)";
print "<tr class='feedTitle'><td colspan='7'>".
+ "<div style=\"float : right\">$feed_icon_img</div>".
"<a href=\"javascript:viewfeed($feed_id, '', false)\">".
- $line["feed_title"]."</a>:</td></tr>";
-
- $cur_feed_title = $line["feed_title"];
+ $line["feed_title"]."</a> $vf_catchup_link</td></tr>";
}
}
-
- print "<tr class='$class' id='RROW-$id'>";
+
+ $mouseover_attrs = "onmouseover='postMouseIn($id)'
+ onmouseout='postMouseOut($id)'";
+
+ print "<tr class='$class' id='RROW-$id' $mouseover_attrs>";
print "<td class='hlUpdPic'>$update_pic</td>";
# truncate_string($line["feed_title"],30)."</a> </td>";
# } else {
- print "<td onclick='javascript:view($id,$feed_id)' class='hlContent$hlc_suffix' valign='middle'>";
+ print "<td onclick='view($id,$feed_id)' class='hlContent$hlc_suffix' valign='middle'>";
- print "<a id=\"RTITLE-$id\" href=\"javascript:view($id,$feed_id);\">" .
+ print "<a id=\"RTITLE-$id\"
+ href=\"" . htmlspecialchars($line["link"]) . "\"
+ onclick=\"return view($id,$feed_id);\">" .
$line["title"];
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
# <a href=\"javascript:viewfeed($feed_id, '', false)\">".
# $line["feed_title"]."</a>
- if (!defined('_VFEED_GROUP_BY_FEED')) {
+ if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
if ($line["feed_title"]) {
print "<span class=\"hlFeed\">
(<a href=\"javascript:viewfeed($feed_id, '', false)\">".
</span>";
}
}
-
-
print "</td>";
-
+
# }
- print "<td class=\"hlUpdated\" onclick='javascript:view($id,$feed_id)'><nobr>$updated_fmt </nobr></td>";
+ print "<td class=\"hlUpdated\" onclick='view($id,$feed_id)'><nobr>$updated_fmt </nobr></td>";
print "<td class='hlMarkedPic'>$score_pic</td>";
-
+
+ if ($line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
+ print "<td onclick=\"viewfeed($feed_id)\" class=\"hlFeedIcon\">$feed_icon_img</td>";
+ }
+
print "</tr>";
} else {
- if (defined('_VFEED_GROUP_BY_FEED')) {
- if ($line["feed_title"] != $cur_feed_title) {
+ if (get_pref($link, 'VFEED_GROUP_BY_FEED') && $line["feed_title"]) {
+ if ($feed_id != $vgroup_last_feed) {
+
+ $cur_feed_title = $line["feed_title"];
+ $vgroup_last_feed = $feed_id;
+
+ $cur_feed_title = htmlspecialchars($cur_feed_title);
+
+ $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>mark as read</a>)";
+
+ $has_feed_icon = is_file(ICONS_DIR . "/$feed_id.ico");
+
+ if ($has_feed_icon) {
+ $feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
+ } else {
+ //$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
+ }
+
print "<div class='cdmFeedTitle'>".
+ "<div style=\"float : right\">$feed_icon_img</div>".
"<a href=\"javascript:viewfeed($feed_id, '', false)\">".
- $line["feed_title"]."</a></div>";
- $cur_feed_title = $line["feed_title"];
+ $line["feed_title"]."</a> $vf_catchup_link</div>";
}
}
}
$expand_cdm = get_pref($link, 'CDM_EXPANDED');
+ $show_excerpt = false;
if ($expand_cdm && $score >= -100) {
$cdm_cstyle = "";
+ $show_excerpt = false;
} else {
$cdm_cstyle = "style=\"display : none\"";
+ $show_excerpt = true;
}
+ $mouseover_attrs = "onmouseover='postMouseIn($id)'
+ onmouseout='postMouseOut($id)'";
+
print "<div class=\"cdmArticle$add_class\"
- id=\"RROW-$id\" onmouseover='cdmMouseIn(this)'
- onclick='cdmClicked(this)'
- onmouseout='cdmMouseOut(this)'>";
+ id=\"RROW-$id\"
+ $mouseover_attrs'>";
print "<div class=\"cdmHeader\">";
- print "<div class=\"articleUpdated\">$updated_fmt $score_pic</div>";
+ if (!get_pref($link, "VFEED_GROUP_BY_FEED") || !$line["feed_title"]) {
+ $cdm_feed_icon = "<span style=\"cursor : pointer\" onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
+ }
+
+ print "<div class=\"articleUpdated\">$updated_fmt $score_pic $cdm_feed_icon
+ </div>";
print "<span id=\"RTITLE-$id\" class=\"titleWrap$hlc_suffix\"><a class=\"title\"
onclick=\"javascript:toggleUnread($id, 0)\"
print $entry_author;
- if (!$expand_cdm || $score < -100) {
+/* if (!$expand_cdm || $score < -100) {
print " <a id=\"CICH-$id\"
href=\"javascript:cdmExpandArticle($id)\">
(".__('Show article').")</a>";
- }
+ } */
- if (!defined('_VFEED_GROUP_BY_FEED')) {
+ if (!get_pref($link, 'VFEED_GROUP_BY_FEED')) {
if ($line["feed_title"]) {
print " (<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
}
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
$line["content_preview"] = preg_replace("/href=/i",
- "target=\"_new\" href=", $line["content_preview"]);
+ "target=\"_blank\" href=", $line["content_preview"]);
}
- print "<div class=\"cdmContent\" id=\"CICD-$id\" $cdm_cstyle>";
+ if ($show_excerpt) {
+ print "<div class=\"cdmExcerpt\" id=\"CEXC-$id\"
+ onclick=\"cdmExpandArticle($id)\"
+ title=\"".__('Click to expand article')."\">";
+ print truncate_string(strip_tags($line["content_preview"]), 100);
+ print "</div>";
+ }
+
+ print "<div class=\"cdmContent\"
+ onclick=\"cdmClicked($id)\"
+ id=\"CICD-$id\" $cdm_cstyle>";
// print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>";
- print $line["content_preview"];
+ print sanitize_rss($link, $line["content_preview"]);
$e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
post_id = '$id' AND content_url != ''");
$filename = substr($url, strrpos($url, "/")+1);
- $entry = "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
+ $entry = "";
+
+ if (($ctype == __("audio/mpeg")) &&
+ (get_pref($link, "ENABLE_FLASH_PLAYER")) ) {
+
+ $entry .= "<object type=\"application/x-shockwave-flash\" data=\"extras/button/musicplayer.swf?song_url=$url\" width=\"17\" height=\"17\"> <param name=\"movie\" value=\"extras/button/musicplayer.swf?song_url=$url\" /> </object> ";
+
+ }
+
+ $entry .= "<a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\">" .
$filename . " (" . $ctype . ")" . "</a>";
array_push($entries, $entry);
print "</span><span class='s1'>$marked_pic</span> ";
print "<span class='s1'>$published_pic</span> ";
+ print "<span class='s1'><img src=\"images/art-zoom.png\" class='tagsPic'
+ onclick=\"zoomToArticle($id)\"
+ style=\"cursor : pointer\"
+ alt='Zoom'
+ title='".__('Show article summary in new window')."'></span>";
$tags = get_article_tags($link, $id);
print "</div>";
}
- return array($topmost_article_ids, $headlines_count, $feed, $disable_cache);
+ return array($topmost_article_ids, $headlines_count, $feed, $disable_cache, $vgroup_last_feed);
}
// from here: http://www.roscripts.com/Create_tag_cloud-71.html
function article_publish_url($link) {
- $url_path = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+ $url_path = "";
+
- $url_path .= "?op=publish&key=" . get_pref($link, "_PREFS_PUBLISH_KEY");
+ if ($_SERVER['HTTPS'] != "on") {
+ $url_path = "http://";
+ } else {
+ $url_path = "https://";
+ }
+
+ $url_path .= $_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
+ $url_path .= "/backend.php?op=publish&key=" . get_pref($link, "_PREFS_PUBLISH_KEY");
return $url_path;
}
}
function get_score_pic($score) {
- if ($score > 0) {
+ if ($score > 100) {
return "score_high.png";
- } else if ($score < 0) {
+ } else if ($score > 0) {
+ return "score_half_high.png";
+ } else if ($score < -100) {
return "score_low.png";
+ } else if ($score < 0) {
+ return "score_half_low.png";
} else {
return "score_neutral.png";
}
function rounded_table_start($classname, $header = " ") {
print "<table width='100%' class='$classname' cellspacing='0' cellpadding='0'>";
- print "<tr><td class='c1'> </td><td class='top'>$header</td><td class='c2'> </tr>";
+ print "<tr><td class='c1'> </td><td class='top'>$header</td><td class='c2'> </td></tr>";
print "<tr><td class='left'> </td><td class='content'>";
}
function rounded_table_end($footer = " ") {
print "</td><td class='right'> </td></tr>";
- print "<tr><td class='c4'> </td><td class='bottom'>$footer</td><td class='c3'> </tr>";
+ print "<tr><td class='c4'> </td><td class='bottom'>$footer</td><td class='c3'> </td></tr>";
print "</table>";
}
+ function print_label_dlg_common_examples() {
+
+ print __("Match ") . " ";
+
+/* print "<select name=\"label_andor\">";
+ print "<option value=\"and\">AND</option>";
+ print "<option value=\"or\">OR</option>";
+ print "</select>"; */
+
+ print "<select name=\"label_fields\" onchange=\"labelFieldsCheck(this)\">";
+ print "<option value=\"unread\">".__("Unread articles")."</option>";
+ print "<option value=\"updated\">".__("Updated articles")."</option>";
+ print "<option value=\"kw_title\">".__("Title contains")."</option>";
+ print "<option value=\"kw_content\">".__("Content contains")."</option>";
+ print "<option value=\"scoreE\">".__("Score equals")."</option>";
+ print "<option value=\"scoreG\">".__("Score is greater than")."</option>";
+ print "<option value=\"scoreL\">".__("Score is less than")."</option>";
+ print "<option value=\"newerH\">".__("Articles newer than X hours")."</option>";
+ print "<option value=\"newerD\">".__("Articles newer than X days")."</option>";
+
+ print "</select>";
+
+ print "<input style=\"display : none\" name=\"label_fields_param\"
+ size=\"10\">";
+
+ print " <input type=\"submit\"
+ onclick=\"return addLabelExample()\"
+ value=\"".__("Add")."\">";
+ }
?>
git.wh0rd.org / tt-rss.git / blobdiff