print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
}
- $result = db_query($link, "SELECT count(id) as num_starred
- FROM ttrss_entries,ttrss_user_entries
- WHERE marked = true AND
- ttrss_user_entries.ref_id = ttrss_entries.id AND
- unread = true AND owner_uid = '$owner_uid'");
- $num_starred = db_fetch_result($result, 0, "num_starred");
+ $num_starred = getFeedUnread($link, -1);
$class = "virt";
while ($line = db_fetch_assoc($result)) {
error_reporting (0);
-
- $tmp_result = db_query($link, "SELECT count(ttrss_entries.id) as count
- FROM ttrss_entries,ttrss_user_entries,ttrss_feeds
- WHERE (" . $line["sql_exp"] . ") AND unread = true AND
- ttrss_user_entries.ref_id = ttrss_entries.id AND
- ttrss_user_entries.feed_id = ttrss_feeds.id
- AND ttrss_user_entries.owner_uid = '$owner_uid'");
-
- $count = db_fetch_result($tmp_result, 0, "count");
-
+
+ $label_id = -$line['id'] - 11;
+ $count = getFeedUnread($link, $label_id);
+
$class = "label";
if ($count > 0) {
error_reporting (DEFAULT_ERROR_LEVEL);
- printFeedEntry(-$line["id"]-11,
+ printFeedEntry($label_id,
$class, db_unescape_string($line["description"]),
$count, "images/label.png", $link);
FROM ttrss_feeds LEFT JOIN ttrss_feed_categories
ON (ttrss_feed_categories.id = cat_id)
WHERE
+ ttrss_feeds.hidden = false AND
ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL
ORDER BY $order_by_qpart");
$ellipsis = "";
}
- if ($cat_id) {
- $cat_id_qpart = "cat_id = '$cat_id'";
- } else {
- $cat_id_qpart = "cat_id IS NULL";
- }
-
- $tmp_result = db_query($link, "SELECT count(int_id) AS unread
- FROM ttrss_user_entries,ttrss_feeds WHERE
- unread = true AND
- feed_id = ttrss_feeds.id AND $cat_id_qpart AND
- ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
-
- $cat_unread = db_fetch_result($tmp_result, 0, "unread");
-
$cat_id = sprintf("%d", $cat_id);
+
+ $cat_unread = getCategoryUnread($link, $cat_id);
print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
<a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
if (!$match_on) {
$match_on = "both";
}
-
+
$qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on);
$result = $qfh_ret[0];
print "<td class=\"headlineActions$rtl_cpart\">
Select:
- <a href='#' onclick=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)\">All</a>,
- <a href='#' onclick=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)\">Unread</a>,
- <a href='#' onclick=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)\">None</a>
+ <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)\">All</a>,
+ <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)\">Unread</a>,
+ <a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)\">None</a>
- Toggle: <a href='#' onclick=\"javascript:selectionToggleUnread()\">Unread</a>,
- <a href='#' onclick=\"javascript:selectionToggleMarked()\">Starred</a>";
+ Toggle: <a href=\"javascript:selectionToggleUnread()\">Unread</a>,
+ <a href=\"javascript:selectionToggleMarked()\">Starred</a>";
print "</td>";
print "<td class=\"headlineActions$rtl_cpart\">
Select:
- <a href=\"#\" onclick=\"javascript:cdmSelectArticles('all')\">All</a>,
- <a href=\"#\" onclick=\"javascript:cdmSelectArticles('unread')\">Unread</a>,
- <a href=\"#\" onclick=\"javascript:cdmSelectArticles('none')\">None</a>
+ <a href=\"javascript:cdmSelectArticles('all')\">All</a>,
+ <a href=\"javascript:cdmSelectArticles('unread')\">Unread</a>,
+ <a href=\"javascript:cdmSelectArticles('none')\">None</a>
- Toggle: <a href=\"#\" onclick=\"javascript:selectionToggleUnread(true)\">Unread</a>,
- <a href=\"#\" onclick=\"javascript:selectionToggleMarked(true)\">Starred</a>";
+ Toggle: <a href=\"javascript:selectionToggleUnread(true)\">Unread</a>,
+ <a href=\"javascript:selectionToggleMarked(true)\">Starred</a>";
print "</td>";
print "<tr><td valign='top'>Options:</td>";
print "<td><input type=\"checkbox\" name=\"private\" id=\"private\"
- $checked><label for=\"private\">Hide from feed browser</label>";
+ $checked><label for=\"private\">Hide from \"Other Feeds\"</label>";
$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
print "<br><input type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
$checked><label for=\"rtl_content\">Right-to-left content</label>";
-
+
+ $hidden = sql_bool_to_bool(db_fetch_result($result, 0, "hidden"));
+
+ if ($hidden) {
+ $checked = "checked";
+ } else {
+ $checked = "";
+ }
+
+ print "<br><input type=\"checkbox\" id=\"hidden\" name=\"hidden\"
+ $checked><label for=\"hidden\">Hide from my feed list</label>";
+
print "</td></tr>";
print "</table>";
print "</form>";
- print "</div>";
-
- print "<div align='center'>
+ print "<div align='right'>
<input type=\"submit\" class=\"button\"
onclick=\"return feedEditSave()\" value=\"Save\">
<input type='submit' class='button'
onclick=\"return feedEditCancel()\" value=\"Cancel\"></div>";
+
+ print "</div>";
+
return;
}
$parent_feed = db_escape_string($_POST["parent_feed"]);
$private = checkbox_to_sql_bool(db_escape_string($_POST["private"]));
$rtl_content = checkbox_to_sql_bool(db_escape_string($_POST["rtl_content"]));
+ $hidden = checkbox_to_sql_bool(db_escape_string($_POST["hidden"]));
if (get_pref($link, 'ENABLE_FEED_CATS')) {
if ($cat_id && $cat_id != 0) {
auth_login = '$auth_login',
auth_pass = '$auth_pass',
private = $private,
- rtl_content = $rtl_content
+ rtl_content = $rtl_content,
+ hidden = $hidden
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
}
// print "<h3>Edit Feeds</h3>";
- $result = db_query($link, "SELECT id,title,feed_url,last_error
+ $result = db_query($link, "SELECT id,title,feed_url,last_error
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
if (db_num_rows($result) > 0) {
F1.purge_interval,
F1.cat_id,
F2.title AS parent_title,
- C1.title AS category
+ C1.title AS category,
+ F1.hidden
FROM
ttrss_feeds AS F1
LEFT JOIN ttrss_feeds AS F2
$edit_link = htmlspecialchars(db_unescape_string($line["feed_url"]));
$edit_cat = htmlspecialchars(db_unescape_string($line["category"]));
+ $hidden = sql_bool_to_bool($line["hidden"]);
+
if (!$edit_cat) $edit_cat = "Uncategorized";
$last_updated = $line["last_updated"];
$edit_title = truncate_string($edit_title, 40);
$edit_link = truncate_string($edit_link, 60);
+ if ($hidden) {
+ $edit_title = "<span class=\"insensitive\">$edit_title (Hidden)</span>";
+ $edit_link = "<span class=\"insensitive\">$edit_link</span>";
+ $last_updated = "<span class=\"insensitive\">$last_updated</span>";
+ }
+
$parent_title = $line["parent_title"];
if ($parent_title) {
$parent_title = "<span class='groupPrompt'>(linked to
if ($op == "pref-labels") {
if (!GLOBAL_ENABLE_LABELS) {
+
+ print "<p>Sorry, labels have been administratively disabled for this installation. Please contact instance owner or edit configuration file to enable this functionality.</p>";
return;
}
$subop = $_GET["subop"];
+ if ($subop == "edit") {
+
+ $label_id = db_escape_string($_GET["id"]);
+
+ $result = db_query($link, "SELECT sql_exp,description FROM ttrss_labels WHERE
+ owner_uid = ".$_SESSION["uid"]." AND id = '$label_id' ORDER by description");
+
+ $line = db_fetch_assoc($result);
+
+ $sql_exp = htmlspecialchars(db_unescape_string($line["sql_exp"]));
+ $description = htmlspecialchars(db_unescape_string($line["description"]));
+
+ print "<div id=\"infoBoxTitle\">Label editor</div>";
+ print "<div class=\"infoBoxContents\">";
+
+ print "<form id=\"label_edit_form\">";
+
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-labels\">";
+ print "<input type=\"hidden\" name=\"id\" value=\"$label_id\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
+
+ print "<table width='100%'>";
+
+ print "<tr><td>Caption:</td>
+ <td><input onkeypress=\"return filterCR(event)\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ name=\"description\" class=\"iedit\" value=\"$description\">";
+
+ print "</td></tr>";
+
+ print "<tr><td colspan=\"2\">
+ <p>SQL Expression:</p>";
+
+ print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ rows=\"4\" name=\"sql_exp\" class=\"iedit\">$sql_exp</textarea>";
+
+ print "</td></tr></table>";
+
+ print "</form>";
+
+ print "<div style=\"display : none\" id=\"label_test_result\"></div>";
+
+ print "<div align='right'>";
+
+ print "<input type=\"submit\" onclick=\"labelTest()\" value=\"Test\">
+ ";
+
+ print "<input type=\"submit\"
+ id=\"infobox_submit\"
+ class=\"button\" onclick=\"return labelEditSave()\"
+ value=\"Save\"> ";
+
+ print "<input class=\"button\"
+ type=\"submit\" onclick=\"return labelEditCancel()\"
+ value=\"Cancel\">";
+
+ print "</div>";
+
+ return;
+ }
+
if ($subop == "test") {
$expr = db_unescape_string(trim($_GET["expr"]));
$descr = db_unescape_string(trim($_GET["descr"]));
- print "<div id=\"infoBoxTitle\">Test label: $descr</div>";
+ print "<div>";
- print "<div class='infoBoxContents'>";
-
-# print "<h1>Label «$descr»</h1>";
+ error_reporting(0);
-// print "<p><b>Expression</b>: $expr</p>";
$result = db_query($link,
"SELECT count(ttrss_entries.id) AS num_matches
WHERE ($expr) AND
ttrss_user_entries.ref_id = ttrss_entries.id AND
ttrss_user_entries.feed_id = ttrss_feeds.id AND
- ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
+ ttrss_user_entries.owner_uid = " . $_SESSION["uid"], false);
+
+ error_reporting (DEFAULT_ERROR_LEVEL);
+
+ if (!$result) {
+ print "<p>" . db_last_error($link) . "</p>";
+ print "</div>";
+ return;
+ }
$num_matches = db_fetch_result($result, 0, "num_matches");;
if ($num_matches > 0) {
- print "<p>Query returned <b>$num_matches</b> matches, showing first 15:</p>";
+ if ($num_matches > 10) {
+ $showing_msg = ", showing first 10";
+ }
+
+ print "<p>Query returned <b>$num_matches</b> matches$showing_msg:</p>";
$result = db_query($link,
"SELECT ttrss_entries.title,
ttrss_user_entries.ref_id = ttrss_entries.id
AND ttrss_user_entries.feed_id = ttrss_feeds.id
AND ttrss_user_entries.owner_uid = " . $_SESSION["uid"] . "
- ORDER BY date_entered DESC LIMIT 15");
+ ORDER BY date_entered DESC LIMIT 10", false);
- print "<ul class=\"filterTestResults\">";
+ print "<ul class=\"labelTestResults\">";
$row_class = "even";
print "</div>";
- print "<div align='center'>
- <input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
return;
}
if (!WEB_DEMO_MODE) {
// no escaping is done here on purpose
- $exp = trim($_GET["exp"]);
+ $sql_exp = trim($_GET["sql_exp"]);
+ $description = db_escape_string($_GET["description"]);
$result = db_query($link,
"INSERT INTO ttrss_labels (sql_exp,description,owner_uid)
- VALUES ('$exp', '$exp', '".$_SESSION["uid"]."')");
+ VALUES ('$sql_exp', '$description', '".$_SESSION["uid"]."')");
}
}
- print "<div class=\"prefGenericAddBox\">
- <input size=\"40\"
- onkeyup=\"toggleSubmitNotEmpty(this, 'label_create_btn')\"
- id=\"ladd_expr\"> ";
-
+ print "<div class=\"prefGenericAddBox\">";
+
print"<input type=\"submit\" class=\"button\"
- disabled=\"true\" id=\"label_create_btn\"
- onclick=\"javascript:addLabel()\" value=\"Create label\"></div>";
+ id=\"label_create_btn\"
+ onclick=\"return displayDlg('quickAddLabel', false)\"
+ value=\"Create label\"></div>";
$result = db_query($link, "SELECT
id,sql_exp,description
print "<tr class=\"title\">
<td width=\"5%\"> </td>
- <td width=\"40%\">SQL expression
+ <td width=\"30%\">Caption</td>
+ <td width=\"50%\">SQL Expression
<a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
</td>
- <td width=\"40%\">Caption</td></tr>";
+ </tr>";
$lnum = 0;
print "<tr class=\"$class\" $this_row_id>";
- $line["sql_exp"] = htmlspecialchars($line["sql_exp"]);
- $line["description"] = htmlspecialchars($line["description"]);
-
- if (!$edit_label_id || $subop != "edit") {
+ $line["sql_exp"] = htmlspecialchars(db_unescape_string($line["sql_exp"]));
+ $line["description"] = htmlspecialchars(
+ db_unescape_string($line["description"]));
- if (!$line["description"]) $line["description"] = "[No caption]";
+ if (!$line["description"]) $line["description"] = "[No caption]";
- print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"label\");'
+ print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"label\");'
type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
- print "<td><a href=\"javascript:editLabel($label_id);\">" .
- $line["sql_exp"] . "</td>";
-
- print "<td><a href=\"javascript:editLabel($label_id);\">" .
- $line["description"] . "</td>";
-
- } else if ($label_id != $edit_label_id) {
-
- if (!$line["description"]) $line["description"] = "[No description]";
-
- print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
- id=\"LICHK-".$line["id"]."\"></td>";
-
- print "<td>".$line["sql_exp"]."</td>";
- print "<td>".$line["description"]."</td>";
-
- } else {
-
- print "<td align='center'><input disabled=\"true\" type=\"checkbox\" checked>";
+ print "<td><a href=\"javascript:editLabel($label_id);\">" .
+ $line["description"] . "</td>";
+
+ print "<td><a href=\"javascript:editLabel($label_id);\">" .
+ $line["sql_exp"] . "</td>";
- print "<input type=\"hidden\" name=\"id\" value=\"$label_id\">";
- print "<input type=\"hidden\" name=\"op\" value=\"pref-labels\">";
- print "<input type=\"hidden\" name=\"subop\" value=\"editSave\">";
-
- print "</td>";
-
- print "<td><input onkeypress=\"return filterCR(event)\"
- class=\"iedit\" name=\"sql_exp\" value=\"".$line["sql_exp"]."\"></td>";
-
- print "<td><input onkeypress=\"return filterCR(event)\"
- class=\"iedit\" name=\"description\" value=\"".$line["description"]."\"></td>";
- }
-
-
print "</tr>";
++$lnum;
print "<p id=\"labelOpToolbar\">";
- if ($subop == "edit") {
- print "Edit label:
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:labelTest()\" value=\"Test\">
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:labelEditSave()\" value=\"Save\">
- <input type=\"submit\" class=\"button\"
- onclick=\"javascript:labelEditCancel()\" value=\"Cancel\">";
-
- } else {
- print "
+ print "
Selection:
<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:editSelectedLabel()\" value=\"Edit\">
<input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"javascript:removeSelectedLabels()\" value=\"Remove\">";
- }
+ onclick=\"javascript:removeSelectedLabels()\" value=\"Remove\">";
+
} else {
print "<p>No labels defined.</p>";
}
}
+ if ($id == "quickAddLabel") {
+ print "<div id=\"infoBoxTitle\">Create label</div>";
+ print "<div class=\"infoBoxContents\">";
+
+ print "<form id=\"label_edit_form\">";
+
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-labels\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"add\">";
+
+ print "<table width='100%'>";
+
+ print "<tr><td>Caption:</td>
+ <td><input onkeypress=\"return filterCR(event)\"
+ onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ name=\"description\" class=\"iedit\">";
+
+ print "</td></tr>";
+
+ print "<tr><td colspan=\"2\">
+ <p>SQL Expression:</p>";
+
+ print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
+ rows=\"4\" name=\"sql_exp\" class=\"iedit\"></textarea>";
+
+ print "</td></tr></table>";
+
+ print "</form>";
+
+ print "<div style=\"display : none\" id=\"label_test_result\"></div>";
+
+ print "<div align='right'>";
+
+ print "<input type=\"submit\" onclick=\"labelTest()\" value=\"Test\">
+ ";
+
+ print "<input type=\"submit\"
+ id=\"infobox_submit\"
+ disabled=\"true\"
+ class=\"button\" onclick=\"return addLabel()\"
+ value=\"Create\"> ";
+
+ print "<input class=\"button\"
+ type=\"submit\" onclick=\"return labelEditCancel()\"
+ value=\"Cancel\">";
+ }
+
if ($id == "quickAddFilter") {
$active_feed_id = db_escape_string($_GET["param"]);
git.wh0rd.org / tt-rss.git / blobdiff