$op = $_REQUEST["op"];
- define('SCHEMA_VERSION', 8);
+ define('SCHEMA_VERSION', 9);
require_once "sanity_check.php";
require_once "config.php";
print_error_xml(9, $err_msg); die;
}
- if ((!$op || $op == "rpc" || $op == "globalUpdateFeeds") && !$_REQUEST["noxml"]) {
+ if ((!$op || $op == "rpc" || $op == "rss" ||
+ $op == "globalUpdateFeeds") && !$_REQUEST["noxml"]) {
header("Content-Type: application/xml");
}
- if (!$_SESSION["uid"] && $op != "globalUpdateFeeds") {
+ if (!$_SESSION["uid"] && $op != "globalUpdateFeeds" && $op != "rss") {
if ($op == "rpc") {
print_error_xml(6); die;
print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
}
- $result = db_query($link, "SELECT count(id) as num_starred
- FROM ttrss_entries,ttrss_user_entries
- WHERE marked = true AND
- ttrss_user_entries.ref_id = ttrss_entries.id AND
- unread = true AND owner_uid = '$owner_uid'");
- $num_starred = db_fetch_result($result, 0, "num_starred");
+ $num_starred = getFeedUnread($link, -1);
$class = "virt";
while ($line = db_fetch_assoc($result)) {
error_reporting (0);
-
- $tmp_result = db_query($link, "SELECT count(id) as count
- FROM ttrss_entries,ttrss_user_entries
- WHERE (" . $line["sql_exp"] . ") AND unread = true AND
- ttrss_user_entries.ref_id = ttrss_entries.id
- AND owner_uid = '$owner_uid'");
-
- $count = db_fetch_result($tmp_result, 0, "count");
-
+
+ $label_id = -$line['id'] - 11;
+ $count = getFeedUnread($link, $label_id);
+
$class = "label";
if ($count > 0) {
error_reporting (DEFAULT_ERROR_LEVEL);
- printFeedEntry(-$line["id"]-11,
- $class, $line["description"], $count, "images/label.png", $link);
+ printFeedEntry($label_id,
+ $class, db_unescape_string($line["description"]),
+ $count, "images/label.png", $link);
}
FROM ttrss_feeds LEFT JOIN ttrss_feed_categories
ON (ttrss_feed_categories.id = cat_id)
WHERE
+ ttrss_feeds.hidden = false AND
ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
ORDER BY $order_by_qpart");
$ellipsis = "";
}
- if ($cat_id) {
- $cat_id_qpart = "cat_id = '$cat_id'";
- } else {
- $cat_id_qpart = "cat_id IS NULL";
- }
-
- $tmp_result = db_query($link, "SELECT count(int_id) AS unread
- FROM ttrss_user_entries,ttrss_feeds WHERE
- unread = true AND
- feed_id = ttrss_feeds.id AND $cat_id_qpart AND
- ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
-
- $cat_unread = db_fetch_result($tmp_result, 0, "unread");
-
$cat_id = sprintf("%d", $cat_id);
+
+ $cat_unread = getCategoryUnread($link, $cat_id);
print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
- <a href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
+ <a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
<a href=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">
<span id=\"FCATCTR-$cat_id\"
class=\"$catctr_class\">($cat_unread unread)$ellipsis</span>
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"]);
if (!$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 = "";
+ $qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on);
- // 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") {
-
- $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>";
}
function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
- $bottom = false, $rtl_content = false) {
+ $bottom = false, $rtl_content = false, $feed_id = 0,
+ $is_cat = false, $search = false, $match_on = false,
+ $search_mode = false) {
if (!$bottom) {
$class = "headlinesSubToolbar";
print "<td class=\"headlineActions$rtl_cpart\">
Select:
- <a href='#' onclick=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)\">All</a>,
- <a href='#' onclick=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)\">Unread</a>,
- <a href='#' onclick=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)\">None</a>
+ <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)\">All</a>,
+ <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)\">Unread</a>,
+ <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)\">None</a>
- Toggle: <a href='#' onclick=\"javascript:selectionToggleUnread()\">Unread</a>,
- <a href='#' onclick=\"javascript:selectionToggleMarked()\">Starred</a>";
+ Toggle: <a href=\"javascript:selectionToggleUnread()\">Unread</a>,
+ <a href=\"javascript:selectionToggleMarked()\">Starred</a>";
+
print "</td>";
+ if ($search && $feed_id > 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
+ print "<td class=\"headlineActions$rtl_cpart\">
+ <a href=\"javascript:labelFromSearch('$search', '$search_mode',
+ '$match_on', '$feed_id', '$is_cat');\">
+ Convert this search to label</a></td>";
+ }
+
} else {
print "<td class=\"headlineActions$rtl_cpart\">
Select:
- <a href=\"#\" onclick=\"javascript:cdmSelectArticles('all')\">All</a>,
- <a href=\"#\" onclick=\"javascript:cdmSelectArticles('unread')\">Unread</a>,
- <a href=\"#\" onclick=\"javascript:cdmSelectArticles('none')\">None</a>
+ <a href=\"javascript:cdmSelectArticles('all')\">All</a>,
+ <a href=\"javascript:cdmSelectArticles('unread')\">Unread</a>,
+ <a href=\"javascript:cdmSelectArticles('none')\">None</a>
- Toggle: <a href=\"#\" onclick=\"javascript:selectionToggleUnread(true)\">Unread</a>,
- <a href=\"#\" onclick=\"javascript:selectionToggleMarked(true)\">Starred</a>";
+ Toggle: <a href=\"javascript:selectionToggleUnread(true)\">Unread</a>,
+ <a href=\"javascript:selectionToggleMarked(true)\">Starred</a>";
print "</td>";
} else {
print $feed_title;
}
+
+ if ($search) {
+ $search_q = "&q=$search&m=$match_on&smode=$search_mode";
+ }
+
+ if (!$bottom) {
+ print "
+ <a target=\"_new\"
+ 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>";
+ }
print "</td>";
print "</tr></table>";
if (db_num_rows($result) > 0) {
print_headline_subtoolbar($link, $feed_site_url, $feed_title, false,
- $rtl_content);
+ $rtl_content, $feed, $cat_view, $search, $match_on, $search_mode);
if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
print "<table class=\"headlinesList\" id=\"headlinesList\"
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");
print "<tr><td valign='top'>Options:</td>";
print "<td><input type=\"checkbox\" name=\"private\" id=\"private\"
- $checked><label for=\"private\">Hide from feed browser</label>";
+ $checked><label for=\"private\">Hide from \"Other Feeds\"</label>";
$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
print "<br><input type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
$checked><label for=\"rtl_content\">Right-to-left content</label>";
-
+
+ $hidden = sql_bool_to_bool(db_fetch_result($result, 0, "hidden"));
+
+ if ($hidden) {
+ $checked = "checked";
+ } else {
+ $checked = "";
+ }
+
+ print "<br><input type=\"checkbox\" id=\"hidden\" name=\"hidden\"
+ $checked><label for=\"hidden\">Hide from my feed list</label>";
+
print "</td></tr>";
print "</table>";
print "</form>";
- print "</div>";
-
- print "<div align='center'>
+ print "<div align='right'>
<input type=\"submit\" class=\"button\"
onclick=\"return feedEditSave()\" value=\"Save\">
<input type='submit' class='button'
onclick=\"return feedEditCancel()\" value=\"Cancel\"></div>";
+
+ print "</div>";
+
return;
}
$parent_feed = db_escape_string($_POST["parent_feed"]);
$private = checkbox_to_sql_bool(db_escape_string($_POST["private"]));
$rtl_content = checkbox_to_sql_bool(db_escape_string($_POST["rtl_content"]));
+ $hidden = checkbox_to_sql_bool(db_escape_string($_POST["hidden"]));
- 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',
auth_login = '$auth_login',
auth_pass = '$auth_pass',
private = $private,
- rtl_content = $rtl_content
+ rtl_content = $rtl_content,
+ hidden = $hidden
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
}
$ids = split(",", db_escape_string($_GET["ids"]));
foreach ($ids as $id) {
- db_query($link, "DELETE FROM ttrss_feeds
- WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- $icons_dir = ICONS_DIR;
+ if ($id > 0) {
+
+ db_query($link, "DELETE FROM ttrss_feeds
+ WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+
+ $icons_dir = ICONS_DIR;
- if (file_exists($icons_dir . "/$id.ico")) {
- unlink($icons_dir . "/$id.ico");
+ if (file_exists($icons_dir . "/$id.ico")) {
+ unlink($icons_dir . "/$id.ico");
+ }
+ } else if ($id < -10) {
+
+ $label_id = -$id - 11;
+
+ db_query($link, "DELETE FROM ttrss_labels
+ WHERE id = '$label_id' AND owner_uid = " . $_SESSION["uid"]);
}
}
}
// print "<h3>Edit Feeds</h3>";
- $result = db_query($link, "SELECT id,title,feed_url,last_error
+ $result = db_query($link, "SELECT id,title,feed_url,last_error
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
if (db_num_rows($result) > 0) {
$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,
F1.purge_interval,
F1.cat_id,
F2.title AS parent_title,
- C1.title AS category
+ C1.title AS category,
+ F1.hidden
FROM
ttrss_feeds AS F1
LEFT JOIN ttrss_feeds AS F2
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) {
$edit_link = htmlspecialchars(db_unescape_string($line["feed_url"]));
$edit_cat = htmlspecialchars(db_unescape_string($line["category"]));
+ $hidden = sql_bool_to_bool($line["hidden"]);
+
if (!$edit_cat) $edit_cat = "Uncategorized";
$last_updated = $line["last_updated"];
$edit_title = truncate_string($edit_title, 40);
$edit_link = truncate_string($edit_link, 60);
+ if ($hidden) {
+ $edit_title = "<span class=\"insensitive\">$edit_title (Hidden)</span>";
+ $edit_link = "<span class=\"insensitive\">$edit_link</span>";
+ $last_updated = "<span class=\"insensitive\">$last_updated</span>";
+ }
+
$parent_title = $line["parent_title"];
if ($parent_title) {
$parent_title = "<span class='groupPrompt'>(linked to
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\">";
}
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>";
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 ($op == "pref-labels") {
if (!GLOBAL_ENABLE_LABELS) {
+
+ print "<p>Sorry, labels have been administratively disabled for this installation. Please contact instance owner or edit configuration file to enable this functionality.</p>";
return;
}
$subop = $_GET["subop"];
+ if ($subop == "edit") {
+
+ $label_id = db_escape_string($_GET["id"]);
+
+ $result = db_query($link, "SELECT sql_exp,description FROM ttrss_labels WHERE
+ owner_uid = ".$_SESSION["uid"]." AND id = '$label_id' ORDER by description");
+
+ $line = db_fetch_assoc($result);
+
+ $sql_exp = htmlspecialchars(db_unescape_string($line["sql_exp"]));
+ $description = htmlspecialchars(db_unescape_string($line["description"]));
+
+ print "<div id=\"infoBoxTitle\">Label editor</div>";
+ print "<div class=\"infoBoxContents\">";
+
+ print "<form id=\"label_edit_form\">";
+
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-labels\">";
+ print "<input type=\"hidden\" name=\"id\" value=\"$label_id\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
+
+ print "<table width='100%'>";
+
+ print "<tr><td>Caption:</td>
+ <td><input onkeypress=\"return filterCR(event)\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ name=\"description\" class=\"iedit\" value=\"$description\">";
+
+ print "</td></tr>";
+
+ print "<tr><td colspan=\"2\">
+ <p>SQL Expression:</p>";
+
+ print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ rows=\"4\" name=\"sql_exp\" class=\"iedit\">$sql_exp</textarea>";
+
+ print "</td></tr></table>";
+
+ print "</form>";
+
+ print "<div style=\"display : none\" id=\"label_test_result\"></div>";
+
+ print "<div align='right'>";
+
+ print "<input type=\"submit\" onclick=\"labelTest()\" value=\"Test\">
+ ";
+
+ print "<input type=\"submit\"
+ id=\"infobox_submit\"
+ class=\"button\" onclick=\"return labelEditSave()\"
+ value=\"Save\"> ";
+
+ print "<input class=\"button\"
+ type=\"submit\" onclick=\"return labelEditCancel()\"
+ value=\"Cancel\">";
+
+ print "</div>";
+
+ return;
+ }
+
if ($subop == "test") {
- $expr = trim($_GET["expr"]);
- $descr = trim($_GET["descr"]);
+ $expr = db_unescape_string(trim($_GET["expr"]));
+ $descr = db_unescape_string(trim($_GET["descr"]));
- print "<div id=\"infoBoxTitle\">Test label: $descr</div>";
+ print "<div>";
- print "<div class='infoBoxContents'>";
-
-# print "<h1>Label «$descr»</h1>";
+ error_reporting(0);
-// print "<p><b>Expression</b>: $expr</p>";
$result = db_query($link,
- "SELECT count(id) AS num_matches
- FROM ttrss_entries,ttrss_user_entries
+ "SELECT count(ttrss_entries.id) AS num_matches
+ FROM ttrss_entries,ttrss_user_entries,ttrss_feeds
WHERE ($expr) AND
ttrss_user_entries.ref_id = ttrss_entries.id AND
- owner_uid = " . $_SESSION["uid"]);
+ ttrss_user_entries.feed_id = ttrss_feeds.id AND
+ ttrss_user_entries.owner_uid = " . $_SESSION["uid"], false);
+
+ error_reporting (DEFAULT_ERROR_LEVEL);
+
+ if (!$result) {
+ print "<p>" . db_last_error($link) . "</p>";
+ print "</div>";
+ return;
+ }
$num_matches = db_fetch_result($result, 0, "num_matches");;
if ($num_matches > 0) {
- print "<p>Query returned <b>$num_matches</b> matches, showing first 15:</p>";
+ if ($num_matches > 10) {
+ $showing_msg = ", showing first 10";
+ }
+
+ print "<p>Query returned <b>$num_matches</b> matches$showing_msg:</p>";
$result = db_query($link,
- "SELECT title,
+ "SELECT ttrss_entries.title,
(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
- FROM ttrss_entries,ttrss_user_entries
+ FROM ttrss_entries,ttrss_user_entries,ttrss_feeds
WHERE ($expr) AND
ttrss_user_entries.ref_id = ttrss_entries.id
- AND owner_uid = " . $_SESSION["uid"] . "
- ORDER BY date_entered DESC LIMIT 15");
+ AND ttrss_user_entries.feed_id = ttrss_feeds.id
+ AND ttrss_user_entries.owner_uid = " . $_SESSION["uid"] . "
+ ORDER BY date_entered DESC LIMIT 10", false);
- print "<ul class=\"filterTestResults\">";
+ print "<ul class=\"labelTestResults\">";
$row_class = "even";
print "</div>";
- print "<div align='center'>
- <input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
return;
}
if (!WEB_DEMO_MODE) {
// no escaping is done here on purpose
- $exp = trim($_GET["exp"]);
+ $sql_exp = trim($_GET["sql_exp"]);
+ $description = db_escape_string($_GET["description"]);
$result = db_query($link,
"INSERT INTO ttrss_labels (sql_exp,description,owner_uid)
- VALUES ('$exp', '$exp', '".$_SESSION["uid"]."')");
+ VALUES ('$sql_exp', '$description', '".$_SESSION["uid"]."')");
}
}
- print "<div class=\"prefGenericAddBox\">
- <input size=\"40\"
- onkeyup=\"toggleSubmitNotEmpty(this, 'label_create_btn')\"
- id=\"ladd_expr\"> ";
-
+ print "<div class=\"prefGenericAddBox\">";
+
print"<input type=\"submit\" class=\"button\"
- disabled=\"true\" id=\"label_create_btn\"
- onclick=\"javascript:addLabel()\" value=\"Create label\"></div>";
+ id=\"label_create_btn\"
+ onclick=\"return displayDlg('quickAddLabel', false)\"
+ value=\"Create label\"></div>";
$result = db_query($link, "SELECT
id,sql_exp,description
print "<tr class=\"title\">
<td width=\"5%\"> </td>
- <td width=\"40%\">SQL expression
+ <td width=\"30%\">Caption</td>
+ <td width=\"50%\">SQL Expression
<a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
</td>
- <td width=\"40%\">Caption</td></tr>";
+ </tr>";
$lnum = 0;
print "<tr class=\"$class\" $this_row_id>";
- $line["sql_exp"] = htmlspecialchars($line["sql_exp"]);
- $line["description"] = htmlspecialchars($line["description"]);
+ $line["sql_exp"] = htmlspecialchars(db_unescape_string($line["sql_exp"]));
+ $line["description"] = htmlspecialchars(
+ db_unescape_string($line["description"]));
- if (!$edit_label_id || $subop != "edit") {
+ if (!$line["description"]) $line["description"] = "[No caption]";
- if (!$line["description"]) $line["description"] = "[No caption]";
-
- print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"label\");'
+ print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"label\");'
type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
- print "<td><a href=\"javascript:editLabel($label_id);\">" .
- $line["sql_exp"] . "</td>";
-
- print "<td><a href=\"javascript:editLabel($label_id);\">" .
- $line["description"] . "</td>";
-
- } else if ($label_id != $edit_label_id) {
-
- if (!$line["description"]) $line["description"] = "[No description]";
-
- print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
- id=\"LICHK-".$line["id"]."\"></td>";
-
- print "<td>".$line["sql_exp"]."</td>";
- print "<td>".$line["description"]."</td>";
-
- } else {
-
- print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked>";
+ print "<td><a href=\"javascript:editLabel($label_id);\">" .
+ $line["description"] . "</td>";
+
+ print "<td><a href=\"javascript:editLabel($label_id);\">" .
+ $line["sql_exp"] . "</td>";
- print "<input type=\"hidden\" name=\"id\" value=\"$label_id\">";
- print "<input type=\"hidden\" name=\"op\" value=\"pref-labels\">";
- print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
-
- print "</td>";
-
- print "<td><input onkeypress=\"return filterCR(event)\"
- class=\"iedit\" name=\"sql_exp\" value=\"".$line["sql_exp"]."\"></td>";
-
- print "<td><input onkeypress=\"return filterCR(event)\"
- class=\"iedit\" name=\"description\" value=\"".$line["description"]."\"></td>";
- }
-
-
print "</tr>";
++$lnum;
print "<p id=\"labelOpToolbar\">";
- if ($subop == "edit") {
- print "Edit label:
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:labelTest()\" value=\"Test\">
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:labelEditSave()\" value=\"Save\">
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:labelEditCancel()\" value=\"Cancel\">";
-
- } else {
- print "
+ print "
Selection:
<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:editSelectedLabel()\" value=\"Edit\">
<input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"javascript:removeSelectedLabels()\" value=\"Remove\">";
- }
+ onclick=\"javascript:removeSelectedLabels()\" value=\"Remove\">";
+
} else {
print "<p>No labels defined.</p>";
}
print "<form id='search_form'>";
- $active_feed_id = db_escape_string($_GET["param"]);
+ #$active_feed_id = db_escape_string($_GET["param"]);
+
+ $params = split(":", db_escape_string($_GET["param"]));
+
+ $active_feed_id = sprintf("%d", $params[0]);
+ $is_cat = $params[1] == "true";
print "<table width='100%'><tr><td>Search:</td><td>";
<option value=\"all_feeds\">All feeds</option>";
$feed_title = getFeedTitle($link, $active_feed_id);
- $feed_cat_title = getFeedCatTitle($link, $active_feed_id);
+
+ if (!$is_cat) {
+ $feed_cat_title = getFeedCatTitle($link, $active_feed_id);
+ } else {
+ $feed_cat_title = getCategoryTitle($link, $active_feed_id);
+ }
- if ($active_feed_id) {
+ if ($active_feed_id && !$is_cat) {
print "<option selected value=\"this_feed\">This feed ($feed_title)</option>";
} else {
print "<option disabled>This feed</option>";
}
- if (get_pref($link, 'ENABLE_FEED_CATS') && $active_feed_id && $active_feed_id > 0) {
- print "<option value=\"this_cat\">This category ($feed_cat_title)</option>";
+ if ($is_cat) {
+ $cat_preselected = "selected";
+ }
+
+ if (get_pref($link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
+ print "<option $cat_preselected value=\"this_cat\">This category ($feed_cat_title)</option>";
} else {
print "<option disabled>This category</option>";
}
}
+ if ($id == "quickAddLabel") {
+ print "<div id=\"infoBoxTitle\">Create label</div>";
+ print "<div class=\"infoBoxContents\">";
+
+ print "<form id=\"label_edit_form\">";
+
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-labels\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"add\">";
+
+ print "<table width='100%'>";
+
+ print "<tr><td>Caption:</td>
+ <td><input onkeypress=\"return filterCR(event)\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ name=\"description\" class=\"iedit\">";
+
+ print "</td></tr>";
+
+ print "<tr><td colspan=\"2\">
+ <p>SQL Expression:</p>";
+
+ print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ rows=\"4\" name=\"sql_exp\" class=\"iedit\"></textarea>";
+
+ print "</td></tr></table>";
+
+ print "</form>";
+
+ print "<div style=\"display : none\" id=\"label_test_result\"></div>";
+
+ print "<div align='right'>";
+
+ print "<input type=\"submit\" onclick=\"labelTest()\" value=\"Test\">
+ ";
+
+ print "<input type=\"submit\"
+ id=\"infobox_submit\"
+ disabled=\"true\"
+ class=\"button\" onclick=\"return addLabel()\"
+ value=\"Create\"> ";
+
+ print "<input class=\"button\"
+ type=\"submit\" onclick=\"return labelEditCancel()\"
+ value=\"Cancel\">";
+ }
+
if ($id == "quickAddFilter") {
$active_feed_id = db_escape_string($_GET["param"]);
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");
}
+ if ($op == "rss") {
+ $feed = db_escape_string($_GET["id"]);
+ $user = db_escape_string($_GET["user"]);
+ $pass = db_escape_string($_GET["pass"]);
+ $is_cat = $_GET["is_cat"] != false;
+
+ $search = db_escape_string($_GET["q"]);
+ $match_on = db_escape_string($_GET["m"]);
+ $search_mode = db_escape_string($_GET["smode"]);
+
+ if (!$_SESSION["uid"] && $user && $pass) {
+ authenticate_user($link, $user, $pass);
+ }
+
+ if ($_SESSION["uid"] ||
+ http_authenticate_user($link)) {
+
+ generate_syndicated_feed($link, $feed, $is_cat,
+ $search, $search_mode, $match_on);
+ }
+ }
+
function check_configuration_variables() {
if (!defined('SESSION_EXPIRE_TIME')) {
return "config: SESSION_EXPIRE_TIME is undefined";
return false;
}
+ if ($op == "labelFromSearch") {
+ $search = db_escape_string($_GET["search"]);
+ $search_mode = db_escape_string($_GET["smode"]);
+ $match_on = db_escape_string($_GET["match"]);
+ $is_cat = db_escape_string($_GET["is_cat"]);
+ $title = db_escape_string($_GET["title"]);
+ $feed = sprintf("%d", $_GET["feed"]);
+
+ $label_qparts = array();
+
+ $search_expr = getSearchSql($search, $match_on);
+
+ if ($is_cat) {
+ if ($feed != 0) {
+ $search_expr .= " AND ttrss_feeds.cat_id = $feed ";
+ } else {
+ $search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
+ }
+ } else {
+ if ($search_mode == "all_feeds") {
+ // NOOP
+ } else if ($search_mode == "this_cat") {
+
+ $tmp_result = db_query($link, "SELECT cat_id
+ FROM ttrss_feeds WHERE id = '$feed'");
+
+ $cat_id = db_fetch_result($tmp_result, 0, "cat_id");
+
+ if ($cat_id > 0) {
+ $search_expr .= " AND ttrss_feeds.cat_id = $cat_id ";
+ } else {
+ $search_expr .= " AND ttrss_feeds.cat_id IS NULL ";
+ }
+ } else {
+ $search_expr .= " AND ttrss_feeds.id = $feed ";
+ }
+
+ }
+
+ $search_expr = db_escape_string($search_expr);
+
+ print $search_expr;
+
+ if ($title) {
+ $result = db_query($link,
+ "INSERT INTO ttrss_labels (sql_exp,description,owner_uid)
+ VALUES ('$search_expr', '$title', '".$_SESSION["uid"]."')");
+ }
+ }
+
db_close($link);
?>
git.wh0rd.org / tt-rss.git / blobdiff