}
$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);
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\" 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\" 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>";
- }
+ print_feed_cat_select($link, "cat_id", $cat_id, "class=\"iedit\"");
- 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 "</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\" 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\"
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 feed browser</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>";
print "</td></tr>";
print "</table>";
+
+ print "</form>";
+
print "</div>";
print "<div align='center'>
<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>";
return;
}
if ($subop == "editSave") {
- $feed_title = db_escape_string(trim($_POST["t"]));
- $feed_link = db_escape_string(trim($_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(trim($_POST["login"]));
- $auth_pass = db_escape_string(trim($_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) {
+ $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"]));
+
+ if ($cat_id && $cat_id != 0) {
$category_qpart = "cat_id = '$cat_id'";
} else {
$category_qpart = 'cat_id = NULL';
}
- if ($parent_feed != 0) {
+ if ($parent_feed && $parent_feed != 0) {
$parent_qpart = "parent_feed = '$parent_feed'";
} else {
$parent_qpart = 'parent_feed = NULL';
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\"
onkeyup=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
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 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 "
if ($subop == "editSave") {
- $regexp = db_escape_string($_GET["r"]);
- $match = db_escape_string($_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')
+ reg_exp = '$reg_exp',
+ feed_id = $feed_id,
+ action_id = '$action_id',
+ filter_type = '$filter_type'
WHERE id = '$filter_id'");
}
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"]));
+ $match_id = db_escape_string(trim($_GET["match_id"]));
+ $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', '$match_id','".$_SESSION["uid"]."',
$feed_id, '$action_id')");
}
}
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>";
- }
-
- 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"]);
+ //array_push($filter_types, $line["description"]);
+ $filter_types[$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)\"
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\">";
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>";
} 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>";
- }
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked>";
+
+ print "<input type=\"hidden\" name=\"id\" value=\"$filter_id\">";
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-filters\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
- 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 "</td>";
- print "</select></td>";
+ print "<td><input class=\"iedit\" name=\"reg_exp\" value=\"".$line["reg_exp"].
+ "\"></td>";
+ print "<td>";
+ print_feed_select($link, "feed_id", $line["feed_id"], "class=\"iedit\"");
+ print "</td>";
+
print "<td>";
- print_select("iedit_match", $line["filter_type_descr"], $filter_types);
+ print_select_hash("filter_type", $line["filter_type"], $filter_types,
+ "class=\"iedit\"");
print "</td>";
print "<td>";
- print "<select id=\"iedit_filter_action\">";
+ print "<select name=\"action_id\" class=\"iedit\">";
$tmp_result = db_query($link, "SELECT id,description FROM ttrss_filter_actions
ORDER BY description");
} else {
$is_selected = "";
}
- printf("<option $is_selected id='%d'>%s</option>",
+ printf("<option $is_selected value='%d'>%s</option>",
$tmp_line["id"], $tmp_line["description"]);
}
}
print "</table>";
+
+ print "</form>";
print "<p id=\"filterOpToolbar\">";
onclick=\"javascript:editSelectedFilter()\" value=\"Edit\">
<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:removeSelectedFilters()\" value=\"Remove\">";
- }
+ }
} else {
if ($subop == "test") {
- $expr = $_GET["expr"];
- $descr = $_GET["descr"];
+ $expr = trim($_GET["expr"]);
+ $descr = trim($_GET["descr"]);
print "<div id=\"infoBoxTitle\">Test label: $descr</div>";
if ($num_matches > 0) {
- print "<p>Query returned <b>$num_matches</b> matches, first 5 follow:</p>";
+ print "<p>Query returned <b>$num_matches</b> matches, showing first 15:</p>";
$result = db_query($link,
"SELECT title,
WHERE ($expr) AND
ttrss_user_entries.ref_id = ttrss_entries.id
AND owner_uid = " . $_SESSION["uid"] . "
- ORDER BY date_entered DESC LIMIT 5");
+ ORDER BY date_entered DESC LIMIT 15");
- print "<ul class=\"nomarks\">";
+ print "<ul class=\"filterTestResults\">";
+
+ $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>";
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 (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=\"5%\"> </td>
<td width=\"40%\">SQL expression
<a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
</td>
if (!$line["description"]) $line["description"] = "[No description]";
- print "<td><input disabled=\"true\" type=\"checkbox\"
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
id=\"LICHK-".$line["id"]."\"></td>";
print "<td>".$line["sql_exp"]."</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=\"$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"].
+ print "<td><input class=\"iedit\" name=\"sql_exp\" value=\"".$line["sql_exp"].
"\"></td>";
- print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
+ print "<td><input class=\"iedit\" name=\"description\" value=\"".$line["description"].
"\"></td>";
}
}
print "</table>";
+
+ print "</form>";
print "<p id=\"labelOpToolbar\">";
id=\"fadd_submit_btn\" disabled=\"true\"
type=\"submit\" onclick=\"javascript:qafAdd()\" value=\"Subscribe\">
<input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeInfoBox()\"
+ 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) {
-
- $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\">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\"> ";
+ name=\"reg_exp\" size=\"30\"> ";
- print_select("fadd_match", "Title", $filter_types);
+ print_select_hash("match_id", 1, $filter_types);
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>";
+
+ print_feed_select($link, "feed_id");
+
+ print "</td></tr>";
print "<tr><td>Action:</td>";
- print "<td><select id=\"fadd_action\">";
+ print "<td><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=\"qaddFilter()\"
disabled=\"true\" value=\"Create\"> ";
print "<input class=\"button\"
- type=\"submit\" onclick=\"javascript:closeInfoBox()\"
+ type=\"submit\" onclick=\"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\" name=\"login\" value=\"$login\"></td></tr>";
+
+ print "<tr><td>Change password:</td><td>
+ <input class=\"iedit\" name=\"password\"></td></tr>";
+
+ print "<tr><td>E-mail:</td><td>
+ <input class=\"iedit\" name=\"email\" 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'");
}
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) {
git.wh0rd.org / tt-rss.git / blobdiff