print "</li></ul>";
}
- if (get_pref($link, 'ENABLE_LABELS')) {
+ if (GLOBAL_ENABLE_LABELS && get_pref($link, 'ENABLE_LABELS')) {
$result = db_query($link, "SELECT id,sql_exp,description FROM
ttrss_labels WHERE owner_uid = '$owner_uid' ORDER by description");
while ($line = db_fetch_assoc($result)) {
- $feed = $line["title"];
+ $feed = db_unescape_string($line["title"]);
$feed_id = $line["id"];
$subop = $_GET["subop"];
$result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
SUBSTRING(updated,1,16) as updated,
- (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url
+ (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
+ num_comments
FROM ttrss_entries,ttrss_user_entries
WHERE id = '$id' AND ref_id = id");
$feed_icon = " ";
}
- if ($line["comments"] && $line["link"] != $line["comments"]) {
+/* if ($line["comments"] && $line["link"] != $line["comments"]) {
$entry_comments = "(<a href=\"".$line["comments"]."\">Comments</a>)";
} else {
$entry_comments = "";
+ } */
+
+ $num_comments = $line["num_comments"];
+ $entry_comments = "";
+
+ if ($num_comments > 0) {
+ if ($line["comments"]) {
+ $comments_url = $line["comments"];
+ } else {
+ $comments_url = $line["link"];
+ }
+ $entry_comments = "(<a href=\"$comments_url\">$num_comments comments</a>)";
+ } else {
+ if ($line["comments"] && $line["link"] != $line["comments"]) {
+ $entry_comments = "(<a href=\"".$line["comments"]."\">Comments</a>)";
+ }
}
print "<div class=\"postReply\">";
}
if (!$vfeed_query_part) {
- $content_query_part = "content as content_preview,";
+ $content_query_part = "SUBSTRING(content,1,300) as content_preview,";
} else {
$content_query_part = "";
}
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList',
'RROW-', 'RCHK-', false)\">None</a>
- Toggle: <a href=\"javascript:toggleUnread()\">Unread</a>,
- <a href=\"javascript:toggleStarred()\">Starred</a>";
+ Toggle: <a href=\"javascript:selectionToggleUnread()\">Unread</a>,
+ <a href=\"javascript:selectionToggleMarked()\">Starred</a>";
print "</td>";
if ($line["marked"] == "t" || $line["marked"] == "1") {
$marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_set.png\"
- alt=\"Reset mark\" onclick='javascript:toggleMark($id, false)'>";
+ alt=\"Reset mark\" onclick='javascript:toggleMark($id)'>";
} else {
$marked_pic = "<img id=\"FMARKPIC-$id\" src=\"images/mark_unset.png\"
- alt=\"Set mark\" onclick='javascript:toggleMark($id, true)'>";
+ alt=\"Set mark\" onclick='javascript:toggleMark($id)'>";
}
$content_link = "<a href=\"javascript:view($id,$feed_id);\">" .
}
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
- $content_preview = truncate_string(strip_tags($line["content_preview"]), 101);
+ $content_preview = truncate_string(strip_tags($line["content_preview"]),
+ 200);
}
if ($omode != "xml") {
print "<td class='hlFeed'>
<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a> </td>";
} else {
- print "<td class='hlContent'>";
+ print "<td class='hlContent' valign='middle'>";
print "<a href=\"javascript:view($id,$feed_id);\">" .
$line["title"];
if ($op == "pref-feeds") {
$subop = $_GET["subop"];
+ $quiet = $_GET["quiet"];
+
+ if ($subop == "editfeed") {
+ $feed_id = db_escape_string($_GET["id"]);
+
+ $result = db_query($link,
+ "SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
+ owner_uid = " . $_SESSION["uid"]);
+
+ $title = htmlspecialchars(db_unescape_string(db_fetch_result($result,
+ 0, "title")));
+
+ print "<div class=\"infoBoxContents\">";
+
+ $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%'>";
+
+ $row_class = "odd";
+
+ print "<tr class='$row_class'><td>Title:</td>";
+ print "<td><input id=\"iedit_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>";
+
+ 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 "<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 "</select></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>";
+
+ $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 "</table>";
+ print "</div>";
+
+ print "<div align='center'>
+ <input type='submit' class='button'
+ onclick=\"feedEditCancel()\" value=\"Cancel\">
+ <input type=\"submit\" class=\"button\"
+ onclick=\"feedEditSave()\" value=\"Save\"></div>";
+ return;
+ }
if ($subop == "editSave") {
$feed_title = db_escape_string($_GET["t"]);
update_interval = '$upd_intl',
purge_interval = '$purge_intl'
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
+ }
+
+ if ($subop == "saveCat") {
+ $cat_title = db_escape_string($_GET["title"]);
+ $cat_id = db_escape_string($_GET["id"]);
+
+ $result = db_query($link, "UPDATE ttrss_feed_categories SET
+ title = '$cat_title' WHERE id = '$cat_id' AND owner_uid = ".$_SESSION["uid"]);
}
}
+ if ($quiet) return;
+
// print "<h3>Edit Feeds</h3>";
$result = db_query($link, "SELECT id,title,feed_url,last_error
$_SESSION["pref_sort_feeds"] = $feeds_sort;
if ($feed_search) {
- $search_qpart = "UPPER(title) LIKE UPPER('%$feed_search%') AND";
+ $search_qpart = "(UPPER(title) LIKE UPPER('%$feed_search%') OR
+ UPPER(feed_url) LIKE UPPER('%$feed_search%')) AND";
} else {
$search_qpart = "";
}
$result = db_query($link, "SELECT
id,title,feed_url,substring(last_updated,1,16) as last_updated,
- update_interval,purge_interval,
+ update_interval,purge_interval,cat_id,
(SELECT title FROM ttrss_feed_categories
WHERE id = cat_id) AS category
FROM
ttrss_feeds
WHERE
$search_qpart owner_uid = '".$_SESSION["uid"]."'
- ORDER by $feeds_sort,title");
+ ORDER by category,$feeds_sort,title");
if (db_num_rows($result) != 0) {
'FEEDR-', 'FRCHK-', false)\">None</a>
</td</tr>";
- print "<tr class=\"title\">
- <td width=\"3%\"> </td>
- <td width=\"3%\">Select</td>
- <td width=\"20%\">
- <a href=\"javascript:updateFeedList('title')\">Title</a></td>
- <td width=\"20%\">
- <a href=\"javascript:updateFeedList('feed_url')\">Link</a>
- </td>";
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<td width=\"10%\">
- <a href=\"javascript:updateFeedList('category')\">Category</a></td>";
+ if (!get_pref($link, 'ENABLE_FEED_CATS')) {
+ print "<tr class=\"title\">
+ <td width='5%' align='center'></td>
+ <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
+ <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
+ <td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
+ <td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a></td></tr>";
}
- print "
- <td width=\"10%\">
- <a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a>
- </td>
- <td width=\"10%\">
- <a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a>
- </td>
- </tr>";
-
$lnum = 0;
+
+ $cur_cat_id = -1;
while ($line = db_fetch_assoc($result)) {
- $class = ($lnum % 2) ? "even" : "odd";
-
$feed_id = $line["id"];
-
- $edit_feed_id = $_GET["id"];
-
- if ($subop == "edit" && $feed_id != $edit_feed_id) {
- $class .= "Grayed";
- $this_row_id = "";
- } else {
- $this_row_id = "id=\"FEEDR-$feed_id\"";
- }
-
- print "<tr class=\"$class\" $this_row_id>";
-
- $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 "<td align='center'>$feed_icon</td>";
-
+ $cat_id = $line["cat_id"];
+
$edit_title = htmlspecialchars(db_unescape_string($line["title"]));
$edit_link = htmlspecialchars(db_unescape_string($line["feed_url"]));
$edit_cat = htmlspecialchars(db_unescape_string($line["category"]));
+ if ($line["update_interval"] == "0") $line["update_interval"] = "Default";
+ if ($line["update_interval"] == "-1") $line["update_interval"] = "Disabled";
+ if ($line["purge_interval"] == "0") $line["purge_interval"] = "Default";
+ if ($line["purge_interval"] < 0) $line["purge_interval"] = "Disabled";
+
if (!$edit_cat) $edit_cat = "Uncategorized";
-
- if (!$edit_feed_id || $subop != "edit") {
-
- print "<td><input onclick='toggleSelectRow(this);'
- type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
- $edit_title = truncate_string($edit_title, 40);
- $edit_link = truncate_string($edit_link, 60);
-
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $edit_title . "</a></td>";
-
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $edit_link . "</a></td>";
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $edit_cat . "</a></td>";
- }
-
- if ($line["update_interval"] == "0")
- $line["update_interval"] = "Default";
-
- if ($line["update_interval"] == "-1")
- $line["update_interval"] = "Disabled";
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $line["update_interval"] . "</a></td>";
-
- if ($line["purge_interval"] == "0")
- $line["purge_interval"] = "Default";
-
- if ($line["purge_interval"] < 0)
- $line["purge_interval"] = "Disabled";
-
- print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $line["purge_interval"] . "</a></td>";
-
- } else if ($feed_id != $edit_feed_id) {
-
- print "<td><input disabled=\"true\" type=\"checkbox\"
- id=\"FRCHK-".$line["id"]."\"></td>";
+ if (get_pref($link, 'ENABLE_FEED_CATS') && $cur_cat_id != $cat_id) {
+ $lnum = 0;
+
+ print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>";
- $edit_title = truncate_string($edit_title, 40);
- $edit_link = truncate_string($edit_link, 60);
+ print "<tr class=\"title\">
+ <td width='5%' align='center'></td>
+ <td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
+ <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
+ <td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
+ <td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a></td></tr>";
- print "<td>$edit_title</td>";
- print "<td>$edit_link</td>";
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "<td>$edit_cat</td>";
- }
-
- if ($line["update_interval"] == "0")
- $line["update_interval"] = "Default";
-
- print "<td>" . $line["update_interval"] . "</td>";
-
- if ($line["purge_interval"] == "0")
- $line["purge_interval"] = "Default";
-
- if ($line["purge_interval"] < 0)
- $line["purge_interval"] = "Disabled";
+ $cur_cat_id = $cat_id;
+ }
+
+ $class = ($lnum % 2) ? "even" : "odd";
+ $this_row_id = "id=\"FEEDR-$feed_id\"";
+
+ print "<tr class=\"$class\" $this_row_id>";
- print "<td>" . $line["purge_interval"] . "</td>";
+ $icon_file = ICONS_DIR . "/$feed_id.ico";
+ if (file_exists($icon_file) && filesize($icon_file) > 0) {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL . "/$feed_id.ico\">";
} else {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+ }
+// print "<td class='feedIcon'>$feed_icon</td>";
- print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
-
- print "<td><input id=\"iedit_title\" value=\"$edit_title\"></td>";
- print "<td><input id=\"iedit_link\" value=\"$edit_link\"></td>";
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
- 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 "<td class='feedSelect'><input onclick='toggleSelectRow(this);'
+ type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
- while ($tmp_line = db_fetch_assoc($tmp_result)) {
- if ($tmp_line["id"] == $line["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>";
-
- }
+ $edit_title = truncate_string($edit_title, 40);
+ $edit_link = truncate_string($edit_link, 60);
+
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ "$feed_icon $edit_title" . "</a></td>";
- print "<td><input id=\"iedit_updintl\"
- value=\"".$line["update_interval"]."\"></td>";
- print "<td><input id=\"iedit_purgintl\"
- value=\"".$line["purge_interval"]."\"></td>";
-
- }
-
-/* if (!$line["last_updated"]) $line["last_updated"] = "Never";
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $edit_link . "</a></td>";
+
+/* if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $edit_cat . "</a></td>";
+ } */
+
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $line["update_interval"] . "</a></td>";
+
+ print "<td><a href=\"javascript:editFeed($feed_id);\">" .
+ $line["purge_interval"] . "</a></td>";
- print "<td>" . $line["last_updated"] . "</td>"; */
-
print "</tr>";
++$lnum;
</td</tr>";
print "<tr class=\"title\">
- <td width=\"10%\">Select</td><td width=\"80%\">Title</td>
+ <td width=\"5%\"></td><td width=\"80%\">Title</td>
</tr>";
$lnum = 0;
if (!$edit_cat_id || $subop != "editCat") {
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FCCHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editFeedCat($cat_id);\">" .
if ($op == "pref-filters") {
$subop = $_GET["subop"];
+ $quiet = $_GET["quiet"];
if ($subop == "editSave") {
$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';
reg_exp = '$regexp',
description = '$descr',
feed_id = $feed_id,
+ action_id = '$action_id',
filter_type = (SELECT id FROM ttrss_filter_types WHERE
description = '$match')
WHERE id = '$filter_id'");
$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"]);
if (!$feed_id) {
$feed_id = 'NULL';
}
$result = db_query($link,
- "INSERT INTO ttrss_filters (reg_exp,filter_type,owner_uid,feed_id) VALUES
+ "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"]."', $feed_id)");
+ description = '$match'),'".$_SESSION["uid"]."',
+ $feed_id, '$action_id')");
}
}
+ if ($quiet) return;
+
$result = db_query($link, "SELECT description
FROM ttrss_filter_types ORDER BY description");
}
print "<div class=\"prefGenericAddBox\">
- <input id=\"fadd_regexp\" onchange=\"javascript:addFilter()\" size=\"40\"> ";
+ <input id=\"fadd_regexp\" size=\"40\"> ";
print_select("fadd_match", "Title", $filter_types);
}
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:addFilter()\"
value=\"Add filter\">";
+ print "</div>";
+
$result = db_query($link, "SELECT
ttrss_filters.id AS id,reg_exp,
ttrss_filters.description AS description,
ttrss_filter_types.name AS filter_type_name,
ttrss_filter_types.description AS filter_type_descr,
feed_id,
+ ttrss_filter_actions.description AS action_description,
(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
FROM
- ttrss_filters,ttrss_filter_types
+ ttrss_filters,ttrss_filter_types,ttrss_filter_actions
WHERE
filter_type = ttrss_filter_types.id AND
+ ttrss_filter_actions.id = action_id AND
ttrss_filters.owner_uid = ".$_SESSION["uid"]."
ORDER by reg_exp");
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td><td width=\"30%\">Filter expression</td>
- <td width=\"30%\">Feed</td><td width=\"10%\">Match</td>
+ <td align='center' width=\"5%\"></td>
+ <td width=\"20%\">Filter expression</td>
+ <td width=\"20%\">Feed</td>
+ <td width=\"15%\">Match</td>
+ <td width=\"15%\">Action</td>
<td width=\"30%\">Description</td></tr>";
$lnum = 0;
if (!$line["description"]) $line["description"] = "[No description]";
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editFilter($filter_id);\">" .
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 "<td><a href=\"javascript:editFilter($filter_id);\">" .
$line["description"] . "</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>";
print "<td>".$line["description"]."</td>";
-
+
} else {
print "<td><input disabled=\"true\" type=\"checkbox\" checked></td>";
"\"></td>";
print "<td>";
-
print "<select id=\"iedit_feed\">";
-
print "<option id=\"0\">All feeds</option>";
- if (db_num_rows($result) > 0) {
- print "<option disabled>--------</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>";
+ }
+
while ($tmp_line = db_fetch_assoc($tmp_result)) {
if ($tmp_line["id"] == $line["feed_id"]) {
$is_selected = "selected";
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><input id=\"iedit_descr\" value=\"".$line["description"].
"\"></td>";
}
}
+ // We need to accept raw SQL data in label queries, so not everything is escaped
+ // here, this is by design. If you don't like the whole idea, disable labels
+ // altogether with GLOBAL_ENABLE_LABELS = false
+
if ($op == "pref-labels") {
+ if (!GLOBAL_ENABLE_LABELS) {
+ return;
+ }
+
$subop = $_GET["subop"];
if ($subop == "test") {
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td><td width=\"40%\">SQL expression
+ <td align='center' width=\"5%\"></td><td width=\"40%\">SQL expression
<a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
</td>
<td width=\"40%\">Caption</td></tr>";
if (!$line["description"]) $line["description"] = "[No caption]";
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editLabel($label_id);\">" .
}
+ if ($id == "quickAddFilter") {
+
+ $result = db_query($link, "SELECT description
+ FROM ttrss_filter_types ORDER BY description");
+
+ $filter_types = array();
+
+ while ($line = db_fetch_assoc($result)) {
+ array_push($filter_types, $line["description"]);
+ }
+
+ print "<table>";
+
+ print "<tr><td>Match:</td><td><input id=\"fadd_regexp\" size=\"40\"> ";
+
+ print_select("fadd_match", "Title", $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>Action:</td>";
+
+ print "<td><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 "</td></tr><tr><td colspan=\"2\" align=\"right\">";
+
+ print "<input type=\"submit\"
+ class=\"button\" onclick=\"javascript:qaddFilter()\"
+ value=\"Add filter\"> ";
+
+ print "<input class=\"button\"
+ type=\"submit\" onclick=\"javascript:closeDlg()\"
+ value=\"Close\">";
+
+ print "</td></tr></table>";
+ }
}
// update feeds of all users, may be used anonymously
name=\"subop\" value=\"Save configuration\">";
print " <input class=\"button\" type=\"submit\"
- name=\"subop\" value=\"Reset to defaults\"></p>";
+ name=\"subop\" onclick=\"return validatePrefsReset()\"
+ value=\"Reset to defaults\"></p>";
print "</form>";
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td>
+ <td align='center' width=\"5%\"></td>
<td width='30%'>Username</td>
<td width='30%'>Access Level</td>
<td width='30%'>Last login</td></tr>";
$line["login"] = htmlspecialchars($line["login"]);
+ $line["last_login"] = date(get_pref($link, 'SHORT_DATE_FORMAT'),
+ strtotime($line["last_login"]));
+
if ($uid == $_SESSION["uid"]) {
- print "<td><input disabled=\"true\" type=\"checkbox\"
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
id=\"UMCHK-".$line["id"]."\"></td>";
print "<td>".$line["login"]."</td>";
} else if (!$edit_uid || $subop != "edit") {
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
print "<td><a href=\"javascript:editUser($uid);\">" .
print "<table width='100%'>";
$login = db_fetch_result($result, 0, "login");
- $last_login = db_fetch_result($result, 0, "last_login");
+ $last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
+ strtotime(db_fetch_result($result, 0, "last_login")));
$access_level = db_fetch_result($result, 0, "access_level");
$stored_articles = db_fetch_result($result, 0, "stored_articles");
print "<h1>Subscribed feeds</h1>";
- $result = db_query($link, "SELECT id,title,feed_url FROM ttrss_feeds
+ $result = db_query($link, "SELECT id,title,site_url FROM ttrss_feeds
WHERE owner_uid = '$uid' ORDER BY title LIMIT 20");
print "<ul class=\"nomarks\">";
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
- print "<li>$feed_icon <a href=\"".$line["feed_url"]."\">".$line["title"]."</a></li>";
+ print "<li>$feed_icon <a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
}
if (db_num_rows($result) < $num_feeds) {
if ($op == "feed-details") {
- $feed_id = $_GET["id"];
-
- $result = db_query($link,
- "SELECT
- title,feed_url,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_fetch_result($result, 0, "title");
- $last_updated = 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'");
+// $feed_id = $_GET["id"];
- $subscribed = db_fetch_result($result, 0, "subscribed");
+ $feed_ids = split(",", db_escape_string($_GET["id"]));
print "<div class=\"infoBoxContents\">";
- $icon_file = ICONS_DIR . "/$feed_id.ico";
+ foreach ($feed_ids as $feed_id) {
- 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\">";
+ $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'");
+
+ $subscribed = db_fetch_result($result, 0, "subscribed");
+
+ $icon_file = ICONS_DIR . "/$feed_id.ico";
- 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\">(" .$line["updated"].")</span></li>";
+ 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 "</ul>";
+ print "<h1>$feed_icon $title</h1>";
- print "</div>";
+ print "<table width='100%'>";
- print "<div align='center'>
- <input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+ 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>";
+ }
db_close($link);
?>
git.wh0rd.org / tt-rss.git / blobdiff