$op = $_REQUEST["op"];
- define('SCHEMA_VERSION', 8);
+ define('SCHEMA_VERSION', 9);
require_once "sanity_check.php";
require_once "config.php";
}
if ($_SESSION["uid"]) {
- if (get_pref($link, "HIDE_READ_FEEDS") == "true") {
- setcookie("ttrss_vf_hreadf", 1);
- } else {
- setcookie("ttrss_vf_hreadf", 0);
- }
- setcookie('ttrss_vf_refresh', FEEDS_FRAME_REFRESH);
- setcookie('ttrss_vf_daemon', ENABLE_UPDATE_DAEMON);
+// setcookie('ttrss_vf_refresh', FEEDS_FRAME_REFRESH);
+// setcookie('ttrss_vf_daemon', ENABLE_UPDATE_DAEMON);
- if (get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED")) {
+/* if (get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED")) {
setcookie('ttrss_vf_catchupnext', 1);
} else {
setcookie('ttrss_vf_catchupnext', 0);
- }
+ } */
}
$fetch = $_GET["fetch"];
// }
if (get_pref($link, 'ENABLE_FEED_CATS')) {
- $order_by_qpart = "category,title";
+ if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
+ $order_by_qpart = "category,unread DESC,title";
+ } else {
+ $order_by_qpart = "category,title";
+ }
} else {
- $order_by_qpart = "title";
+ if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
+ $order_by_qpart = "unread DESC,title";
+ } else {
+ $order_by_qpart = "title";
+ }
}
$result = db_query($link, "SELECT ttrss_feeds.*,
if ($result) {
+ $link_target = "";
+
+ if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
+ $link_target = "target=\"_new\"";
+ }
+
$line = db_fetch_assoc($result);
if ($line["icon_url"]) {
} else {
$comments_url = $line["link"];
}
- $entry_comments = "<a href=\"$comments_url\">$num_comments comments</a>";
+ $entry_comments = "<a $link_target href=\"$comments_url\">$num_comments comments</a>";
} else {
if ($line["comments"] && $line["link"] != $line["comments"]) {
- $entry_comments = "<a href=\"".$line["comments"]."\">comments</a>";
+ $entry_comments = "<a $link_target href=\"".$line["comments"]."\">comments</a>";
}
}
if ($entry_author) {
$entry_author = " - by $entry_author";
}
-
- print "<tr><td><a href=\"" . $line["link"] . "\">" . $line["title"] .
+
+ print "<tr><td><a $link_target href=\"" . $line["link"] . "\">" . $line["title"] .
"</a>$entry_author</td>";
$parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
}
}
+ if ($feed_id > 0) {
+ $result = db_query($link,
+ "SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
+
+ if (db_num_rows($result) == 0) {
+ print "<div align='center'>
+ Feed not found.</div>";
+ return;
+ }
+ }
+
if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
$result = db_query($link, "SELECT rtl_content FROM ttrss_feeds
window.onload = init;
</script>";
+ /// START /////////////////////////////////////////////////////////////////////////////////
+
$search = db_escape_string($_GET["query"]);
$search_mode = db_escape_string($_GET["search_mode"]);
$match_on = db_escape_string($_GET["match_on"]);
$match_on = "both";
}
- if ($search) {
- if ($match_on == "both") {
- $search_query_part = "(upper(ttrss_entries.title) LIKE upper('%$search%')
- OR upper(ttrss_entries.content) LIKE '%$search%') AND";
- } else if ($match_on == "title") {
- $search_query_part = "upper(ttrss_entries.title) LIKE upper('%$search%')
- AND";
- } else if ($match_on == "content") {
- $search_query_part = "upper(ttrss_entries.content) LIKE upper('%$search%') AND";
- }
- } else {
- $search_query_part = "";
- }
-
- $view_query_part = "";
-
- if ($view_mode == "adaptive") {
- if ($search) {
- $view_query_part = " ";
- } else if ($feed != -1) {
- $unread = getFeedUnread($link, $feed);
- if ($unread > 0) {
- $view_query_part = " unread = true AND ";
- }
- }
- }
-
- if ($view_mode == "marked") {
- $view_query_part = " marked = true AND ";
- }
-
- if ($view_mode == "unread") {
- $view_query_part = " unread = true AND ";
- }
-
- if ($limit > 0) {
- $limit_query_part = "LIMIT " . $limit;
- }
-
- $vfeed_query_part = "";
-
- // override query strategy and enable feed display when searching globally
- if ($search && $search_mode == "all_feeds") {
- $query_strategy_part = "ttrss_entries.id > 0";
- $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- } else if (preg_match("/^-?[0-9][0-9]*$/", $feed) == false) {
- $query_strategy_part = "ttrss_entries.id > 0";
- $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
- id = feed_id) as feed_title,";
- } else if ($feed >= 0 && $search && $search_mode == "this_cat") {
+ $qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on);
- $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-
- $tmp_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE cat_id =
- (SELECT cat_id FROM ttrss_feeds WHERE id = '$feed') AND id != '$feed'");
-
- $cat_siblings = array();
-
- if (db_num_rows($tmp_result) > 0) {
- while ($p = db_fetch_assoc($tmp_result)) {
- array_push($cat_siblings, "feed_id = " . $p["id"]);
- }
-
- $query_strategy_part = sprintf("(feed_id = %d OR %s)",
- $feed, implode(" OR ", $cat_siblings));
-
- } else {
- $query_strategy_part = "ttrss_entries.id > 0";
- }
-
- } else if ($feed >= 0) {
-
- if ($cat_view) {
-
- if ($feed > 0) {
- $query_strategy_part = "cat_id = '$feed'";
- } else {
- $query_strategy_part = "cat_id IS NULL";
- }
-
- $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-
- } else {
- $tmp_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE parent_feed = '$feed'
- ORDER BY cat_id,title");
-
- $parent_ids = array();
-
- if (db_num_rows($tmp_result) > 0) {
- while ($p = db_fetch_assoc($tmp_result)) {
- array_push($parent_ids, "feed_id = " . $p["id"]);
- }
-
- $query_strategy_part = sprintf("(feed_id = %d OR %s)",
- $feed, implode(" OR ", $parent_ids));
-
- $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- } else {
- $query_strategy_part = "feed_id = '$feed'";
- }
- }
- } else if ($feed == -1) { // starred virtual feed
- $query_strategy_part = "marked = true";
- $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- } else if ($feed <= -10) { // labels
- $label_id = -$feed - 11;
-
- $tmp_result = db_query($link, "SELECT sql_exp FROM ttrss_labels
- WHERE id = '$label_id'");
+ $result = $qfh_ret[0];
+ $feed_title = $qfh_ret[1];
+ $feed_site_url = $qfh_ret[2];
+ $last_error = $qfh_ret[3];
- $query_strategy_part = db_fetch_result($tmp_result, 0, "sql_exp");
-
- $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
- } else {
- $query_strategy_part = "id > 0"; // dumb
- }
-
- $order_by = "updated DESC";
-
-// if ($feed < -10) {
-// $order_by = "feed_id,updated DESC";
-// }
-
- $feed_title = "";
-
- if ($search && $search_mode == "all_feeds") {
- $feed_title = "Global search results ($search)";
- } else if ($search && preg_match('/^-?[0-9][0-9]*$/', $feed) == false) {
- $feed_title = "Feed search results ($search, $feed)";
- } else if (preg_match('/^-?[0-9][0-9]*$/', $feed) == false) {
- $feed_title = $feed;
- } else if (preg_match('/^-?[0-9][0-9]*$/', $feed) != false && $feed >= 0) {
-
- if ($cat_view) {
-
- if ($feed != 0) {
- $result = db_query($link, "SELECT title FROM ttrss_feed_categories
- WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
- $feed_title = db_fetch_result($result, 0, "title");
- } else {
- $feed_title = "Uncategorized";
- }
- } else {
-
- $result = db_query($link, "SELECT title,site_url,last_error FROM ttrss_feeds
- WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
-
- $feed_title = db_fetch_result($result, 0, "title");
- $feed_site_url = db_fetch_result($result, 0, "site_url");
- $last_error = db_fetch_result($result, 0, "last_error");
-
- }
-
- } else if ($feed == -1) {
- $feed_title = "Starred articles";
- } else if ($feed < -10) {
- $label_id = -$feed - 11;
- $result = db_query($link, "SELECT description FROM ttrss_labels
- WHERE id = '$label_id'");
- $feed_title = db_fetch_result($result, 0, "description");
- } else {
- $feed_title = "?";
- }
-
- $feed_title = db_unescape_string($feed_title);
-
- if ($feed < -10) error_reporting (0);
+ /// STOP //////////////////////////////////////////////////////////////////////////////////
print "<div id=\"headlinesContainer\">";
- if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
-
- if ($feed >= 0) {
- $feed_kind = "Feeds";
- } else {
- $feed_kind = "Labels";
- }
-
-// if (!$vfeed_query_part) {
- $content_query_part = "content as content_preview,";
-// } else {
-// $content_query_part = "";
-// }
-
- $query = "SELECT
- ttrss_entries.id,ttrss_entries.title,
- SUBSTRING(updated,1,16) as updated,
- unread,feed_id,marked,link,last_read,
- SUBSTRING(last_read,1,19) as last_read_noms,
- $vfeed_query_part
- $content_query_part
- SUBSTRING(updated,1,19) as updated_noms
- FROM
- ttrss_entries,ttrss_user_entries,ttrss_feeds
- WHERE
- ttrss_user_entries.feed_id = ttrss_feeds.id AND
- ttrss_user_entries.ref_id = ttrss_entries.id AND
- ttrss_user_entries.owner_uid = '".$_SESSION["uid"]."' AND
- $search_query_part
- $view_query_part
- $query_strategy_part ORDER BY $order_by
- $limit_query_part";
-
- $result = db_query($link, $query);
-
- if ($_GET["debug"]) print $query;
-
- } else {
- // browsing by tag
-
- $feed_kind = "Tags";
-
- $result = db_query($link, "SELECT
- ttrss_entries.id as id,title,
- SUBSTRING(updated,1,16) as updated,
- unread,feed_id,
- marked,link,last_read,
- SUBSTRING(last_read,1,19) as last_read_noms,
- $vfeed_query_part
- $content_query_part
- SUBSTRING(updated,1,19) as updated_noms
- FROM
- ttrss_entries,ttrss_user_entries,ttrss_tags
- WHERE
- ref_id = ttrss_entries.id AND
- ttrss_user_entries.owner_uid = '".$_SESSION["uid"]."' AND
- post_int_id = int_id AND tag_name = '$feed' AND
- $view_query_part
- $search_query_part
- $query_strategy_part ORDER BY $order_by
- $limit_query_part");
- }
-
if (!$result) {
print "<div align='center'>
Could not display feed (query failed). Please check label match syntax or local configuration.</div>";
print "</div>";
- print "<div class=\"cdmContent\">" . $line["content_preview"] . "</div>";
+ print "<div class=\"cdmContent\">" . $line["content_preview"] . "</div><br clear=\"all\">";
print "<div style=\"float : right\">$marked_pic</div>
<div lass=\"cdmFooter\">
<script type=\"text/javascript\">
try {
document.onkeydown = hotkey_handler;
- parent.update_all_counters(\"$feed\");
+ try {
+ parent.update_all_counters(\"$feed\");
+ } catch (e) {
+ // this is workaround against mysterious permission
+ // denied feature/bug of firefox (ticket #73)
+ // if call from this context failed - ignore silently
+ exception_error(\"viewfeed/footer1/counters\", e, true);
+ }
} catch (e) {
exception_error(\"viewfeed/footer1\", e);
}
print "<p>Showing top 25 registered feeds, sorted by popularity:</p>";
- $result = db_query($link, "SELECT feed_url,count(id) AS subscribers
- FROM ttrss_feeds
- WHERE auth_login = '' AND auth_pass = '' AND private = false
- GROUP BY feed_url ORDER BY subscribers DESC LIMIT 25");
-
+# $result = db_query($link, "SELECT feed_url,count(id) AS subscribers
+# FROM ttrss_feeds
+# WHERE auth_login = '' AND auth_pass = '' AND private = false
+# GROUP BY feed_url ORDER BY subscribers DESC LIMIT 25");
+
+ $owner_uid = $_SESSION["uid"];
+
+ $result = db_query($link, "SELECT feed_url,COUNT(id) AS subscribers
+ FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
+ WHERE tf.feed_url = ttrss_feeds.feed_url
+ AND owner_uid = '$owner_uid') GROUP BY feed_url
+ ORDER BY subscribers DESC LIMIT 25");
+
print "<ul class='browseFeedList' id='browseFeedList'>";
$feedctr = 0;
$feed_url = $line["feed_url"];
$subscribers = $line["subscribers"];
- $sub_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE feed_url = '$feed_url' AND owner_uid =" .
- $_SESSION["uid"]);
-
- if (db_num_rows($sub_result) > 0) {
- continue; // already subscribed
- }
-
$det_result = db_query($link, "SELECT site_url,title,id
FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");
$private = checkbox_to_sql_bool(db_escape_string($_POST["private"]));
$rtl_content = checkbox_to_sql_bool(db_escape_string($_POST["rtl_content"]));
- if ($cat_id && $cat_id != 0) {
- $category_qpart = "cat_id = '$cat_id'";
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ if ($cat_id && $cat_id != 0) {
+ $category_qpart = "cat_id = '$cat_id',";
+ } else {
+ $category_qpart = 'cat_id = NULL,';
+ }
} else {
- $category_qpart = 'cat_id = NULL';
+ $category_qpart = "";
}
if ($parent_feed && $parent_feed != 0) {
- $parent_qpart = "parent_feed = '$parent_feed'";
+ $parent_qpart = "parent_feed = '$parent_feed',";
} else {
- $parent_qpart = 'parent_feed = NULL';
+ $parent_qpart = 'parent_feed = NULL,';
}
$result = db_query($link, "UPDATE ttrss_feeds SET
- $category_qpart,
- $parent_qpart,
+ $category_qpart
+ $parent_qpart
title = '$feed_title', feed_url = '$feed_link',
update_interval = '$upd_intl',
purge_interval = '$purge_intl',
$search_qpart = "";
}
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ $order_by_qpart = "category,$feeds_sort,title";
+ } else {
+ $order_by_qpart = "$feeds_sort,title";
+ }
+
$result = db_query($link, "SELECT
F1.id,
F1.title,
ON (F1.cat_id = C1.id)
WHERE
$search_qpart F1.owner_uid = '".$_SESSION["uid"]."'
- ORDER by category,$feeds_sort,title");
+ ORDER by $order_by_qpart");
if (db_num_rows($result) != 0) {
if (!get_pref($link, 'ENABLE_FEED_CATS')) {
print "<tr class=\"title\">
- <td width='5%' align='center'> </td>
+ <td width='5%' align='center'> </td>";
+
+ if (get_pref($link, 'ENABLE_FEED_ICONS')) {
+ print "<td width='3%'> </td>";
+ }
+
+ print "
<td width='40%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
<td width='45%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
<td width='15%' align='right'><a href=\"javascript:updateFeedList('last_updated')\">Updated</a></td>";
if ($subop == "editCat") {
print "Edit category:
<input type=\"submit\" class=\"button\"
- onclick=\"javascript:feedCatEditSave()\" value=\"Save\">
+ onclick=\"return feedCatEditSave()\" value=\"Save\">
<input type=\"submit\" class=\"button\"
- onclick=\"javascript:feedCatEditCancel()\" value=\"Cancel\">";
+ onclick=\"return feedCatEditCancel()\" value=\"Cancel\">";
} else {
print "
Selection:
<input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"javascript:editSelectedFeedCat()\" value=\"Edit\">
+ onclick=\"return editSelectedFeedCat()\" value=\"Edit\">
<input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"javascript:removeSelectedFeedCats()\" value=\"Remove\">";
+ onclick=\"return removeSelectedFeedCats()\" value=\"Remove\">";
}
$filter_id = db_escape_string($_GET["id"]);
$result = db_query($link,
- "SELECT * FROM ttrss_filters WHERE id = '$filter_id'");
+ "SELECT * FROM ttrss_filters WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
$reg_exp = htmlspecialchars(db_unescape_string(db_fetch_result($result, 0, "reg_exp")));
$filter_type = db_fetch_result($result, 0, "filter_type");
print "<input type=\"submit\"
id=\"infobox_submit\"
- class=\"button\" onclick=\"filterEditSave()\"
+ class=\"button\" onclick=\"return filterEditSave()\"
value=\"Save\"> ";
print "<input class=\"button\"
- type=\"submit\" onclick=\"filterEditCancel()\"
+ type=\"submit\" onclick=\"return filterEditCancel()\"
value=\"Cancel\">";
print "</div>";
feed_id = $feed_id,
action_id = '$action_id',
filter_type = '$filter_type'
- WHERE id = '$filter_id'");
+ WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
}
if ($subop == "remove") {
$ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
- db_query($link, "DELETE FROM ttrss_filters WHERE id = '$id'");
+ db_query($link, "DELETE FROM ttrss_filters WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
}
}
print "<input type=\"submit\"
class=\"button\"
- onclick=\"javascript:displayDlg('quickAddFilter', false)\"
+ onclick=\"return displayDlg('quickAddFilter', false)\"
id=\"create_filter_btn\"
value=\"Create filter\">";
print "
Selection:
<input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"javascript:editSelectedFilter()\" value=\"Edit\">
+ onclick=\"return editSelectedFilter()\" value=\"Edit\">
<input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"javascript:removeSelectedFilters()\" value=\"Remove\">";
+ onclick=\"return removeSelectedFilters()\" value=\"Remove\">";
print "</p>";
if ($id == "quickAddFilter") {
+ $active_feed_id = db_escape_string($_GET["param"]);
+
print "<div id=\"infoBoxTitle\">Create filter</div>";
print "<div class=\"infoBoxContents\">";
print "<input type=\"hidden\" name=\"subop\" value=\"add\">";
// print "<div class=\"notice\"><b>Note:</b> filter will only apply to new articles.</div>";
-
+
$result = db_query($link, "SELECT id,description
FROM ttrss_filter_types ORDER BY description");
print "</td></tr>";
print "<tr><td>Feed:</td><td colspan='2'>";
- print_feed_select($link, "feed_id");
+ print_feed_select($link, "feed_id", $active_feed_id);
print "</td></tr>";
print "<input type=\"submit\"
id=\"infobox_submit\"
- class=\"button\" onclick=\"qaddFilter()\"
+ class=\"button\" onclick=\"return qaddFilter()\"
disabled=\"true\" value=\"Create\"> ";
print "<input class=\"button\"
- type=\"submit\" onclick=\"closeInfoBox()\"
+ type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"Cancel\">";
print "</div>";
print "<div align='right'>
<input class=\"button\"
- type=\"submit\" onclick=\"javascript:userEditSave()\" value=\"Save\">
+ type=\"submit\" onclick=\"return userEditSave()\"
+ value=\"Save\">
<input class=\"button\"
- type=\"submit\" onclick=\"javascript:userEditCancel()\"
+ type=\"submit\" onclick=\"return userEditCancel()\"
value=\"Cancel\"></div>";
print "</div>";
if (!$limit) $limit = 25;
- $result = db_query($link, "SELECT feed_url,count(id) AS subscribers
- FROM ttrss_feeds
- WHERE auth_login = '' AND auth_pass = '' AND private = false
- GROUP BY feed_url ORDER BY subscribers DESC LIMIT $limit");
+ $owner_uid = $_SESSION["uid"];
+
+ $result = db_query($link, "SELECT feed_url,COUNT(id) AS subscribers
+ FROM ttrss_feeds WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
+ WHERE tf.feed_url = ttrss_feeds.feed_url
+ AND owner_uid = '$owner_uid') GROUP BY feed_url
+ ORDER BY subscribers DESC LIMIT $limit");
+
print "<div style=\"float : right\">
Top <select id=\"feedBrowserLimit\">";
while ($line = db_fetch_assoc($result)) {
$feed_url = $line["feed_url"];
$subscribers = $line["subscribers"];
-
- $sub_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE feed_url = '$feed_url' AND owner_uid =" .
- $_SESSION["uid"]);
-
- if (db_num_rows($sub_result) > 0) {
- continue; // already subscribed
- }
$det_result = db_query($link, "SELECT site_url,title,id
FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");
git.wh0rd.org / tt-rss.git / blobdiff