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]>
// }
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.*,
$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>";
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>
$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"]);
+ $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) {
- $search_query_part = "(upper(ttrss_entries.title) LIKE upper('%$search%')
- OR ttrss_entries.content LIKE '%$search%') AND";
+ 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 ($view_mode == "adaptive") {
if ($search) {
$view_query_part = " ";
} else if ($feed != -1) {
}
}
- if ($view_mode == "Starred") {
+ if ($view_mode == "marked") {
$view_query_part = " marked = true AND ";
}
- if ($view_mode == "Unread") {
+ if ($view_mode == "unread") {
$view_query_part = " unread = true AND ";
}
- if ($limit && $limit != "All") {
+ if ($limit > 0) {
$limit_query_part = "LIMIT " . $limit;
}
$vfeed_query_part = "";
// override query strategy and enable feed display when searching globally
- if ($search && $search_mode == "All feeds") {
+ 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") {
+ } else if ($feed >= 0 && $search && $search_mode == "this_cat") {
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$feed_title = "";
- if ($search && $search_mode == "All feeds") {
+ 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)";
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;
+ parent.update_all_counters(\"$feed\");
+ } 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"];
}
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 "<table width='100%'>";
print "<tr><td>Title:</td>";
- print "<td><input class=\"iedit\" name=\"title\" value=\"$title\"></td></tr>";
+ 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")));
print "<tr><td>Feed URL:</td>";
- print "<td><input class=\"iedit\" name=\"feed_url\" value=\"$feed_url\"></td></tr>";
+ print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event)\"
+ name=\"feed_url\" value=\"$feed_url\"></td></tr>";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<tr><td>Category:</td>";
print "<td>";
- print_feed_cat_select($link, "cat_id", $cat_id);
+ print_feed_cat_select($link, "cat_id", $cat_id, "class=\"iedit\"");
print "</td>";
print "</td></tr>";
print "<td>";
- print "<select name=\"update_interval\">";
-
- foreach (array_keys($update_intervals) as $i) {
-
- if ($i == $update_interval) {
- $selected = "selected";
- } else {
- $selected = "";
- }
- print "<option $selected value=\"$i\">" . $update_intervals[$i] . "</option>";
- }
-
- print "</select>";
+ print_select_hash("update_interval", $update_interval, $update_intervals,
+ "class=\"iedit\"");
print "</td>";
$disabled = "disabled";
}
- print "<select $disabled name=\"parent_feed\">";
+ print "<select class=\"iedit\" $disabled name=\"parent_feed\">";
print "<option value=\"0\">Not linked</option>";
print "<td>";
- print "<select name=\"purge_interval\">";
+ print_select_hash("purge_interval", $purge_interval, $purge_intervals,
+ "class=\"iedit\"");
- foreach (array_keys($purge_intervals) as $i) {
-
- if ($i == $purge_interval) {
- $selected = "selected";
- } else {
- $selected = "";
- }
- print "<option $selected value=\"$i\">" . $purge_intervals[$i] . "</option>";
- }
-
- print "</select>";
-
print "</td>";
$auth_login = db_fetch_result($result, 0, "auth_login");
print "<tr><td>Login:</td>";
- print "<td><input class=\"iedit\" name=\"auth_login\" value=\"$auth_login\"></td></tr>";
+ print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event)\"
+ name=\"auth_login\" value=\"$auth_login\"></td></tr>";
$auth_pass = db_fetch_result($result, 0, "auth_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>";
$private = sql_bool_to_bool(db_fetch_result($result, 0, "private"));
$private = checkbox_to_sql_bool(db_escape_string($_POST["private"]));
$rtl_content = checkbox_to_sql_bool(db_escape_string($_POST["rtl_content"]));
- if ($cat_id && $cat_id != 0) {
- $category_qpart = "cat_id = '$cat_id'";
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ if ($cat_id && $cat_id != 0) {
+ $category_qpart = "cat_id = '$cat_id',";
+ } else {
+ $category_qpart = 'cat_id = NULL,';
+ }
} else {
- $category_qpart = 'cat_id = NULL';
+ $category_qpart = "";
}
if ($parent_feed && $parent_feed != 0) {
- $parent_qpart = "parent_feed = '$parent_feed'";
+ $parent_qpart = "parent_feed = '$parent_feed',";
} else {
- $parent_qpart = 'parent_feed = NULL';
+ $parent_qpart = 'parent_feed = NULL,';
}
$result = db_query($link, "UPDATE ttrss_feeds SET
- $category_qpart,
- $parent_qpart,
+ $category_qpart
+ $parent_qpart
title = '$feed_title', feed_url = '$feed_link',
update_interval = '$upd_intl',
purge_interval = '$purge_intl',
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>";
}
}
$search_qpart = "";
}
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ $order_by_qpart = "category,$feeds_sort,title";
+ } else {
+ $order_by_qpart = "$feeds_sort,title";
+ }
+
$result = db_query($link, "SELECT
F1.id,
F1.title,
ON (F1.cat_id = C1.id)
WHERE
$search_qpart F1.owner_uid = '".$_SESSION["uid"]."'
- ORDER by category,$feeds_sort,title");
+ ORDER by $order_by_qpart");
if (db_num_rows($result) != 0) {
- 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>";
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=\"javascript:feedCatEditSave()\" value=\"Save\">
<input type=\"submit\" class=\"button\"
- onclick=\"javascript:feedCatEditSave()\" value=\"Save\">";
+ onclick=\"javascript:feedCatEditCancel()\" value=\"Cancel\">";
} else {
print "
$subop = $_GET["subop"];
$quiet = $_GET["quiet"];
+ if ($subop == "edit") {
+
+ $filter_id = db_escape_string($_GET["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=\"filterEditSave()\"
+ value=\"Save\"> ";
+
+ print "<input class=\"button\"
+ type=\"submit\" onclick=\"filterEditCancel()\"
+ value=\"Cancel\">";
+
+ print "</div>";
+
+ return;
+ }
+
+
if ($subop == "editSave") {
- $regexp = db_escape_string(trim($_GET["r"]));
- $match = db_escape_string(trim($_GET["m"]));
+ $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["fid"]);
- $action_id = db_escape_string($_GET["aid"]);
+ $feed_id = db_escape_string($_GET["feed_id"]);
+ $action_id = db_escape_string($_GET["action_id"]);
if (!$feed_id) {
$feed_id = 'NULL';
}
$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'");
+ 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["reg_exp"]));
- $match_id = db_escape_string(trim($_GET["match_id"]));
+ $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"]);
"INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id,
action_id)
VALUES
- ('$regexp', '$match_id','".$_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"]);
+ //array_push($filter_types, $line["description"]);
+ $filter_types[$line["id"]] = $line["description"];
}
print "<input type=\"submit\"
class=\"button\"
onclick=\"javascript:displayDlg('quickAddFilter', false)\"
+ id=\"create_filter_btn\"
value=\"Create filter\">";
$result = db_query($link, "SELECT
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\");'
+
+ $line["feed_title"] = htmlspecialchars(db_unescape_string($line["feed_title"]));
+
+ 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["reg_exp"] . "</td>";
- print "<td><a href=\"javascript:editFilter($filter_id);\">" .
- $line["feed_title"] . "</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["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_feed_select($link, "iedit_feed", $line["feed_id"]);
- print "</td>";
-
- print "<td>";
- print_select("iedit_match", $line["filter_type_descr"], $filter_types);
- print "</td>";
-
- print "<td>";
- print "<select id=\"iedit_filter_action\">";
-
- $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 "</select></td>";
-
- print "</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\">
<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:removeSelectedFilters()\" value=\"Remove\">";
- }
+
+ print "</p>";
} else {
if ($subop == "editSave") {
- $sql_exp = trim($_GET["s"]);
- $descr = trim($_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'
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\">";
} else {
- print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked></td>";
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked>";
+
+ 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 id=\"iedit_expr\" value=\"".$line["sql_exp"].
- "\"></td>";
+ print "<td><input onkeypress=\"return filterCR(event)\"
+ class=\"iedit\" name=\"sql_exp\" value=\"".$line["sql_exp"]."\"></td>";
- print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
- "\"></td>";
+ print "<td><input onkeypress=\"return filterCR(event)\"
+ class=\"iedit\" name=\"description\" value=\"".$line["description"]."\"></td>";
}
}
print "</table>";
+
+ print "</form>";
print "<p id=\"labelOpToolbar\">";
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'>
- <input class=\"button\"
- id=\"fadd_submit_btn\" disabled=\"true\"
- type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Subscribe\">
- <input class=\"button\"
- type=\"submit\" onclick=\"javascript:feedEditCancel()\"
- value=\"Cancel\"></td></tr></table>";
-
- }
-
- if ($id == "quickDelFeed") {
- $param = db_escape_string($param);
-
- $result = db_query($link, "SELECT title FROM ttrss_feeds WHERE id = '$param'");
-
- if ($result) {
+ print "</table>";
+ print "</form>";
- $f_title = db_fetch_result($result, 0, "title");
-
- print "Remove current feed (<b>$f_title</b>)?
+ print "<div align='right'>
<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.
+ id=\"fadd_submit_btn\" disabled=\"true\"
+ type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Subscribe\">
<input class=\"button\"
type=\"submit\" onclick=\"javascript:closeInfoBox()\"
- value=\"Cancel\">";
- }
+ value=\"Cancel\"></div>";
+
}
if ($id == "search") {
print "<div id=\"infoBoxTitle\">Search</div>";
print "<div class=\"infoBoxContents\">";
+ print "<form id='search_form'>";
+
$active_feed_id = db_escape_string($_GET["param"]);
print "<table width='100%'><tr><td>Search:</td><td>";
-
- print "<input id=\"searchbox\" class=\"extSearch\"
- onblur=\"javascript:enableHotkeys()\"
- onfocus=\"javascript:disableHotkeys()\"
+
+ 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>";
-
+ 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);
+ $feed_cat_title = getFeedCatTitle($link, $active_feed_id);
+
if ($active_feed_id) {
- print "<option>This feed</option>";
+ 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 (get_pref($link, 'ENABLE_FEED_CATS') && $active_feed_id && $active_feed_id > 0) {
+ print "<option value=\"this_cat\">This category ($feed_cat_title)</option>";
+ } else {
+ print "<option disabled>This category</option>";
}
- print "</select></td></tr>
+ print "</select></td></tr>";
+
+ 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>";
- <tr><td colspan='2' align='right'>
+ 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 == "quickAddFilter") {
+ $active_feed_id = db_escape_string($_GET["param"]);
+
print "<div id=\"infoBoxTitle\">Create filter</div>";
print "<div class=\"infoBoxContents\">";
print "<input type=\"hidden\" name=\"subop\" value=\"add\">";
// print "<div class=\"notice\"><b>Note:</b> filter will only apply to new articles.</div>";
-
+
$result = db_query($link, "SELECT id,description
FROM ttrss_filter_types ORDER BY description");
print "<table width='100%'>";
print "<tr><td>Match:</td>
- <td><input onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
- name=\"reg_exp\" size=\"30\"> ";
-
- print_select_hash("match_id", 1, $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>";
+ print "<tr><td>Feed:</td><td colspan='2'>";
- print_feed_select($link, "feed_id");
+ print_feed_select($link, "feed_id", $active_feed_id);
print "</td></tr>";
print "<tr><td>Action:</td>";
- print "<td><select name=\"action_id\">";
+ print "<td colspan='2'><select name=\"action_id\">";
$result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
ORDER BY name");
$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=\"javascript:userEditSave()\" value=\"Save\">
+ <input class=\"button\"
+ type=\"submit\" onclick=\"javascript: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'");
}
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") {