$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;
}
$purge_intervals = array(
- 0 => "Default",
+ 0 => "Use default",
-1 => "Never purge",
- 5 => "1 week",
- 14 => "2 weeks",
- 31 => "1 month",
- 60 => "2 months",
- 90 => "3 months");
+ 5 => "1 week old",
+ 14 => "2 weeks old",
+ 31 => "1 month old",
+ 60 => "2 months old",
+ 90 => "3 months old");
$update_intervals = array(
- 0 => "Default",
+ 0 => "Use default",
-1 => "Disable updates",
- 30 => "30 minutes",
- 60 => "1 hour",
- 240 => "4 hours",
- 720 => "12 hours",
+ 30 => "Each 30 minutes",
+ 60 => "Hourly",
+ 240 => "Each 4 hours",
+ 720 => "Each 12 hours",
1440 => "Daily",
10080 => "Weekly");
+ $access_level_names = array(
+ 0 => "User",
+ 10 => "Administrator");
+
$script_started = getmicrotime();
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
}
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"];
$script_dt_add = get_script_dt_add();
- print "<script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
+ print "
+ <script type=\"text/javascript\" src=\"prototype.js\"></script>
+ <script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
<script type=\"text/javascript\" src=\"feedlist.js?$script_dt_add\"></script>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
<!--[if gte IE 5.5000]>
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);
}
// }
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.*,
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>
$script_dt_add = get_script_dt_add();
- print "<script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
+ print "
+ <script type=\"text/javascript\" src=\"prototype.js\"></script>
+ <script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
</head><body $rtl_tag>";
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'),
print "</div>";
print "<script type=\"text/javascript\">
- update_all_counters('$feed_id');
+ try {
+ parent.update_all_counters('$feed_id');
+ } catch (e) {
+ exception_error('view/footer', e);
+ }
</script>";
}
if ($op == "viewfeed") {
$feed = db_escape_string($_GET["feed"]);
- $skip = db_escape_string($_GET["skip"]);
$subop = db_escape_string($_GET["subop"]);
- $view_mode = db_escape_string($_GET["view"]);
+ $view_mode = db_escape_string($_GET["view_mode"]);
$limit = db_escape_string($_GET["limit"]);
$cat_view = db_escape_string($_GET["cat"]);
$next_unread_feed = db_escape_string($_GET["nuf"]);
- if (!$skip) $skip = 0;
-
if ($subop == "undefined") $subop = "";
print "<html><head>
}
}
+ 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
$script_dt_add = get_script_dt_add();
print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
+ <script type=\"text/javascript\" src=\"prototype.js\"></script>
<script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
<script type=\"text/javascript\" src=\"viewfeed.js?$script_dt_add\"></script>
<!--[if gte IE 5.5000]>
window.onload = init;
</script>";
- $search = db_escape_string($_GET["search"]);
- $search_mode = db_escape_string($_GET["smode"]);
-
- if ($search) {
- $search_query_part = "(upper(ttrss_entries.title) LIKE upper('%$search%')
- OR ttrss_entries.content LIKE '%$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 ";
- }
- }
- }
+ /// START /////////////////////////////////////////////////////////////////////////////////
- if ($view_mode == "Starred") {
- $view_query_part = " marked = true AND ";
- }
+ $search = db_escape_string($_GET["query"]);
+ $search_mode = db_escape_string($_GET["search_mode"]);
+ $match_on = db_escape_string($_GET["match_on"]);
- if ($view_mode == "Unread") {
- $view_query_part = " unread = true AND ";
+ if (!$match_on) {
+ $match_on = "both";
}
- if ($limit && $limit != "All") {
- $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 category") {
-
- $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;
+ $qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on);
- $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\">
print "</div>";
- print "<script type=\"text/javascript\">
- document.onkeydown = hotkey_handler;
- // if (parent.daemon_enabled) parent.updateTitle('$feed_title');
- update_all_counters('$feed');
- </script>";
-
- print '
- <script type="text/javascript">
+ print "
+ <script type=\"text/javascript\">
+ try {
+ document.onkeydown = hotkey_handler;
+ 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);
+ }
+
/* for IE */
function statechange() {
- if (document.readyState == "interactive") init();
+ if (document.readyState == \"interactive\") init();
}
-
+
if (document.readyState) {
- if (document.readyState == "interactive" || document.readyState == "complete") {
+ if (document.readyState == \"interactive\" || document.readyState == \"complete\") {
init();
} else {
document.onreadystatechange = statechange;
}
}
- </script>';
+ </script>";
print "</body></html>";
}
- if ($op == "pref-rpc") {
-
- $subop = $_GET["subop"];
-
- if ($subop == "unread") {
- $ids = split(",", db_escape_string($_GET["ids"]));
- foreach ($ids as $id) {
- db_query($link, "UPDATE ttrss_user_entries SET unread = true
- WHERE feed_id = '$id' AND owner_uid = ".$_SESSION["uid"]);
- }
-
- print "Marked selected feeds as unread.";
- }
-
- if ($subop == "read") {
- $ids = split(",", db_escape_string($_GET["ids"]));
- foreach ($ids as $id) {
- db_query($link, "UPDATE ttrss_user_entries
- SET unread = false,last_read = NOW() WHERE
- feed_id = '$id' AND owner_uid = ".$_SESSION["uid"]);
- }
-
- print "Marked selected feeds as read.";
-
- }
-
- }
-
if ($op == "pref-feeds") {
$subop = $_REQUEST["subop"];
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");
}
if ($subop == "editfeed") {
- $feed_id = db_escape_string($_GET["id"]);
+ $feed_id = db_escape_string($_REQUEST["id"]);
$result = db_query($link,
"SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
print "<div class=\"infoBoxContents\">";
-# print "<h1>$feed_icon $title</h1>";
+ print "<form id=\"edit_feed_form\">";
- print "<table width='100%'>";
+ print "<input type=\"hidden\" name=\"id\" value=\"$feed_id\">";
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
-# $row_class = "odd";
+ print "<table width='100%'>";
- print "<tr class='$row_class'><td>Title:</td>";
- print "<td><input id=\"iedit_title\" value=\"$title\"></td></tr>";
+ print "<tr><td>Title:</td>";
+ print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event)\"
+ name=\"title\" value=\"$title\"></td></tr>";
$feed_url = db_fetch_result($result, 0, "feed_url");
$feed_url = htmlspecialchars(db_unescape_string(db_fetch_result($result,
0, "feed_url")));
-# $row_class = toggleEvenOdd($row_class);
-
- print "<tr class='$row_class'><td>Feed URL:</td>";
- print "<td><input id=\"iedit_link\" value=\"$feed_url\"></td></tr>";
+
+ print "<tr><td>Feed URL:</td>";
+ print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event)\"
+ name=\"feed_url\" value=\"$feed_url\"></td></tr>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
$cat_id = db_fetch_result($result, 0, "cat_id");
-# $row_class = toggleEvenOdd($row_class);
-
- print "<tr class='$row_class'><td>Category:</td>";
+ print "<tr><td>Category:</td>";
print "<td>";
- print "<select id=\"iedit_fcat\">";
- print "<option id=\"0\">Uncategorized</option>";
-
- $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feed_categories
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
- if (db_num_rows($tmp_result) > 0) {
- print "<option disabled>--------</option>";
- }
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- if ($tmp_line["id"] == $cat_id) {
- $is_selected = "selected";
- } else {
- $is_selected = "";
- }
- printf("<option $is_selected id='%d'>%s</option>",
- $tmp_line["id"], $tmp_line["title"]);
- }
+ print_feed_cat_select($link, "cat_id", $cat_id, "class=\"iedit\"");
- print "</select></td>";
+ print "</td>";
print "</td></tr>";
}
$update_interval = db_fetch_result($result, 0, "update_interval");
-# $row_class = toggleEvenOdd($row_class);
- print "<tr class='$row_class'><td>Update Interval:</td>";
-// print "<td><input id=\"iedit_updintl\"
-// value=\"$update_interval\"></td></tr>";
+ print "<tr><td>Update Interval:</td>";
print "<td>";
- print "<select id=\"iedit_updintl\">";
-
- foreach (array_keys($update_intervals) as $i) {
-
- if ($i == $update_interval) {
- $selected = "selected";
- } else {
- $selected = "";
- }
- print "<option $selected id=\"$i\">" . $update_intervals[$i] . "</option>";
- }
-
- print "</select>";
+ print_select_hash("update_interval", $update_interval, $update_intervals,
+ "class=\"iedit\"");
print "</td>";
-# $row_class = toggleEvenOdd($row_class);
-
- print "<tr class='$row_class'><td>Link to:</td><td>";
+ print "<tr><td>Link to:</td><td>";
$tmp_result = db_query($link, "SELECT COUNT(id) AS count
FROM ttrss_feeds WHERE parent_feed = '$feed_id'");
$disabled = "disabled";
}
- print "<select $disabled id=\"iedit_parent_feed\">";
+ print "<select class=\"iedit\" $disabled name=\"parent_feed\">";
- print "<option id=\"0\">Not linked</option>";
+ print "<option value=\"0\">Not linked</option>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
if ($cat_id) {
} else {
$is_selected = "";
}
- printf("<option $is_selected id='%d'>%s</option>",
+ printf("<option $is_selected value='%d'>%s</option>",
$tmp_line["id"], $tmp_line["title"]);
}
print "</td></tr>";
$purge_interval = db_fetch_result($result, 0, "purge_interval");
-# $row_class = toggleEvenOdd($row_class);
- print "<tr class='$row_class'><td>Purge Days:</td>";
-// print "<td><input id=\"iedit_purgintl\"
-// value=\"$purge_interval\"></td></tr>";
+ print "<tr><td>Article purging:</td>";
print "<td>";
- print "<select id=\"iedit_purgintl\">";
-
- foreach (array_keys($purge_intervals) as $i) {
+ print_select_hash("purge_interval", $purge_interval, $purge_intervals,
+ "class=\"iedit\"");
- if ($i == $purge_interval) {
- $selected = "selected";
- } else {
- $selected = "";
- }
- print "<option $selected id=\"$i\">" . $purge_intervals[$i] . "</option>";
- }
-
- print "</select>";
-
print "</td>";
-// print "<tr><td colspan=\"2\"><b>Authentication</b></td></tr>";
-
-# $row_class = toggleEvenOdd($row_class);
$auth_login = db_fetch_result($result, 0, "auth_login");
- print "<tr class='$row_class'><td>Login:</td>";
- print "<td><input id=\"iedit_login\"
- value=\"$auth_login\"></td></tr>";
+ print "<tr><td>Login:</td>";
+ print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event)\"
+ name=\"auth_login\" value=\"$auth_login\"></td></tr>";
-# $row_class = toggleEvenOdd($row_class);
$auth_pass = db_fetch_result($result, 0, "auth_pass");
- print "<tr class='$row_class'><td>Password:</td>";
- print "<td><input type=\"password\" id=\"iedit_pass\"
+ print "<tr><td>Password:</td>";
+ print "<td><input class=\"iedit\" type=\"password\" name=\"auth_pass\"
+ onkeypress=\"return filterCR(event)\"
value=\"$auth_pass\"></td></tr>";
-# $row_class = toggleEvenOdd($row_class);
$private = sql_bool_to_bool(db_fetch_result($result, 0, "private"));
if ($private) {
$checked = "";
}
- print "<tr class='$row_class'><td valign='top'>Options:</td>";
- print "<td><input type=\"checkbox\" id=\"iedit_private\"
- $checked><label for=\"iedit_private\">Hide from feed browser</label>";
+ print "<tr><td valign='top'>Options:</td>";
+ print "<td><input type=\"checkbox\" name=\"private\" id=\"private\"
+ $checked><label for=\"private\">Hide from \"Other Feeds\"</label>";
$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
$checked = "";
}
- print "<br><input type=\"checkbox\" id=\"iedit_rtl\"
- $checked><label for=\"iedit_rtl\">Right-to-left content</label>";
-
+ 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 "</div>";
- print "<div align='center'>
+ print "</form>";
+
+ print "<div align='right'>
<input type=\"submit\" class=\"button\"
- onclick=\"feedEditSave()\" value=\"Save\">
+ onclick=\"return feedEditSave()\" value=\"Save\">
<input type='submit' class='button'
- onclick=\"feedEditCancel()\" value=\"Cancel\"></div>";
+ onclick=\"return feedEditCancel()\" value=\"Cancel\"></div>";
+
+ print "</div>";
+
return;
}
if ($subop == "editSave") {
- $feed_title = db_escape_string($_POST["t"]);
- $feed_link = db_escape_string($_POST["l"]);
- $upd_intl = db_escape_string($_POST["ui"]);
- $purge_intl = db_escape_string($_POST["pi"]);
- $feed_id = db_escape_string($_POST["id"]);
- $cat_id = db_escape_string($_POST["catid"]);
- $auth_login = db_escape_string($_POST["login"]);
- $auth_pass = db_escape_string($_POST["pass"]);
- $parent_feed = db_escape_string($_POST["pfeed"]);
- $private = db_escape_string($_POST["is_pvt"]);
- $rtl_content = db_escape_string($_POST["is_rtl"]);
-
- if (strtoupper($upd_intl) == "DEFAULT")
- $upd_intl = 0;
- if (strtoupper($upd_intl) == "DISABLED")
- $upd_intl = -1;
-
- if (strtoupper($purge_intl) == "DEFAULT")
- $purge_intl = 0;
-
- if (strtoupper($purge_intl) == "DISABLED")
- $purge_intl = -1;
-
- if ($cat_id != 0) {
- $category_qpart = "cat_id = '$cat_id'";
+ $feed_title = db_escape_string(trim($_POST["title"]));
+ $feed_link = db_escape_string(trim($_POST["feed_url"]));
+ $upd_intl = db_escape_string($_POST["update_interval"]);
+ $purge_intl = db_escape_string($_POST["purge_interval"]);
+ $feed_id = db_escape_string($_POST["id"]);
+ $cat_id = db_escape_string($_POST["cat_id"]);
+ $auth_login = db_escape_string(trim($_POST["auth_login"]));
+ $auth_pass = db_escape_string(trim($_POST["auth_pass"]));
+ $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 (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 != 0) {
- $parent_qpart = "parent_feed = '$parent_feed'";
+ if ($parent_feed && $parent_feed != 0) {
+ $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"]);
}
if ($subop == "saveCat") {
- $cat_title = db_escape_string($_GET["title"]);
+ $cat_title = db_escape_string(trim($_GET["title"]));
$cat_id = db_escape_string($_GET["id"]);
$result = db_query($link, "UPDATE ttrss_feed_categories SET
$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"]);
}
}
}
if (!WEB_DEMO_MODE) {
- $feed_link = db_escape_string(trim($_GET["link"]));
- $cat_id = db_escape_string($_GET["cid"]);
+ $feed_url = db_escape_string(trim($_GET["feed_url"]));
+ $cat_id = db_escape_string($_GET["cat_id"]);
- if (subscribe_to_feed($link, $feed_link, $cat_id)) {
+ if (subscribe_to_feed($link, $feed_url, $cat_id)) {
print "Added feed.";
} else {
print "<div class=\"warning\">
- Feed <b>$feed_link</b> already exists in the database.
+ Feed <b>$feed_url</b> already exists in the database.
</div>";
}
}
// 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) {
cellspacing='0' cellpadding='0'><tr>
<td>
<input id=\"fadd_link\"
- onchange=\"javascript:addFeed()\"
onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
size=\"40\">
<input type=\"submit\" class=\"button\"
$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) {
-
print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
+
// print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
print "<p><table width=\"100%\" cellspacing=\"0\"
class=\"prefFeedList\" id=\"prefFeedList\">";
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>";
$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
print " | ";
- $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
- WHERE owner_uid = ".$_SESSION["uid"]."
- ORDER BY title");
-
- print "<select id=\"sfeed_set_fcat\" disabled=\"true\">";
- print "<option id=\"0\">Uncategorized</option>";
-
- if (db_num_rows($result) != 0) {
-
- print "<option disabled>--------</option>";
-
- while ($line = db_fetch_assoc($result)) {
- printf("<option id='%d'>%s</option>",
- $line["id"], $line["title"]);
- }
- }
-
- print "</select>";
+ print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
print " <input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:categorizeSelectedFeeds()\" value=\"Recategorize\">";
print "<h3>Edit Categories</h3>";
- // print "<h3>Categories</h3>";
-
print "<div class=\"prefGenericAddBox\">
<input id=\"fadd_cat\"
- onchange=\"javascript:addFeedCat()\"
onkeyup=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
size=\"40\">
<input
if (db_num_rows($result) != 0) {
+ print "<form id=\"feed_cat_edit_form\">";
+
print "<p><table width=\"100%\" class=\"prefFeedCatList\"
cellspacing=\"0\" id=\"prefFeedCatList\">";
$edit_cat_id = $_GET["id"];
if ($subop == "editCat" && $cat_id != $edit_cat_id) {
- $class .= "Grayed";
- $this_row_id = "";
+ $class .= "Grayed";
+ $this_row_id = "";
} else {
$this_row_id = "id=\"FCATR-$cat_id\"";
}
} else if ($cat_id != $edit_cat_id) {
- print "<td><input disabled=\"true\" type=\"checkbox\"
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
id=\"FRCHK-".$line["id"]."\"></td>";
print "<td>$edit_title</td>";
} else {
- print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked>";
+
+ print "<input type=\"hidden\" name=\"id\" value=\"$cat_id\">";
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"saveCat\">";
+
+ print "</td>";
- print "<td><input id=\"iedit_title\" value=\"$edit_title\"></td>";
+ print "<td><input onkeypress=\"return filterCR(event)\"
+ name=\"title\" class=\"iedit\" value=\"$edit_title\"></td>";
}
}
print "</table>";
+
+ print "</form>";
print "<p id=\"catOpToolbar\">";
if ($subop == "editCat") {
print "Edit category:
<input type=\"submit\" class=\"button\"
- onclick=\"javascript:feedCatEditCancel()\" value=\"Cancel\">
+ onclick=\"return feedCatEditSave()\" value=\"Save\">
<input type=\"submit\" class=\"button\"
- onclick=\"javascript:feedCatEditSave()\" value=\"Save\">";
+ 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\">";
}
$subop = $_GET["subop"];
$quiet = $_GET["quiet"];
- if ($subop == "editSave") {
+ if ($subop == "edit") {
- $regexp = db_escape_string($_GET["r"]);
- $match = db_escape_string($_GET["m"]);
$filter_id = db_escape_string($_GET["id"]);
- $feed_id = db_escape_string($_GET["fid"]);
- $action_id = db_escape_string($_GET["aid"]);
- if (!$feed_id) {
- $feed_id = 'NULL';
- } else {
- $feed_id = sprintf("'%s'", db_escape_string($feed_id));
- }
-
- $result = db_query($link, "UPDATE ttrss_filters SET
- reg_exp = '$regexp',
- feed_id = $feed_id,
- action_id = '$action_id',
- filter_type = (SELECT id FROM ttrss_filter_types WHERE
- description = '$match')
- WHERE id = '$filter_id'");
+ $result = db_query($link,
+ "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");
+ $feed_id = db_fetch_result($result, 0, "feed_id");
+ $action_id = db_fetch_result($result, 0, "action_id");
+
+ print "<div id=\"infoBoxTitle\">Filter editor</div>";
+ print "<div class=\"infoBoxContents\">";
+
+ print "<form id=\"filter_edit_form\">";
+
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
+ print "<input type=\"hidden\" name=\"id\" value=\"$filter_id\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
+
+// 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");
+
+ $filter_types = array();
+
+ while ($line = db_fetch_assoc($result)) {
+ //array_push($filter_types, $line["description"]);
+ $filter_types[$line["id"]] = $line["description"];
+ }
+
+ print "<table width='100%'>";
+
+ print "<tr><td>Match:</td>
+ <td><input onkeypress=\"return filterCR(event)\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ name=\"reg_exp\" class=\"iedit\" value=\"$reg_exp\">";
+
+ print "</td><td>";
+
+ print_select_hash("filter_type", $filter_type, $filter_types, "class=\"iedit\"");
+
+ print "</td></tr>";
+ print "<tr><td>Feed:</td><td colspan='2'>";
+
+ print_feed_select($link, "feed_id", $feed_id);
+
+ print "</td></tr>";
+
+ print "<tr><td>Action:</td>";
+
+ print "<td colspan='2'><select name=\"action_id\">";
+
+ $result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
+ ORDER BY name");
+
+ while ($line = db_fetch_assoc($result)) {
+ $is_sel = ($line["id"] == $action_id) ? "selected" : "";
+ printf("<option value='%d' $is_sel>%s</option>", $line["id"], $line["description"]);
+ }
+
+ print "</select>";
+
+ print "</td></tr></table>";
+
+ print "</form>";
+
+ print "<div align='right'>";
+
+ print "<input type=\"submit\"
+ id=\"infobox_submit\"
+ class=\"button\" onclick=\"return filterEditSave()\"
+ value=\"Save\"> ";
+
+ print "<input class=\"button\"
+ type=\"submit\" onclick=\"return filterEditCancel()\"
+ value=\"Cancel\">";
+
+ print "</div>";
+
+ return;
+ }
+
+
+ if ($subop == "editSave") {
+
+ $reg_exp = db_escape_string(trim($_GET["reg_exp"]));
+ $filter_type = db_escape_string(trim($_GET["filter_type"]));
+ $filter_id = db_escape_string($_GET["id"]);
+ $feed_id = db_escape_string($_GET["feed_id"]);
+ $action_id = db_escape_string($_GET["action_id"]);
+
+ if (!$feed_id) {
+ $feed_id = 'NULL';
+ } else {
+ $feed_id = sprintf("'%s'", db_escape_string($feed_id));
+ }
+
+ $result = db_query($link, "UPDATE ttrss_filters SET
+ reg_exp = '$reg_exp',
+ feed_id = $feed_id,
+ action_id = '$action_id',
+ filter_type = '$filter_type'
+ 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"]);
}
}
if (!WEB_DEMO_MODE) {
- $regexp = db_escape_string(trim($_GET["regexp"]));
- $match = db_escape_string(trim($_GET["match"]));
- $feed_id = db_escape_string($_GET["fid"]);
- $action_id = db_escape_string($_GET["aid"]);
+ $regexp = db_escape_string(trim($_GET["reg_exp"]));
+ $filter_type = db_escape_string(trim($_GET["filter_type"]));
+ $feed_id = db_escape_string($_GET["feed_id"]);
+ $action_id = db_escape_string($_GET["action_id"]);
if (!$feed_id) {
$feed_id = 'NULL';
"INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id,
action_id)
VALUES
- ('$regexp', (SELECT id FROM ttrss_filter_types WHERE
- description = '$match'),'".$_SESSION["uid"]."',
+ ('$regexp', '$filter_type','".$_SESSION["uid"]."',
$feed_id, '$action_id')");
}
}
if ($quiet) return;
- print "<div id=\"infoBoxShadow\">
- <div id=\"infoBox\">PLACEHOLDER</div></div>";
+// print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
- $result = db_query($link, "SELECT description
+ $result = db_query($link, "SELECT id,description
FROM ttrss_filter_types ORDER BY description");
$filter_types = array();
while ($line = db_fetch_assoc($result)) {
- array_push($filter_types, $line["description"]);
- }
-
-/* print "<div class=\"prefGenericAddBox\">
- <input id=\"fadd_regexp\" size=\"40\"> ";
-
- print_select("fadd_match", "Title", $filter_types);
-
- print " <select id=\"fadd_feed\">";
-
- print "<option selected id=\"0\">All feeds</option>";
-
- $result = db_query($link, "SELECT id,title FROM ttrss_feeds
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
- if (db_num_rows($result) > 0) {
- print "<option disabled>--------</option>";
+ //array_push($filter_types, $line["description"]);
+ $filter_types[$line["id"]] = $line["description"];
}
- while ($line = db_fetch_assoc($result)) {
- printf("<option id='%d'>%s</option>", $line["id"],
- db_unescape_string($line["title"]));
- }
-
- print "</select> ";
-
- print " Action: ";
-
- print "<select id=\"fadd_action\">";
-
- $result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
- ORDER BY name");
-
- while ($line = db_fetch_assoc($result)) {
- printf("<option id='%d'>%s</option>", $line["id"], $line["description"]);
- }
-
- print "</select> ";
-
-/* print "<input type=\"submit\"
- class=\"button\" onclick=\"javascript:testFilter()\"
- value=\"Test filter\"> "; */
-
-/* print "<input type=\"submit\"
- class=\"button\" onclick=\"javascript:addFilter()\"
- value=\"Create filter\">"; */
-
print "<input type=\"submit\"
class=\"button\"
- onclick=\"javascript:displayDlg('quickAddFilter', false)\"
+ onclick=\"return displayDlg('quickAddFilter', false)\"
+ id=\"create_filter_btn\"
value=\"Create filter\">";
-// print "</div>";
-
$result = db_query($link, "SELECT
ttrss_filters.id AS id,reg_exp,
ttrss_filter_types.name AS filter_type_name,
if (db_num_rows($result) != 0) {
+ print "<form id=\"filter_edit_form\">";
+
print "<p><table width=\"100%\" cellspacing=\"0\" class=\"prefFilterList\"
id=\"prefFilterList\">";
print "<tr class=\"$class\" $this_row_id>";
- $line["regexp"] = htmlspecialchars($line["reg_exp"]);
+ $line["reg_exp"] = htmlspecialchars(db_unescape_string($line["reg_exp"]));
if (!$line["feed_title"]) $line["feed_title"] = "All feeds";
-
- if (!$edit_filter_id || $subop != "edit") {
-
- print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"filter\");'
- type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
-
- print "<td><a href=\"javascript:editFilter($filter_id);\">" .
- $line["reg_exp"] . "</td>";
-
- print "<td><a href=\"javascript:editFilter($filter_id);\">" .
- $line["feed_title"] . "</td>";
-
- print "<td><a href=\"javascript:editFilter($filter_id);\">" .
- $line["filter_type_descr"] . "</td>";
-
- print "<td><a href=\"javascript:editFilter($filter_id);\">" .
- $line["action_description"] . "</td>";
-
- } else if ($filter_id != $edit_filter_id) {
-
- if (!$line["description"]) $line["description"] = "[No description]";
-
- print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
- id=\"FICHK-".$line["id"]."\"></td>";
-
- print "<td>".$line["reg_exp"]."</td>";
- print "<td>".$line["feed_title"]."</td>";
- print "<td>".$line["filter_type_descr"]."</td>";
- print "<td>".$line["action_description"]."</td>";
- } else {
-
- print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked></td>";
-
- print "<td><input id=\"iedit_regexp\" value=\"".$line["reg_exp"].
- "\"></td>";
-
- print "<td>";
- print "<select id=\"iedit_feed\">";
- print "<option id=\"0\">All feeds</option>";
-
- $tmp_result = db_query($link, "SELECT id,title FROM ttrss_feeds
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
- if (db_num_rows($tmp_result) > 0) {
- print "<option disabled>--------</option>";
- }
+ $line["feed_title"] = htmlspecialchars(db_unescape_string($line["feed_title"]));
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- if ($tmp_line["id"] == $line["feed_id"]) {
- $is_selected = "selected";
- } else {
- $is_selected = "";
- }
- printf("<option $is_selected id='%d'>%s</option>",
- $tmp_line["id"], db_unescape_string($tmp_line["title"]));
- }
-
- print "</select></td>";
+ print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"filter\");'
+ type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
- print "<td>";
- print_select("iedit_match", $line["filter_type_descr"], $filter_types);
- print "</td>";
-
- print "<td>";
- print "<select id=\"iedit_filter_action\">";
+ print "<td><a href=\"javascript:editFilter($filter_id);\">" .
+ $line["reg_exp"] . "</td>";
- $tmp_result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
- ORDER BY description");
-
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- if ($tmp_line["description"] == $line["action_description"]) {
- $is_selected = "selected";
- } else {
- $is_selected = "";
- }
- printf("<option $is_selected id='%d'>%s</option>",
- $tmp_line["id"], $tmp_line["description"]);
- }
+ print "<td><a href=\"javascript:editFilter($filter_id);\">" .
+ $line["feed_title"] . "</td>";
- print "</select></td>";
-
- print "</td>";
- }
+ print "<td><a href=\"javascript:editFilter($filter_id);\">" .
+ $line["filter_type_descr"] . "</td>";
+
+ print "<td><a href=\"javascript:editFilter($filter_id);\">" .
+ $line["action_description"] . "</td>";
print "</tr>";
}
print "</table>";
+
+ print "</form>";
print "<p id=\"filterOpToolbar\">";
- if ($subop == "edit") {
- print "Edit filter:
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:filterEditSave()\" value=\"Save\">
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:filterEditCancel()\" value=\"Cancel\">";
-
- } else {
-
- print "
+ 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>";
} else {
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 = $_GET["expr"];
- $descr = $_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, first 5 follow:</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 5");
+ 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=\"nomarks\">";
+ print "<ul class=\"labelTestResults\">";
+
+ $row_class = "even";
+
while ($line = db_fetch_assoc($result)) {
- print "<li>".$line["title"].
+ $row_class = toggleEvenOdd($row_class);
+
+ print "<li class=\"$row_class\">".$line["title"].
" <span class=\"insensitive\">(".$line["feed_title"].")</span></li>";
}
print "</ul>";
print "</div>";
- print "<div align='center'>
- <input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
return;
}
if ($subop == "editSave") {
- $sql_exp = $_GET["s"];
- $descr = $_GET["d"];
+ $sql_exp = trim($_GET["sql_exp"]);
+ $descr = db_escape_string(trim($_GET["description"]));
$label_id = db_escape_string($_GET["id"]);
-// print "$sql_exp : $descr : $label_id";
-
$result = db_query($link, "UPDATE ttrss_labels SET
sql_exp = '$sql_exp',
description = '$descr'
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
owner_uid = ".$_SESSION["uid"]."
ORDER by description");
-
print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
+
// print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
if (db_num_rows($result) != 0) {
+ print "<form id=\"label_edit_form\">";
+
print "<p><table width=\"100%\" cellspacing=\"0\"
class=\"prefLabelList\" id=\"prefLabelList\">";
</td</tr>";
print "<tr class=\"title\">
- <td align='center' width=\"5%\"> </td>
- <td width=\"40%\">SQL expression
+ <td width=\"5%\"> </td>
+ <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"]);
-
- if (!$edit_label_id || $subop != "edit") {
+ $line["sql_exp"] = htmlspecialchars(db_unescape_string($line["sql_exp"]));
+ $line["description"] = htmlspecialchars(
+ db_unescape_string($line["description"]));
- 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><input disabled=\"true\" type=\"checkbox\"
- id=\"LICHK-".$line["id"]."\"></td>";
-
- print "<td>".$line["sql_exp"]."</td>";
- print "<td>".$line["description"]."</td>";
-
- } else {
-
- print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
-
- print "<td><input id=\"iedit_expr\" value=\"".$line["sql_exp"].
- "\"></td>";
-
- print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
- "\"></td>";
- }
-
-
+ print "<td><a href=\"javascript:editLabel($label_id);\">" .
+ $line["description"] . "</td>";
+
+ print "<td><a href=\"javascript:editLabel($label_id);\">" .
+ $line["sql_exp"] . "</td>";
+
print "</tr>";
++$lnum;
}
print "</table>";
+
+ print "</form>";
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 "<html><head>
<title>Tiny Tiny RSS : Help</title>
<link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
+ <script type=\"text/javascript\" src=\"prototype.js\"></script>
<script type=\"text/javascript\" src=\"functions.js?$script_dt_add\"></script>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
</head><body>";
print "<div id=\"infoBoxTitle\">Subscribe to feed</div>";
print "<div class=\"infoBoxContents\">";
+ print "<form id='feed_add_form'>";
+
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
+ print "<input type=\"hidden\" name=\"quiet\" value=\"1\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"add\">";
+
print "<table width='100%'>
<tr><td>Feed URL:</td><td>
- <input onblur=\"javascript:enableHotkeys()\"
+ <input class=\"iedit\" onblur=\"javascript:enableHotkeys()\"
+ onkeypress=\"return filterCR(event)\"
onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
- onfocus=\"javascript:disableHotkeys()\" id=\"qafInput\"></td></tr>";
+ onfocus=\"javascript:disableHotkeys()\" name=\"feed_url\"></td></tr>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<tr><td>Category:</td><td>";
-
- $result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
- WHERE owner_uid = ".$_SESSION["uid"]."
- ORDER BY title");
-
- print "<select id=\"qafCat\">";
- print "<option id=\"0\">Uncategorized</option>";
-
- if (db_num_rows($result) != 0) {
-
- print "<option disabled>--------</option>";
-
- while ($line = db_fetch_assoc($result)) {
- printf("<option id='%d'>%s</option>",
- $line["id"], $line["title"]);
- }
- }
-
- print "</select>";
+ print_feed_cat_select($link, "cat_id");
print "</td></tr>";
}
-
- print "<tr><td colspan='2' align='right'>
+
+ print "</table>";
+ print "</form>";
+
+ print "<div align='right'>
<input class=\"button\"
id=\"fadd_submit_btn\" disabled=\"true\"
type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Subscribe\">
<input class=\"button\"
type=\"submit\" onclick=\"javascript:closeInfoBox()\"
- value=\"Cancel\"></td></tr></table>";
- }
-
- if ($id == "quickDelFeed") {
+ value=\"Cancel\"></div>";
- $param = db_escape_string($param);
-
- $result = db_query($link, "SELECT title FROM ttrss_feeds WHERE id = '$param'");
-
- if ($result) {
-
- $f_title = db_fetch_result($result, 0, "title");
-
- print "Remove current feed (<b>$f_title</b>)?
- <input class=\"button\"
- type=\"submit\" onclick=\"javascript:qfdDelete($param)\" value=\"Remove\">
- <input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeInfoBox()\"
- value=\"Cancel\">";
- } else {
- print "Error: Feed $param not found.
- <input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeInfoBox()\"
- value=\"Cancel\">";
- }
}
if ($id == "search") {
print "<div id=\"infoBoxTitle\">Search</div>";
print "<div class=\"infoBoxContents\">";
- $active_feed_id = db_escape_string($_GET["param"]);
+ print "<form id='search_form'>";
- print "<table width='100%'><tr><td>Search:</td><td>";
+ #$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 "<input id=\"searchbox\" class=\"extSearch\"
- onblur=\"javascript:enableHotkeys()\"
- onfocus=\"javascript:disableHotkeys()\"
+ print "<table width='100%'><tr><td>Search:</td><td>";
+
+ print "<input name=\"query\" class=\"iedit\"
+ onkeypress=\"return filterCR(event)\"
onkeyup=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
- onchange=\"javascript:search()\">
- </td></tr><tr><td>Where:</td><td>
- <select id=\"searchmodebox\">
- <option selected>All feeds</option>";
-
- if ($active_feed_id) {
- print "<option>This feed</option>";
+ value=\"\">
+ </td></tr>";
+
+ print "<tr><td>Where:</td><td>";
+
+ print "<select name=\"search_mode\">
+ <option value=\"all_feeds\">All feeds</option>";
+
+ $feed_title = getFeedTitle($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 && !$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')) {
- print "<option>This category</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>";
}
- print "</select></td></tr>
+ print "</select></td></tr>";
- <tr><td colspan='2' align='right'>
+ print "<tr><td>Match on:</td><td>";
+
+ $search_fields = array(
+ "title" => "Title",
+ "content" => "Content",
+ "both" => "Title or content");
+
+ print_select_hash("match_on", 3, $search_fields);
+
+ print "</td></tr></table>";
+
+ print "</form>";
+
+ print "<div align=\"right\">
<input type=\"submit\"
class=\"button\" onclick=\"javascript:search()\"
id=\"search_submit_btn\" disabled=\"true\"
value=\"Search\">
<input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeInfoBox()\"
- value=\"Cancel\"></td></tr></table>";
+ type=\"submit\" onclick=\"javascript:searchCancel()\"
+ value=\"Cancel\"></div>";
+
+ print "</div>";
+
+ }
+
+ 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 "<div id=\"infoBoxTitle\">Create filter</div>";
print "<div class=\"infoBoxContents\">";
- $result = db_query($link, "SELECT description
+ print "<form id=\"filter_add_form\">";
+
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
+ print "<input type=\"hidden\" name=\"quiet\" value=\"1\">";
+ 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");
$filter_types = array();
while ($line = db_fetch_assoc($result)) {
- array_push($filter_types, $line["description"]);
+ //array_push($filter_types, $line["description"]);
+ $filter_types[$line["id"]] = $line["description"];
}
print "<table width='100%'>";
print "<tr><td>Match:</td>
- <td><input onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
- id=\"fadd_regexp\" size=\"30\"> ";
-
- print_select("fadd_match", "Title", $filter_types);
+ <td><input onkeypress=\"return filterCR(event)\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ name=\"reg_exp\" class=\"iedit\">";
+ print "</td><td>";
+
+ print_select_hash("filter_type", 1, $filter_types, "class=\"iedit\"");
print "</td></tr>";
- print "<tr><td>Feed:</td><td><select id=\"fadd_feed\">";
-
- print "<option selected id=\"0\">All feeds</option>";
-
- $result = db_query($link, "SELECT id,title FROM ttrss_feeds
- WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
-
- if (db_num_rows($result) > 0) {
- print "<option disabled>--------</option>";
- }
-
- while ($line = db_fetch_assoc($result)) {
- if ($param == $line["id"]) {
- $selected = "selected";
- } else {
- $selected = "";
- }
- printf("<option id='%d' %s>%s</option>", $line["id"], $selected, $line["title"]);
- }
-
- print "</select></td></tr>";
+ print "<tr><td>Feed:</td><td colspan='2'>";
+
+ print_feed_select($link, "feed_id", $active_feed_id);
+
+ print "</td></tr>";
print "<tr><td>Action:</td>";
- print "<td><select id=\"fadd_action\">";
+ print "<td colspan='2'><select name=\"action_id\">";
$result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
ORDER BY name");
while ($line = db_fetch_assoc($result)) {
- printf("<option id='%d'>%s</option>", $line["id"], $line["description"]);
+ printf("<option value='%d'>%s</option>", $line["id"], $line["description"]);
}
print "</select>";
-
- print "</td></tr><tr><td colspan=\"2\" align=\"right\">";
-
+
+ print "</td></tr></table>";
+
+ print "</form>";
+
+ print "<div align='right'>";
+
print "<input type=\"submit\"
id=\"infobox_submit\"
- class=\"button\" onclick=\"javascript:qaddFilter()\"
+ class=\"button\" onclick=\"return qaddFilter()\"
disabled=\"true\" value=\"Create\"> ";
print "<input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeInfoBox()\"
+ type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"Cancel\">";
- print "</td></tr></table>";
+ print "</div>";
+
+// print "</td></tr></table>";
}
$subop = $_GET["subop"];
+ if ($subop == "edit") {
+
+ $id = db_escape_string($_GET["id"]);
+
+ print "<div id=\"infoBoxTitle\">User editor</div>";
+
+ print "<div class=\"infoBoxContents\">";
+
+ print "<form id=\"user_edit_form\">";
+
+ print "<input type=\"hidden\" name=\"id\" value=\"$id\">";
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-users\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
+
+ $result = db_query($link, "SELECT * FROM ttrss_users WHERE id = '$id'");
+
+ $login = db_fetch_result($result, 0, "login");
+ $access_level = db_fetch_result($result, 0, "access_level");
+ $email = db_fetch_result($result, 0, "email");
+
+ print "<table width='100%'>";
+ print "<tr><td>Login:</td><td>
+ <input class=\"iedit\" onkeypress=\"return filterCR(event)\"
+ name=\"login\" value=\"$login\"></td></tr>";
+
+ print "<tr><td>Change password:</td><td>
+ <input class=\"iedit\" onkeypress=\"return filterCR(event)\"
+ name=\"password\"></td></tr>";
+
+ print "<tr><td>E-mail:</td><td>
+ <input class=\"iedit\" name=\"email\" onkeypress=\"return filterCR(event)\"
+ value=\"$email\"></td></tr>";
+
+ $sel_disabled = ($id == $_SESSION["uid"]) ? "disabled" : "";
+
+ print "<tr><td>Access level:</td><td>";
+ print_select_hash("access_level", $access_level, $access_level_names,
+ $sel_disabled);
+ print "</td></tr>";
+
+ print "</table>";
+
+ print "</form>";
+
+ print "<div align='right'>
+ <input class=\"button\"
+ type=\"submit\" onclick=\"return userEditSave()\"
+ value=\"Save\">
+ <input class=\"button\"
+ type=\"submit\" onclick=\"return userEditCancel()\"
+ value=\"Cancel\"></div>";
+
+ print "</div>";
+
+ return;
+ }
+
if ($subop == "editSave") {
- if (!WEB_DEMO_MODE) {
+ if (!WEB_DEMO_MODE && $_SESSION["access_level"] >= 10) {
- $login = db_escape_string($_GET["l"]);
+ $login = db_escape_string(trim($_GET["login"]));
$uid = db_escape_string($_GET["id"]);
- $access_level = sprintf("%d", $_GET["al"]);
- $email = db_escape_string($_GET["e"]);
+ $access_level = sprintf("%d", $_GET["access_level"]);
+ $email = db_escape_string(trim($_GET["email"]));
+ $password = db_escape_string(trim($_GET["password"]));
+
+ if ($password) {
+ $pwd_hash = 'SHA1:' . sha1($password);
+ $pass_query_part = "pwd_hash = '$pwd_hash', ";
+ print "<div class='notice'>Changed password for user <b>$login</b>.</div>";
+ } else {
+ $pass_query_part = "";
+ }
- db_query($link, "UPDATE ttrss_users SET login = '$login',
+ db_query($link, "UPDATE ttrss_users SET $pass_query_part login = '$login',
access_level = '$access_level', email = '$email' WHERE id = '$uid'");
}
print "<div class=\"prefGenericAddBox\">
<input id=\"uadd_box\"
onkeyup=\"toggleSubmitNotEmpty(this, 'user_add_btn')\"
- onchange=\"javascript:addUser()\" size=\"40\"> ";
+ size=\"40\"> ";
print"<input type=\"submit\" class=\"button\"
id=\"user_add_btn\" disabled=\"true\"
ttrss_users
ORDER by login");
-
print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
+
// print "<div id=\"infoBoxShadow\"><div id=\"infoBox\">PLACEHOLDER</div></div>";
print "<p><table width=\"100%\" cellspacing=\"0\"
class=\"prefUserList\" id=\"prefUserList\">";
print "<tr class=\"title\">
<td align='center' width=\"5%\"> </td>
- <td width='20%'>Login</td>
- <td width='20%'>E-mail</td>
- <td width='20%'>Access Level</td>
- <td width='20%'>Last login</td></tr>";
+ <td width='40%'>Login</td>
+ <td width='40%'>Access Level</td>
+ <td width='30%'>Last login</td></tr>";
$lnum = 0;
$access_level_names = array(0 => "User", 10 => "Administrator");
- if (!$edit_uid || $subop != "edit") {
+// if (!$edit_uid || $subop != "edit") {
print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"user\");'
type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
if (!$line["email"]) $line["email"] = " ";
- print "<td><a href=\"javascript:editUser($uid);\">" .
- $line["email"] . "</td>";
-
print "<td><a href=\"javascript:editUser($uid);\">" .
$access_level_names[$line["access_level"]] . "</td>";
- } else if ($uid != $edit_uid) {
+/* } else if ($uid != $edit_uid) {
if (!$line["email"]) $line["email"] = " ";
print "</select>";
print "</td>";
- }
+ } */
print "<td>".$line["last_login"]."</td>";
print "<p id='userOpToolbar'>";
- if ($subop == "edit") {
+/* if ($subop == "edit") {
print "Edit user:
<input type=\"submit\" class=\"button\"
onclick=\"javascript:userEditSave()\" value=\"Save\">
<input type=\"submit\" class=\"button\"
onclick=\"javascript:userEditCancel()\" value=\"Cancel\">";
- } else {
+ } else { */
print "
Selection:
<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:resetSelectedUserPass()\" value=\"Reset password\">";
- }
+// }
}
if ($op == "user-details") {
}
- if ($op == "feed-details") {
-
-// $feed_id = $_GET["id"];
-
- $feed_ids = split(",", db_escape_string($_GET["id"]));
-
- print "<div id=\"infoBoxTitle\">Feed details</div>";
- print "<div class=\"infoBoxContents\">";
-
- foreach ($feed_ids as $feed_id) {
-
- $result = db_query($link,
- "SELECT
- title,feed_url,
- SUBSTRING(last_updated,1,16) as last_updated,
- icon_url,site_url,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id) AS total,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id AND unread = true) AS unread,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id AND marked = true) AS marked
- FROM ttrss_feeds
- WHERE id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
-
- if (db_num_rows($result) == 0) return;
-
- $title = db_unescape_string(db_fetch_result($result, 0, "title"));
- $last_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
- strtotime(db_fetch_result($result, 0, "last_updated")));
- $feed_url = db_fetch_result($result, 0, "feed_url");
- $icon_url = db_fetch_result($result, 0, "icon_url");
- $total = db_fetch_result($result, 0, "total");
- $unread = db_fetch_result($result, 0, "unread");
- $marked = db_fetch_result($result, 0, "marked");
- $site_url = db_fetch_result($result, 0, "site_url");
-
- $result = db_query($link, "SELECT COUNT(id) AS subscribed
- FROM ttrss_feeds WHERE feed_url = '$feed_url' AND private = false");
-
- $subscribed = db_fetch_result($result, 0, "subscribed");
-
- $icon_file = ICONS_DIR . "/$feed_id.ico";
-
- if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "<img width=\"16\" height=\"16\"
- src=\"" . ICONS_URL . "/$feed_id.ico\">";
- } else {
- $feed_icon = "";
- }
-
- print "<h1>$feed_icon $title</h1>";
-
- print "<table width='100%'>";
-
- if ($site_url) {
- print "<tr><td width='30%'>Link</td>
- <td><a href=\"$site_url\">$site_url</a>
- <a href=\"$feed_url\">(feed)</a></td>
- </td></tr>";
- } else {
- print "<tr><td width='30%'>Feed URL</td>
- <td><a href=\"$feed_url\">$feed_url</a></td></tr>";
- }
- print "<tr><td>Last updated</td><td>$last_updated</td></tr>";
- print "<tr><td>Total articles</td><td>$total</td></tr>";
- print "<tr><td>Unread articles</td><td>$unread</td></tr>";
- print "<tr><td>Starred articles</td><td>$marked</td></tr>";
- print "<tr><td>Subscribed users</td><td>$subscribed</td></tr>";
-
- print "</table>";
-
-/* $result = db_query($link, "SELECT title,
- SUBSTRING(updated,1,16) AS updated,unread
- FROM ttrss_entries,ttrss_user_entries
- WHERE ref_id = id AND feed_id = '$feed_id'
- ORDER BY date_entered DESC LIMIT 5");
-
- if (db_num_rows($result) > 0) {
-
- print "<h1>Latest headlines</h1>";
-
- print "<ul class=\"nomarks\">";
-
- while ($line = db_fetch_assoc($result)) {
- if ($line["unread"] == "t" || $line["unread"] == "1") {
- $line["title"] = "<b>" . $line["title"] . "</b>";
- }
- print "<li>" . $line["title"].
- " <span class=\"insensitive\">(" .
- date(get_pref($link, 'SHORT_DATE_FORMAT'),
- strtotime($line["updated"])).
- ")</span></li>";
- }
-
- print "</ul>";
-
- } */
- }
-
- print "</div>";
-
- print "<div align='center'>
- <input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
- }
-
if ($op == "pref-feed-browser") {
if (!ENABLE_FEED_BROWSER) {
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