valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wip-filter-stuff'

This commit is contained in:
Andrew Dolgov 2021-02-21 10:35:39 +03:00
parent 9e56896bd4 3b8d69206c
commit fb471652c0
14 changed files with 768 additions and 787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/labels.php
View File

@ -37,7 +37,18 @@ class Labels
} }
} }
static function get_all_labels($owner_uid) { static function get_as_hash($owner_uid) {
$rv = [];
$labels = Labels::get_all($owner_uid);
foreach ($labels as $i => $label) {
$rv[$label["id"]] = $labels[$i];
}
return $rv;
}
static function get_all($owner_uid) {
$rv = array(); $rv = array();
$pdo = Db::pdo(); $pdo = Db::pdo();
@ -46,7 +57,7 @@ class Labels
WHERE owner_uid = ? ORDER BY caption"); WHERE owner_uid = ? ORDER BY caption");
$sth->execute([$owner_uid]); $sth->execute([$owner_uid]);
while ($line = $sth->fetch()) { while ($line = $sth->fetch(PDO::FETCH_ASSOC)) {
array_push($rv, $line); array_push($rv, $line);
} }

527
classes/pref/filters.php
View File

@ -319,162 +319,90 @@ class Pref_Filters extends Handler_Protected {
$sth->execute([$filter_id, $_SESSION['uid']]); $sth->execute([$filter_id, $_SESSION['uid']]);
if (empty($filter_id) || $row = $sth->fetch()) { if (empty($filter_id) || $row = $sth->fetch()) {
$rv = [
"id" => $filter_id,
"enabled" => $row["enabled"] ?? true,
"match_any_rule" => $row["match_any_rule"] ?? false,
"inverse" => $row["inverse"] ?? false,
"title" => $row["title"] ?? "",
"rules" => [],
"actions" => [],
"filter_types" => [],
"action_types" => [],
"plugin_actions" => [],
"labels" => Labels::get_all($_SESSION["uid"])
];
$enabled = $row["enabled"] ?? true; $res = $this->pdo->query("SELECT id,description
$match_any_rule = $row["match_any_rule"] ?? false; FROM ttrss_filter_types WHERE id != 5 ORDER BY description");
$inverse = $row["inverse"] ?? false;
$title = htmlspecialchars($row["title"] ?? "");
print "<form onsubmit='return false'>"; while ($line = $res->fetch()) {
$rv["filter_types"][$line["id"]] = __($line["description"]);
print \Controls\hidden_tag("op", "pref-filters");
if ($filter_id) {
print \Controls\hidden_tag("id", "$filter_id");
print \Controls\hidden_tag("method", "editSave");
} else {
print \Controls\hidden_tag("method", "add");
} }
print \Controls\hidden_tag("csrf_token", $_SESSION['csrf_token']); $res = $this->pdo->query("SELECT id,description FROM ttrss_filter_actions
ORDER BY name");
print "<header>".__("Caption")."</header> while ($line = $res->fetch()) {
<section> $rv["action_types"][$line["id"]] = __($line["description"]);
<input required='true' dojoType='dijit.form.ValidationTextBox' style='width : 20em;' name=\"title\" value=\"$title\"> }
</section>
<header class='horizontal'>".__("Match")."</header>
<section>
<div dojoType='fox.Toolbar'>
<div dojoType='fox.form.DropDownButton'>
<span>" . __('Select')."</span>
<div dojoType='dijit.Menu' style='display: none;'>
<!-- can't use App.dialogOf() here because DropDownButton is not a child of the Dialog -->
<div onclick='dijit.byId(\"filterEditDlg\").selectRules(true)'
dojoType='dijit.MenuItem'>".__('All')."</div>
<div onclick='dijit.byId(\"filterEditDlg\").selectRules(false)'
dojoType='dijit.MenuItem'>".__('None')."</div>
</div>
</div>
<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).addRule()'>".
__('Add')."</button>
<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).deleteRule()'>".
__('Delete')."</button>
</div>";
print "<ul id='filterDlg_Matches'>"; $filter_actions = PluginHost::getInstance()->get_filter_actions();
foreach ($filter_actions as $fclass => $factions) {
foreach ($factions as $faction) {
$rv["plugin_actions"][$fclass . ":" . $faction["action"]] =
$fclass . ": " . $faction["description"];
}
}
if ($filter_id) { if ($filter_id) {
$rules_sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2_rules $rules_sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2_rules
WHERE filter_id = ? ORDER BY reg_exp, id"); WHERE filter_id = ? ORDER BY reg_exp, id");
$rules_sth->execute([$filter_id]); $rules_sth->execute([$filter_id]);
while ($line = $rules_sth->fetch()) { while ($rrow = $rules_sth->fetch(PDO::FETCH_ASSOC)) {
if ($line["match_on"]) { if ($rrow["match_on"]) {
$line["feed_id"] = json_decode($line["match_on"], true); $rrow["feed_id"] = json_decode($rrow["match_on"], true);
} else { } else {
if ($line["cat_filter"]) { if ($rrow["cat_filter"]) {
$feed_id = "CAT:" . (int)$line["cat_id"]; $feed_id = "CAT:" . (int)$rrow["cat_id"];
} else { } else {
$feed_id = (int)$line["feed_id"]; $feed_id = (int)$rrow["feed_id"];
} }
$line["feed_id"] = ["" . $feed_id]; // set item type to string for in_array() $rrow["feed_id"] = ["" . $feed_id]; // set item type to string for in_array()
} }
unset($line["cat_filter"]); unset($rrow["cat_filter"]);
unset($line["cat_id"]); unset($rrow["cat_id"]);
unset($line["filter_id"]); unset($rrow["filter_id"]);
unset($line["id"]); unset($rrow["id"]);
if (!$line["inverse"]) unset($line["inverse"]); if (!$rrow["inverse"]) unset($rrow["inverse"]);
unset($line["match_on"]); unset($rrow["match_on"]);
print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'> $rrow["name"] = $this->_get_rule_name($rrow);
<span onclick='App.dialogOf(this).editRule(this)'>".$this->_get_rule_name($line)."</span>".
\Controls\hidden_tag("rule[]", (string)json_encode($line))."</li>"; array_push($rv["rules"], $rrow);
} }
}
print "</ul>
</section>";
print "<header class='horizontal'>".__("Apply actions")."</header>
<section>
<div dojoType='fox.Toolbar'>
<div dojoType='fox.form.DropDownButton'>
<span>".__('Select')."</span>
<div dojoType='dijit.Menu' style='display: none'>
<div onclick='dijit.byId(\"filterEditDlg\").selectActions(true)'
dojoType='dijit.MenuItem'>".__('All')."</div>
<div onclick='dijit.byId(\"filterEditDlg\").selectActions(false)'
dojoType='dijit.MenuItem'>".__('None')."</div>
</div>
</div>
<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).addAction()'>".
__('Add')."</button>
<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).deleteAction()'>".
__('Delete')."</button>
</div>";
print "<ul id='filterDlg_Actions'>";
if ($filter_id) {
$actions_sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2_actions $actions_sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2_actions
WHERE filter_id = ? ORDER BY id"); WHERE filter_id = ? ORDER BY id");
$actions_sth->execute([$filter_id]); $actions_sth->execute([$filter_id]);
while ($line = $actions_sth->fetch()) { while ($arow = $actions_sth->fetch(PDO::FETCH_ASSOC)) {
$line["action_param_label"] = $line["action_param"]; $arow["action_param_label"] = $arow["action_param"];
unset($line["filter_id"]); unset($arow["filter_id"]);
unset($line["id"]); unset($arow["id"]);
print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'> $arow["name"] = $this->_get_action_name($arow);
<span onclick='App.dialogOf(this).editAction(this)'>".$this->_get_action_name($line)."</span>".
\Controls\hidden_tag("action[]", (string)json_encode($line))."</li>"; array_push($rv["actions"], $arow);
} }
} }
print json_encode($rv);
print "</ul>";
print "</section>";
print "<header>".__("Options")."</header>
<section>";
print "<fieldset class='narrow'>
<label class='checkbox'>".\Controls\checkbox_tag('enabled', $enabled)." ".__('Enabled')."</label></fieldset>";
print "<fieldset class='narrow'>
<label class='checkbox'>".\Controls\checkbox_tag('match_any_rule', $match_any_rule)." ".__('Match any rule')."</label>
</fieldset>";
print "<fieldset class='narrow'><label class='checkbox'>".\Controls\checkbox_tag('inverse', $inverse)." ".__('Inverse matching')."</label>
</fieldset>";
print "</section>
<footer>";
if ($filter_id) {
print "<div style='float : left'>
<button dojoType='dijit.form.Button' class='alt-danger' onclick='App.dialogOf(this).removeFilter()'>".
__('Remove')."</button>
</div>
<button dojoType='dijit.form.Button' class='alt-info' onclick='App.dialogOf(this).test()'>".
__('Test')."</button>
<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick='App.dialogOf(this).execute()'>".
__('Save')."</button>
<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".
__('Cancel')."</button>";
} else {
print "<button dojoType='dijit.form.Button' class='alt-info' onclick='App.dialogOf(this).test()'>".
__('Test')."</button>
<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick='App.dialogOf(this).execute()'>".
__('Create')."</button>
<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".
__('Cancel')."</button>";
}
print "</footer></form>";
} }
} }
@ -592,8 +520,7 @@ class Pref_Filters extends Handler_Protected {
$sth->execute(array_merge($ids, [$_SESSION['uid']])); $sth->execute(array_merge($ids, [$_SESSION['uid']]));
} }
private function _save_rules_and_actions($filter_id) private function _save_rules_and_actions($filter_id) {
{
$sth = $this->pdo->prepare("DELETE FROM ttrss_filters2_rules WHERE filter_id = ?"); $sth = $this->pdo->prepare("DELETE FROM ttrss_filters2_rules WHERE filter_id = ?");
$sth->execute([$filter_id]); $sth->execute([$filter_id]);
@ -670,7 +597,7 @@ class Pref_Filters extends Handler_Protected {
} }
} }
function add() { function add () {
$enabled = checkbox_to_sql_bool(clean($_REQUEST["enabled"] ?? false)); $enabled = checkbox_to_sql_bool(clean($_REQUEST["enabled"] ?? false));
$match_any_rule = checkbox_to_sql_bool(clean($_REQUEST["match_any_rule"] ?? false)); $match_any_rule = checkbox_to_sql_bool(clean($_REQUEST["match_any_rule"] ?? false));
$title = clean($_REQUEST["title"]); $title = clean($_REQUEST["title"]);
@ -764,176 +691,12 @@ class Pref_Filters extends Handler_Protected {
<?php <?php
} }
function newrule() { function editrule() {
$rule = json_decode(clean($_REQUEST["rule"]), true); $feed_ids = explode(",", clean($_REQUEST["ids"]));
if ($rule) { print json_encode([
$reg_exp = htmlspecialchars($rule["reg_exp"]); "multiselect" => $this->_feed_multi_select("feed_id", $feed_ids, 'style="width : 540px; height : 300px" dojoType="dijit.form.MultiSelect"')
$filter_type = $rule["filter_type"]; ]);
$feed_id = $rule["feed_id"];
$inverse_checked = !empty($rule["inverse"]);
} else {
$reg_exp = "";
$filter_type = 1;
$feed_id = ["0"];
$inverse_checked = false;
}
print "<form name='filter_new_rule_form' id='filter_new_rule_form' onsubmit='return false;'>";
$res = $this->pdo->query("SELECT id,description
FROM ttrss_filter_types WHERE id != 5 ORDER BY description");
$filter_types = array();
while ($line = $res->fetch()) {
$filter_types[$line["id"]] = __($line["description"]);
}
print "<header>".__("Match")."</header>";
print "<section>";
print "<textarea dojoType='fox.form.ValidationTextArea'
required='true' id='filterDlg_regExp'
ValidRegExp='true'
rows='4'
style='font-size : 14px; width : 490px; word-break: break-all'
name='reg_exp'>$reg_exp</textarea>";
print "<div dojoType='dijit.Tooltip' id='filterDlg_regExp_tip' connectId='filterDlg_regExp' position='below'></div>";
print "<fieldset>";
print "<label class='checkbox'>".
\Controls\checkbox_tag("inverse", $inverse_checked) .
__("Inverse regular expression matching")."</label>";
print "</fieldset>";
print "<fieldset>";
print "<label style='display : inline'>". __("on field") . "</label> ";
print \Controls\select_hash("filter_type", $filter_type, $filter_types);
print "<label style='padding-left : 10px; display : inline'>" . __("in") . "</label> ";
print "</fieldset>";
print "<fieldset>";
print "<span id='filterDlg_feeds'>";
$this->feed_multi_select("feed_id",
$feed_id,
'style="width : 500px; height : 300px" dojoType="dijit.form.MultiSelect"');
print "</span>";
print "</fieldset>";
print "</section>";
print "<footer>";
print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/ContentFilters\")'>
<i class='material-icons'>help</i> ".__("More info...")."</button>";
print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick='App.dialogOf(this).execute()'>".
($rule ? __("Save rule") : __('Add rule'))."</button> ";
print "<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".
__('Cancel')."</button>";
print "</footer>";
print "</form>";
}
function newaction() {
$action = json_decode(clean($_REQUEST["action"]), true);
if ($action) {
$action_param = $action["action_param"];
$action_id = (int)$action["action_id"];
} else {
$action_param = "";
$action_id = 0;
}
print "<form name='filter_new_action_form' id='filter_new_action_form' onsubmit='return false;'>";
print "<header>".__("Perform Action")."</header>";
print "<section>";
print "<select name='action_id' dojoType='fox.form.Select'
onchange='Filters.filterDlgCheckAction(this)'>";
$res = $this->pdo->query("SELECT id,description FROM ttrss_filter_actions
ORDER BY name");
while ($line = $res->fetch()) {
$is_selected = ($line["id"] == $action_id) ? "selected='1'" : "";
printf("<option $is_selected value='%d'>%s</option>", $line["id"], __($line["description"]));
}
print "</select>";
$param_box_hidden = ($action_id == 7 || $action_id == 4 || $action_id == 6 || $action_id == 9) ?
"" : "display : none";
$param_hidden = ($action_id == 4 || $action_id == 6) ?
"" : "display : none";
$label_param_hidden = ($action_id == 7) ? "" : "display : none";
$plugin_param_hidden = ($action_id == 9) ? "" : "display : none";
print "<span id='filterDlg_paramBox' style=\"$param_box_hidden\">";
print " ";
//print " " . __("with parameters:") . " ";
print "<input dojoType='dijit.form.TextBox'
id='filterDlg_actionParam' style=\"$param_hidden\"
name='action_param' value=\"$action_param\">";
print \Controls\select_labels("action_param_label", $action_param,
["style" => $label_param_hidden],
"filterDlg_actionParamLabel");
$filter_actions = PluginHost::getInstance()->get_filter_actions();
$filter_action_hash = array();
foreach ($filter_actions as $fclass => $factions) {
foreach ($factions as $faction) {
$filter_action_hash[$fclass . ":" . $faction["action"]] =
$fclass . ": " . $faction["description"];
}
}
if (count($filter_action_hash) == 0) {
$filter_plugin_disabled = ["disabled" => "1"];
$filter_action_hash["no-data"] = __("No actions available");
} else {
$filter_plugin_disabled = [];
}
print \Controls\select_hash("action_param_plugin", $action_param, $filter_action_hash,
array_merge(["style" => $plugin_param_hidden], $filter_plugin_disabled),
"filterDlg_actionParamPlugin");
print "</span>";
print "&nbsp;"; // tiny layout hack
print "</section>";
print "<footer>";
print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick='App.dialogOf(this).execute()'>".
($action ? __("Save action") : __('Add action'))."</button> ";
print "<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".
__('Cancel')."</button>";
print "</footer>";
print "</form>";
} }
private function _get_name($id) { private function _get_name($id) {
@ -1067,106 +830,110 @@ class Pref_Filters extends Handler_Protected {
$this->pdo->commit(); $this->pdo->commit();
} }
private function feed_multi_select($id, $default_ids = [], private function _feed_multi_select($id, $default_ids = [],
$attributes = "", $include_all_feeds = true, $attributes = "", $include_all_feeds = true,
$root_id = null, $nest_level = 0) { $root_id = null, $nest_level = 0) {
$pdo = Db::pdo(); $pdo = Db::pdo();
// print_r(in_array("CAT:6",$default_ids)); $rv = "";
if (!$root_id) { // print_r(in_array("CAT:6",$default_ids));
print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
if ($include_all_feeds) { if (!$root_id) {
$is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : ""; $rv .= "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
print "<option $is_selected value=\"0\">".__('All feeds')."</option>"; if ($include_all_feeds) {
$is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
$rv .= "<option $is_selected value=\"0\">".__('All feeds')."</option>";
}
} }
}
if (get_pref('ENABLE_FEED_CATS')) { if (get_pref('ENABLE_FEED_CATS')) {
if (!$root_id) $root_id = null; if (!$root_id) $root_id = null;
$sth = $pdo->prepare("SELECT id,title, $sth = $pdo->prepare("SELECT id,title,
(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE (SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
c2.parent_cat = ttrss_feed_categories.id) AS num_children c2.parent_cat = ttrss_feed_categories.id) AS num_children
FROM ttrss_feed_categories FROM ttrss_feed_categories
WHERE owner_uid = :uid AND WHERE owner_uid = :uid AND
(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title"); (parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]); $sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
while ($line = $sth->fetch()) { while ($line = $sth->fetch()) {
for ($i = 0; $i < $nest_level; $i++)
$line["title"] = " " . $line["title"];
$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
printf("<option $is_selected value='CAT:%d'>%s</option>",
$line["id"], htmlspecialchars($line["title"]));
if ($line["num_children"] > 0)
$this->feed_multi_select($id, $default_ids, $attributes,
$include_all_feeds, $line["id"], $nest_level+1);
$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
$f_sth->execute([$line['id'], $_SESSION['uid']]);
while ($fline = $f_sth->fetch()) {
$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
$fline["title"] = " " . $fline["title"];
for ($i = 0; $i < $nest_level; $i++) for ($i = 0; $i < $nest_level; $i++)
$line["title"] = " " . $line["title"];
$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
$rv .= sprintf("<option $is_selected value='CAT:%d'>%s</option>",
$line["id"], htmlspecialchars($line["title"]));
if ($line["num_children"] > 0)
$rv .= $this->_feed_multi_select($id, $default_ids, $attributes,
$include_all_feeds, $line["id"], $nest_level+1);
$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
$f_sth->execute([$line['id'], $_SESSION['uid']]);
while ($fline = $f_sth->fetch()) {
$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
$fline["title"] = " " . $fline["title"]; $fline["title"] = " " . $fline["title"];
printf("<option $is_selected value='%d'>%s</option>", for ($i = 0; $i < $nest_level; $i++)
$fline["id"], htmlspecialchars($fline["title"])); $fline["title"] = " " . $fline["title"];
$rv .= sprintf("<option $is_selected value='%d'>%s</option>",
$fline["id"], htmlspecialchars($fline["title"]));
}
}
if (!$root_id) {
$is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
$rv .= sprintf("<option $is_selected value='CAT:0'>%s</option>",
__("Uncategorized"));
$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title");
$f_sth->execute([$_SESSION['uid']]);
while ($fline = $f_sth->fetch()) {
$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
$fline["title"] = " " . $fline["title"];
for ($i = 0; $i < $nest_level; $i++)
$fline["title"] = " " . $fline["title"];
$rv .= sprintf("<option $is_selected value='%d'>%s</option>",
$fline["id"], htmlspecialchars($fline["title"]));
}
}
} else {
$sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
WHERE owner_uid = ? ORDER BY title");
$sth->execute([$_SESSION['uid']]);
while ($line = $sth->fetch()) {
$is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
$rv .= sprintf("<option $is_selected value='%d'>%s</option>",
$line["id"], htmlspecialchars($line["title"]));
} }
} }
if (!$root_id) { if (!$root_id) {
$is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : ""; $rv .= "</select>";
printf("<option $is_selected value='CAT:0'>%s</option>",
__("Uncategorized"));
$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title");
$f_sth->execute([$_SESSION['uid']]);
while ($fline = $f_sth->fetch()) {
$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
$fline["title"] = " " . $fline["title"];
for ($i = 0; $i < $nest_level; $i++)
$fline["title"] = " " . $fline["title"];
printf("<option $is_selected value='%d'>%s</option>",
$fline["id"], htmlspecialchars($fline["title"]));
}
} }
} else { return $rv;
$sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
WHERE owner_uid = ? ORDER BY title");
$sth->execute([$_SESSION['uid']]);
while ($line = $sth->fetch()) {
$is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
printf("<option $is_selected value='%d'>%s</option>",
$line["id"], htmlspecialchars($line["title"]));
}
}
if (!$root_id) {
print "</select>";
} }
} }
}

4
classes/rpc.php
View File

@ -399,7 +399,7 @@ class RPC extends Handler_Protected {
$params["icon_indicator_white"] = $this->image_to_base64("images/indicator_white.gif"); $params["icon_indicator_white"] = $this->image_to_base64("images/indicator_white.gif");
$params["labels"] = Labels::get_all_labels($_SESSION["uid"]); $params["labels"] = Labels::get_all($_SESSION["uid"]);
return $params; return $params;
} }
@ -430,7 +430,7 @@ class RPC extends Handler_Protected {
$data["max_feed_id"] = (int) $max_feed_id; $data["max_feed_id"] = (int) $max_feed_id;
$data["num_feeds"] = (int) $num_feeds; $data["num_feeds"] = (int) $num_feeds;
$data['cdm_expanded'] = get_pref('CDM_EXPANDED'); $data['cdm_expanded'] = get_pref('CDM_EXPANDED');
$data["labels"] = Labels::get_all_labels($_SESSION["uid"]); $data["labels"] = Labels::get_all($_SESSION["uid"]);
if (LOG_DESTINATION == 'sql' && $_SESSION['access_level'] >= 10) { if (LOG_DESTINATION == 'sql' && $_SESSION['access_level'] >= 10) {
if (DB_TYPE == 'pgsql') { if (DB_TYPE == 'pgsql') {

16
include/controls.php
View File

@ -60,21 +60,11 @@
return $rv; return $rv;
} }
function select_labels(string $name, string $value, array $attributes = [], string $id = "") { /*function select_labels(string $name, string $value, array $attributes = [], string $id = "") {
$pdo = \Db::pdo(); $values = \Labels::get_as_hash($_SESSION["uid"]);
$sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
WHERE owner_uid = ? ORDER BY caption");
$sth->execute([$_SESSION['uid']]);
$values = [];
while ($row = $sth->fetch()) {
array_push($values, $row["caption"]);
}
return select_tag($name, $value, $values, $attributes, $id); return select_tag($name, $value, $values, $attributes, $id);
} }*/
function select_hash(string $name, $value, array $values, array $attributes = [], string $id = "") { function select_hash(string $name, $value, array $values, array $attributes = [], string $id = "") {
$attributes_str = attributes_to_string($attributes); $attributes_str = attributes_to_string($attributes);

21
js/App.js
View File

@ -358,6 +358,27 @@ const App = {
return p; return p;
} }
}, },
// http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac
getSelectedText: function() {
let text = "";
if (typeof window.getSelection != "undefined") {
const sel = window.getSelection();
if (sel.rangeCount) {
const container = document.createElement("div");
for (let i = 0, len = sel.rangeCount; i < len; ++i) {
container.appendChild(sel.getRangeAt(i).cloneContents());
}
text = container.innerHTML;
}
} else if (typeof document.selection != "undefined") {
if (document.selection.type == "Text") {
text = document.selection.createRange().textText;
}
}
return text.stripTags();
},
displayIfChecked: function(checkbox, elemId) { displayIfChecked: function(checkbox, elemId) {
if (checkbox.checked) { if (checkbox.checked) {
Element.show(elemId); Element.show(elemId);

841
js/CommonFilters.js
View File

@ -5,358 +5,559 @@
/* global __, App, Article, Lists, fox */ /* global __, App, Article, Lists, fox */
/* global xhr, dojo, dijit, Notify, Feeds */ /* global xhr, dojo, dijit, Notify, Feeds */
/* exported Filters */
const Filters = { const Filters = {
filterDlgCheckAction: function(sender) { edit: function(filter_id = null) { // if no id, new filter dialog
const action = sender.value;
const action_param = App.byId("filterDlg_paramBox");
if (!action_param) {
console.log("filterDlgCheckAction: can't find action param box!");
return;
}
// if selected action supports parameters, enable params field
if (action == 4 || action == 6 || action == 7 || action == 9) {
Element.show(action_param);
Element.hide(dijit.byId("filterDlg_actionParam").domNode);
Element.hide(dijit.byId("filterDlg_actionParamLabel").domNode);
Element.hide(dijit.byId("filterDlg_actionParamPlugin").domNode);
if (action == 7) {
Element.show(dijit.byId("filterDlg_actionParamLabel").domNode);
} else if (action == 9) {
Element.show(dijit.byId("filterDlg_actionParamPlugin").domNode);
} else {
Element.show(dijit.byId("filterDlg_actionParam").domNode);
}
} else {
Element.hide(action_param);
}
},
createNewRuleElement: function(parentNode, replaceNode) {
const rule = dojo.formToJson("filter_new_rule_form");
xhr.post("backend.php", {op: "pref-filters", method: "printrulename", rule: rule}, (reply) => {
try {
const li = document.createElement('li');
li.innerHTML = `<input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
<span onclick='App.dialogOf(this).editRule(this)'>${reply}</span>
${App.FormFields.hidden_tag("rule[]", rule)}`;
dojo.parser.parse(li);
if (replaceNode) {
parentNode.replaceChild(li, replaceNode);
} else {
parentNode.appendChild(li);
}
} catch (e) {
App.Error.report(e);
}
});
},
createNewActionElement: function(parentNode, replaceNode) {
const form = document.forms["filter_new_action_form"];
if (form.action_id.value == 7) {
form.action_param.value = form.action_param_label.value;
} else if (form.action_id.value == 9) {
form.action_param.value = form.action_param_plugin.value;
}
const action = dojo.formToJson(form);
xhr.post("backend.php", { op: "pref-filters", method: "printactionname", action: action }, (reply) => {
try {
const li = document.createElement('li');
li.innerHTML = `<input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
<span onclick='App.dialogOf(this).editAction(this)'>${reply}</span>
${App.FormFields.hidden_tag("action[]", action)}`;
dojo.parser.parse(li);
if (replaceNode) {
parentNode.replaceChild(li, replaceNode);
} else {
parentNode.appendChild(li);
}
} catch (e) {
App.Error.report(e);
}
});
},
addFilterRule: function(replaceNode, ruleStr) {
const dialog = new fox.SingleUseDialog({
id: "filterNewRuleDlg",
title: ruleStr ? __("Edit rule") : __("Add rule"),
execute: function () {
if (this.validate()) {
Filters.createNewRuleElement(App.byId("filterDlg_Matches"), replaceNode);
this.hide();
}
},
content: __('Loading, please wait...'),
});
const tmph = dojo.connect(dialog, "onShow", null, function (/* e */) {
dojo.disconnect(tmph);
xhr.post("backend.php", {op: 'pref-filters', method: 'newrule', rule: ruleStr}, (reply) => {
dialog.attr('content', reply);
});
});
dialog.show();
},
addFilterAction: function(replaceNode, actionStr) {
const dialog = new fox.SingleUseDialog({
title: actionStr ? __("Edit action") : __("Add action"),
execute: function () {
if (this.validate()) {
Filters.createNewActionElement(App.byId("filterDlg_Actions"), replaceNode);
this.hide();
}
}
});
const tmph = dojo.connect(dialog, "onShow", null, function (/* e */) {
dojo.disconnect(tmph);
xhr.post("backend.php", {op: 'pref-filters', method: 'newaction', action: actionStr}, (reply) => {
dialog.attr('content', reply);
});
});
dialog.show();
},
test: function(params) {
const dialog = new fox.SingleUseDialog({ const dialog = new fox.SingleUseDialog({
title: "Test Filter", id: "filterEditDlg",
results: 0, title: filter_id ? __("Edit Filter") : __("Create Filter"),
limit: 100, ACTION_TAG: 4,
max_offset: 10000, ACTION_SCORE: 6,
getTestResults: function (params, offset) { ACTION_LABEL: 7,
params.method = 'testFilterDo'; ACTION_PLUGIN: 9,
params.offset = offset; PARAM_ACTIONS: [4, 6, 7, 9],
params.limit = dialog.limit; filter_info: {},
test: function() {
const test_dialog = new fox.SingleUseDialog({
title: "Test Filter",
results: 0,
limit: 100,
max_offset: 10000,
getTestResults: function (params, offset) {
params.method = 'testFilterDo';
params.offset = offset;
params.limit = test_dialog.limit;
console.log("getTestResults:" + offset); console.log("getTestResults:" + offset);
xhr.json("backend.php", params, (result) => { xhr.json("backend.php", params, (result) => {
try { try {
if (result && dialog && dialog.open) { if (result && test_dialog && test_dialog.open) {
dialog.results += result.length; test_dialog.results += result.length;
console.log("got results:" + result.length); console.log("got results:" + result.length);
App.byId("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...") App.byId("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
.replace("%f", dialog.results) .replace("%f", test_dialog.results)
.replace("%d", offset); .replace("%d", offset);
console.log(offset + " " + dialog.max_offset); console.log(offset + " " + test_dialog.max_offset);
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
const tmp = dojo.create("table", { innerHTML: result[i]}); const tmp = dojo.create("table", { innerHTML: result[i]});
App.byId("prefFilterTestResultList").innerHTML += tmp.innerHTML; App.byId("prefFilterTestResultList").innerHTML += tmp.innerHTML;
} }
if (dialog.results < 30 && offset < dialog.max_offset) { if (test_dialog.results < 30 && offset < test_dialog.max_offset) {
// get the next batch // get the next batch
window.setTimeout(function () { window.setTimeout(function () {
dialog.getTestResults(params, offset + dialog.limit); test_dialog.getTestResults(params, offset + test_dialog.limit);
}, 0); }, 0);
} else { } else {
// all done // all done
Element.hide("prefFilterLoadingIndicator"); Element.hide("prefFilterLoadingIndicator");
if (dialog.results == 0) { if (test_dialog.results == 0) {
App.byId("prefFilterTestResultList").innerHTML = `<tr><td align='center'> App.byId("prefFilterTestResultList").innerHTML = `<tr><td align='center'>
${__('No recent articles matching this filter have been found.')}</td></tr>`; ${__('No recent articles matching this filter have been found.')}</td></tr>`;
App.byId("prefFilterProgressMsg").innerHTML = "Articles matching this filter:"; App.byId("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
} else {
App.byId("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:")
.replace("%d", test_dialog.results);
}
}
} else if (!result) {
console.log("getTestResults: can't parse results object");
Element.hide("prefFilterLoadingIndicator");
Notify.error("Error while trying to get filter test results.");
} else { } else {
App.byId("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:") console.log("getTestResults: dialog closed, bailing out.");
.replace("%d", dialog.results);
} }
} catch (e) {
App.Error.report(e);
} }
});
},
content: `
<div>
<img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'>&nbsp;
<span id='prefFilterProgressMsg'>Looking for articles...</span>
</div>
} else if (!result) { <ul class='panel panel-scrollable list list-unstyled' id='prefFilterTestResultList'></ul>
console.log("getTestResults: can't parse results object");
Element.hide("prefFilterLoadingIndicator"); <footer class='text-center'>
Notify.error("Error while trying to get filter test results."); <button dojoType='dijit.form.Button' type='submit' class='alt-primary'>${__('Close this window')}</button>
</footer>
`
});
const tmph = dojo.connect(test_dialog, "onShow", null, function (/* e */) {
dojo.disconnect(tmph);
test_dialog.getTestResults(dialog.attr('value'), 0);
});
test_dialog.show();
},
insertRule: function(parentNode, replaceNode) {
const rule = dojo.formToJson("filter_new_rule_form");
xhr.post("backend.php", {op: "pref-filters", method: "printrulename", rule: rule}, (reply) => {
try {
const li = document.createElement('li');
li.addClassName("rule");
li.innerHTML = `${App.FormFields.checkbox_tag("", false, {onclick: 'Lists.onRowChecked(this)'})}
<span class="name" onclick='App.dialogOf(this).onRuleClicked(this)'>${reply}</span>
<span class="payload" >${App.FormFields.hidden_tag("rule[]", rule)}</span>`;
dojo.parser.parse(li);
if (replaceNode) {
parentNode.replaceChild(li, replaceNode);
} else { } else {
console.log("getTestResults: dialog closed, bailing out."); parentNode.appendChild(li);
} }
} catch (e) { } catch (e) {
App.Error.report(e); App.Error.report(e);
} }
}); });
}, },
content: ` insertAction: function(parentNode, replaceNode) {
<div> const form = document.forms["filter_new_action_form"];
<img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'>&nbsp;
<span id='prefFilterProgressMsg'>Looking for articles...</span>
</div>
<ul class='panel panel-scrollable list list-unstyled' id='prefFilterTestResultList'></ul> if (form.action_id.value == 7) {
form.action_param.value = form.action_param_label.value;
} else if (form.action_id.value == 9) {
form.action_param.value = form.action_param_plugin.value;
}
<footer class='text-center'> const action = dojo.formToJson(form);
<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>${__('Close this window')}</button>
</footer> xhr.post("backend.php", { op: "pref-filters", method: "printactionname", action: action }, (reply) => {
` try {
const li = document.createElement('li');
li.addClassName("action");
li.innerHTML = `${App.FormFields.checkbox_tag("", false, {onclick: 'Lists.onRowChecked(this)'})}
<span class="name" onclick='App.dialogOf(this).onActionClicked(this)'>${reply}</span>
<span class="payload">${App.FormFields.hidden_tag("action[]", action)}</span>`;
dojo.parser.parse(li);
if (replaceNode) {
parentNode.replaceChild(li, replaceNode);
} else {
parentNode.appendChild(li);
}
} catch (e) {
App.Error.report(e);
}
});
},
editRule: function(replaceNode, ruleStr = null) {
const edit_rule_dialog = new fox.SingleUseDialog({
id: "filterNewRuleDlg",
title: ruleStr ? __("Edit rule") : __("Add rule"),
execute: function () {
if (this.validate()) {
dialog.insertRule(App.byId("filterDlg_Matches"), replaceNode);
this.hide();
}
},
content: __('Loading, please wait...'),
});
const tmph = dojo.connect(edit_rule_dialog, "onShow", null, function () {
dojo.disconnect(tmph);
let rule;
if (ruleStr) {
rule = JSON.parse(ruleStr);
} else {
rule = {
reg_exp: "",
filter_type: 1,
feed_id: ["0"],
inverse: false,
};
}
console.log(rule, dialog.filter_info);
xhr.json("backend.php", {op: "pref-filters", method: "editrule", ids: rule.feed_id.join(",")}, function (editrule) {
edit_rule_dialog.attr('content',
`
<form name="filter_new_rule_form" id="filter_new_rule_form" onsubmit="return false">
<section>
<textarea dojoType="fox.form.ValidationTextArea"
required="true" id="filterDlg_regExp" ValidRegExp="true"
rows="4" style="font-size : 14px; width : 530px; word-break: break-all"
name="reg_exp">${rule.reg_exp}</textarea>
<div dojoType="dijit.Tooltip" id="filterDlg_regExp_tip" connectId="filterDlg_regExp" position="below"></div>
<fieldset>
<label class="checkbox">
${App.FormFields.checkbox_tag("inverse", rule.inverse)}
${__("Inverse regular expression matching")}
</label>
</fieldset>
<fieldset>
<label style="display : inline">${__("on")}</label>
${App.FormFields.select_hash("filter_type", rule.filter_type, dialog.filter_info.filter_types)}
<label style="padding-left : 10px; display : inline">${__("in")}</label>
</fieldset>
<fieldset>
<span id="filterDlg_feeds">
${editrule.multiselect}
</span>
</fieldset>
</section>
<footer>
${App.FormFields.button_tag(App.FormFields.icon("help") + " " + __("More info"), "", {class: 'pull-left alt-info',
onclick: "window.open('https://tt-rss.org/wiki/ContentFilters')"})}
${App.FormFields.submit_tag(__("Save rule"), {onclick: "App.dialogOf(this).execute()"})}
${App.FormFields.cancel_dialog_tag(__("Cancel"))}
</footer>
</form>
`);
});
});
edit_rule_dialog.show();
},
editAction: function(replaceNode, actionStr) {
const edit_action_dialog = new fox.SingleUseDialog({
title: actionStr ? __("Edit action") : __("Add action"),
select_labels: function(name, value, labels, attributes = {}, id = "") {
const values = Object.values(labels).map((label) => label.caption);
return App.FormFields.select_tag(name, value, values, attributes, id);
},
toggleParam: function(sender) {
const action = parseInt(sender.value);
dijit.byId("filterDlg_actionParam").domNode.hide();
dijit.byId("filterDlg_actionParamLabel").domNode.hide();
dijit.byId("filterDlg_actionParamPlugin").domNode.hide();
// if selected action supports parameters, enable params field
if (action == dialog.ACTION_LABEL) {
dijit.byId("filterDlg_actionParamLabel").domNode.show();
} else if (action == dialog.ACTION_PLUGIN) {
dijit.byId("filterDlg_actionParamPlugin").domNode.show();
} else if (dialog.PARAM_ACTIONS.indexOf(action) != -1) {
dijit.byId("filterDlg_actionParam").domNode.show();
}
},
execute: function () {
if (this.validate()) {
dialog.insertAction(App.byId("filterDlg_Actions"), replaceNode);
this.hide();
}
},
content: __("Loading, please wait...")
});
const tmph = dojo.connect(edit_action_dialog, "onShow", null, function () {
dojo.disconnect(tmph);
let action;
if (actionStr) {
action = JSON.parse(actionStr);
} else {
action = {
action_id: 2,
action_param: ""
};
}
console.log(action);
edit_action_dialog.attr('content',
`
<form name="filter_new_action_form" id="filter_new_action_form" onsubmit="return false;">
<section>
${App.FormFields.select_hash("action_id", -1,
dialog.filter_info.action_types,
{onchange: "App.dialogOf(this).toggleParam(this)"},
"filterDlg_actionSelect")}
<input dojoType="dijit.form.TextBox"
id="filterDlg_actionParam" style="$param_hidden"
name="action_param" value="${App.escapeHtml(action.action_param)}">
${edit_action_dialog.select_labels("action_param_label", action.action_param,
dialog.filter_info.labels,
{},
"filterDlg_actionParamLabel")}
${App.FormFields.select_hash("action_param_plugin", action.action_param,
dialog.filter_info.plugin_actions,
{},
"filterDlg_actionParamPlugin")}
</section>
<footer>
${App.FormFields.submit_tag(__("Save action"), {onclick: "App.dialogOf(this).execute()"})}
${App.FormFields.cancel_dialog_tag(__("Cancel"))}
</footer>
</form>
`);
dijit.byId("filterDlg_actionSelect").attr('value', action.action_id);
/*xhr.post("backend.php", {op: 'pref-filters', method: 'newaction', action: actionStr}, (reply) => {
edit_action_dialog.attr('content', reply);
setTimeout(() => {
edit_action_dialog.hideOrShowActionParam(dijit.byId("filterDlg_actionSelect").attr('value'));
}, 250);
});*/
});
edit_action_dialog.show();
},
selectRules: function (select) {
Lists.select("filterDlg_Matches", select);
},
selectActions: function (select) {
Lists.select("filterDlg_Actions", select);
},
onRuleClicked: function (elem) {
const li = elem.closest('li');
const rule = li.querySelector('input[name="rule[]"]').value;
this.editRule(li, rule);
},
onActionClicked: function (elem) {
const li = elem.closest('li');
const action = li.querySelector('input[name="action[]"]').value;
this.editAction(li, action);
},
removeFilter: function () {
const msg = __("Remove filter?");
if (confirm(msg)) {
this.hide();
Notify.progress("Removing filter...");
const query = {op: "pref-filters", method: "remove", ids: this.attr('value').id};
xhr.post("backend.php", query, () => {
const tree = dijit.byId("filterTree");
if (tree) tree.reload();
});
}
},
addAction: function () {
this.editAction();
},
addRule: function () {
this.editRule();
},
deleteAction: function () {
App.findAll("#filterDlg_Actions li[class*=Selected]").forEach(function (e) {
e.parentNode.removeChild(e)
});
},
deleteRule: function () {
App.findAll("#filterDlg_Matches li[class*=Selected]").forEach(function (e) {
e.parentNode.removeChild(e)
});
},
execute: function () {
if (this.validate()) {
Notify.progress("Saving data...", true);
xhr.post("backend.php", this.attr('value'), () => {
dialog.hide();
const tree = dijit.byId("filterTree");
if (tree) tree.reload();
});
}
},
content: __("Loading, please wait...")
}); });
dojo.connect(dialog, "onShow", null, function (/* e */) { const tmph = dojo.connect(dialog, 'onShow', function () {
dialog.getTestResults(params, 0); dojo.disconnect(tmph);
xhr.json("backend.php", {op: "pref-filters", method: "edit", id: filter_id}, function (filter) {
dialog.filter_info = filter;
const options = {
enabled: [ filter.enabled, __('Enabled') ],
match_any_rule: [ filter.match_any_rule, __('Match any rule') ],
inverse: [ filter.inverse, __('Inverse matching') ],
};
dialog.attr('content',
`
<form onsubmit='return false'>
${App.FormFields.hidden_tag("op", "pref-filters")}
${App.FormFields.hidden_tag("id", filter_id)}
${App.FormFields.hidden_tag("method", filter_id ? "editSave" : "add")}
${App.FormFields.hidden_tag("csrf_token", App.getInitParam('csrf_token'))}
<section>
<input required="true" dojoType="dijit.form.ValidationTextBox" style="width : 530px"
placeholder="${__("Title")}" name="title" value="${App.escapeHtml(filter.title)}">
</section>
<div dojoType="dijit.layout.TabContainer" style="height : 300px">
<div dojoType="dijit.layout.ContentPane" title="${__('Match')}">
<div style="padding : 0" dojoType="dijit.layout.BorderContainer" gutters="false">
<div dojoType="fox.Toolbar" region="top">
<div dojoType="fox.form.DropDownButton">
<span>${__("Select")}</span>
<div dojoType="dijit.Menu" style="display: none;">
<!-- can"t use App.dialogOf() here because DropDownButton is not a child of the Dialog -->
<div onclick="dijit.byId('filterEditDlg').selectRules(true)"
dojoType="dijit.MenuItem">${__("All")}</div>
<div onclick="dijit.byId('filterEditDlg').selectRules(false)"
dojoType="dijit.MenuItem">${__("None")}</div>
</div>
</div>
<button dojoType="dijit.form.Button" onclick="App.dialogOf(this).addRule()">
${__("Add")}
</button>
<button dojoType="dijit.form.Button" onclick="App.dialogOf(this).deleteRule()">
${__("Delete")}
</button>
</div>
<div dojoType="dijit.layout.ContentPane" region="center">
<ul id="filterDlg_Matches">
${filter.rules.map((rule) => `
<li class='rule'>
${App.FormFields.checkbox_tag("", false, "", {onclick: 'Lists.onRowChecked(this)'})}
<span class='name' onclick='App.dialogOf(this).onRuleClicked(this)'>${rule.name}</span>
<span class='payload'>${App.FormFields.hidden_tag("rule[]", JSON.stringify(rule))}</span>
</li>
`).join("")}
</ul>
</div>
</div>
</div>
<div dojoType="dijit.layout.ContentPane" title="${__('Apply actions')}">
<div style="padding : 0" dojoType="dijit.layout.BorderContainer" gutters="false">
<div dojoType="fox.Toolbar" region="top">
<div dojoType="fox.form.DropDownButton">
<span>${__("Select")}</span>
<div dojoType="dijit.Menu" style="display: none">
<div onclick="dijit.byId('filterEditDlg').selectActions(true)"
dojoType="dijit.MenuItem">${__("All")}</div>
<div onclick="dijit.byId('filterEditDlg').selectActions(false)"
dojoType="dijit.MenuItem">${__("None")}</div>
</div>
</div>
<button dojoType="dijit.form.Button" onclick="App.dialogOf(this).addAction()">
${__("Add")}
</button>
<button dojoType="dijit.form.Button" onclick="App.dialogOf(this).deleteAction()">
${__("Delete")}
</button>
</div>
<div dojoType="dijit.layout.ContentPane" region="center">
<ul id="filterDlg_Actions">
${filter.actions.map((action) => `
<li class='rule'>
${App.FormFields.checkbox_tag("", false, "", {onclick: 'Lists.onRowChecked(this)'})}
<span class='name' onclick='App.dialogOf(this).onActionClicked(this)'>${App.escapeHtml(action.name)}</span>
<span class='payload'>${App.FormFields.hidden_tag("action[]", JSON.stringify(action))}</span>
</li>
`).join("")}
</ul>
</div>
</div>
</div>
</div>
<br/>
<section class="narrow">
${Object.keys(options).map((name) =>
`
<fieldset class='narrow'>
<label class="checkbox">
${App.FormFields.checkbox_tag(name, options[name][0])}
${options[name][1]}
</label>
</fieldset>
`).join("")}
</section>
<footer>
${filter_id ?
`
${App.FormFields.button_tag(__("Remove"), "", {class: "pull-left alt-danger", onclick: "App.dialogOf(this).removeFilter()"})}
${App.FormFields.button_tag(__("Test"), "", {class: "alt-info", onclick: "App.dialogOf(this).test()"})}
${App.FormFields.submit_tag(__("Save"), {onclick: "App.dialogOf(this).execute()"})}
${App.FormFields.cancel_dialog_tag(__("Cancel"))}
` : `
${App.FormFields.button_tag(__("Test"), "", {class: "alt-info", onclick: "App.dialogOf(this).test()"})}
${App.FormFields.submit_tag(__("Create"), {onclick: "App.dialogOf(this).execute()"})}
${App.FormFields.cancel_dialog_tag(__("Cancel"))}
`}
</footer>
</form>
`);
if (!App.isPrefs()) {
const selectedText = App.getSelectedText();
if (selectedText != "") {
const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
Feeds.getActive();
const rule = {reg_exp: selectedText, feed_id: [feed_id], filter_type: 1};
dialog.editRule(null, dojo.toJson(rule));
} else {
const query = {op: "article", method: "getmetadatabyid", id: Article.getActive()};
xhr.json("backend.php", query, (reply) => {
let title;
if (reply && reply.title) title = reply.title;
if (title || Feeds.getActive() || Feeds.activeIsCat()) {
console.log(title + " " + Feeds.getActive());
const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
Feeds.getActive();
const rule = {reg_exp: title, feed_id: [feed_id], filter_type: 1};
dialog.editRule(null, dojo.toJson(rule));
}
});
}
}
});
}); });
dialog.show(); dialog.show();
}, },
edit: function(id) { // if no id, new filter dialog
let query;
if (!App.isPrefs()) {
query = {
op: "pref-filters", method: "edit",
feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()
};
} else {
query = {op: "pref-filters", method: "edit", id: id};
}
console.log('Filters.edit', query);
xhr.post("backend.php", query, function (reply) {
try {
const dialog = new fox.SingleUseDialog({
id: "filterEditDlg",
title: id ? __("Edit Filter") : __("Create Filter"),
test: function () {
Filters.test(this.attr('value'));
},
selectRules: function (select) {
Lists.select("filterDlg_Matches", select);
},
selectActions: function (select) {
Lists.select("filterDlg_Actions", select);
},
editRule: function (e) {
const li = e.closest('li');
const rule = li.querySelector('input[name="rule[]"]').value
Filters.addFilterRule(li, rule);
},
editAction: function (e) {
const li = e.closest('li');
const action = li.querySelector('input[name="action[]"]').value
Filters.addFilterAction(li, action);
},
removeFilter: function () {
const msg = __("Remove filter?");
if (confirm(msg)) {
this.hide();
Notify.progress("Removing filter...");
const query = {op: "pref-filters", method: "remove", ids: this.attr('value').id};
xhr.post("backend.php", query, () => {
const tree = dijit.byId("filterTree");
if (tree) tree.reload();
});
}
},
addAction: function () {
Filters.addFilterAction();
},
addRule: function () {
Filters.addFilterRule();
},
deleteAction: function () {
App.findAll("#filterDlg_Actions li[class*=Selected]").forEach(function (e) {
e.parentNode.removeChild(e)
});
},
deleteRule: function () {
App.findAll("#filterDlg_Matches li[class*=Selected]").forEach(function (e) {
e.parentNode.removeChild(e)
});
},
execute: function () {
if (this.validate()) {
Notify.progress("Saving data...", true);
xhr.post("backend.php", this.attr('value'), () => {
dialog.hide();
const tree = dijit.byId("filterTree");
if (tree) tree.reload();
});
}
},
content: reply
});
if (!App.isPrefs()) {
/* global getSelectionText */
const selectedText = getSelectionText();
const lh = dojo.connect(dialog, "onShow", function () {
dojo.disconnect(lh);
if (selectedText != "") {
const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
Feeds.getActive();
const rule = {reg_exp: selectedText, feed_id: [feed_id], filter_type: 1};
Filters.addFilterRule(null, dojo.toJson(rule));
} else {
const query = {op: "article", method: "getmetadatabyid", id: Article.getActive()};
xhr.json("backend.php", query, (reply) => {
let title = false;
if (reply && reply.title) title = reply.title;
if (title || Feeds.getActive() || Feeds.activeIsCat()) {
console.log(title + " " + Feeds.getActive());
const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
Feeds.getActive();
const rule = {reg_exp: title, feed_id: [feed_id], filter_type: 1};
Filters.addFilterRule(null, dojo.toJson(rule));
}
});
}
});
}
dialog.show();
} catch (e) {
App.Error.report(e);
}
});
},
}; };

22
js/common.js
View File

@ -400,25 +400,3 @@ const Notify = {
} }
}; };
// http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac
/* exported getSelectionText */
function getSelectionText() {
let text = "";
if (typeof window.getSelection != "undefined") {
const sel = window.getSelection();
if (sel.rangeCount) {
const container = document.createElement("div");
for (let i = 0, len = sel.rangeCount; i < len; ++i) {
container.appendChild(sel.getRangeAt(i).cloneContents());
}
text = container.innerHTML;
}
} else if (typeof document.selection != "undefined") {
if (document.selection.type == "Text") {
text = document.selection.createRange().textText;
}
}
return text.stripTags();
}

1
plugins/auto_assign_labels/init.php
View File

@ -19,6 +19,7 @@ class Auto_Assign_Labels extends Plugin {
function get_all_labels_filter_format($owner_uid) { function get_all_labels_filter_format($owner_uid) {
$rv = array(); $rv = array();
// TODO: use Labels::get_all()
$sth = $this->pdo->prepare("SELECT id, fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = ?"); $sth = $this->pdo->prepare("SELECT id, fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = ?");
$sth->execute([$owner_uid]); $sth->execute([$owner_uid]);

20
themes/compact.css
View File

@ -822,16 +822,18 @@ body.ttrss_main #headlines-spacer a:hover {
} }
body.ttrss_main ul#filterDlg_Matches, body.ttrss_main ul#filterDlg_Matches,
body.ttrss_main ul#filterDlg_Actions { body.ttrss_main ul#filterDlg_Actions {
max-height: 100px;
overflow: auto;
list-style-type: none; list-style-type: none;
border-style: solid; margin: 0;
border-color: #ddd; padding: 0;
border-width: 1px 1px 1px 1px; /*max-height : 100px;
background-color: white; overflow : auto;
margin: 0px 0px 5px 0px; border-style : solid;
padding: 4px; border-color : @border-default;
min-height: 16px; border-width : 1px 1px 1px 1px;
background-color : @default-bg;
margin : 0px 0px 5px 0px;
padding : 4px;
min-height : 16px;*/
} }
body.ttrss_main ul#filterDlg_Matches li, body.ttrss_main ul#filterDlg_Matches li,
body.ttrss_main ul#filterDlg_Actions li { body.ttrss_main ul#filterDlg_Actions li {

20
themes/compact_night.css
View File

@ -822,16 +822,18 @@ body.ttrss_main #headlines-spacer a:hover {
} }
body.ttrss_main ul#filterDlg_Matches, body.ttrss_main ul#filterDlg_Matches,
body.ttrss_main ul#filterDlg_Actions { body.ttrss_main ul#filterDlg_Actions {
max-height: 100px;
overflow: auto;
list-style-type: none; list-style-type: none;
border-style: solid; margin: 0;
border-color: #222; padding: 0;
border-width: 1px 1px 1px 1px; /*max-height : 100px;
background-color: #333; overflow : auto;
margin: 0px 0px 5px 0px; border-style : solid;
padding: 4px; border-color : @border-default;
min-height: 16px; border-width : 1px 1px 1px 1px;
background-color : @default-bg;
margin : 0px 0px 5px 0px;
padding : 4px;
min-height : 16px;*/
} }
body.ttrss_main ul#filterDlg_Matches li, body.ttrss_main ul#filterDlg_Matches li,
body.ttrss_main ul#filterDlg_Actions li { body.ttrss_main ul#filterDlg_Actions li {

20
themes/light.css
View File

@ -822,16 +822,18 @@ body.ttrss_main #headlines-spacer a:hover {
} }
body.ttrss_main ul#filterDlg_Matches, body.ttrss_main ul#filterDlg_Matches,
body.ttrss_main ul#filterDlg_Actions { body.ttrss_main ul#filterDlg_Actions {
max-height: 100px;
overflow: auto;
list-style-type: none; list-style-type: none;
border-style: solid; margin: 0;
border-color: #ddd; padding: 0;
border-width: 1px 1px 1px 1px; /*max-height : 100px;
background-color: white; overflow : auto;
margin: 0px 0px 5px 0px; border-style : solid;
padding: 4px; border-color : @border-default;
min-height: 16px; border-width : 1px 1px 1px 1px;
background-color : @default-bg;
margin : 0px 0px 5px 0px;
padding : 4px;
min-height : 16px;*/
} }
body.ttrss_main ul#filterDlg_Matches li, body.ttrss_main ul#filterDlg_Matches li,
body.ttrss_main ul#filterDlg_Actions li { body.ttrss_main ul#filterDlg_Actions li {

8
themes/light/tt-rss.less
View File

@ -955,16 +955,18 @@ body.ttrss_main {
} }
ul#filterDlg_Matches, ul#filterDlg_Actions { ul#filterDlg_Matches, ul#filterDlg_Actions {
max-height : 100px;
overflow : auto;
list-style-type : none; list-style-type : none;
margin : 0;
padding: 0;
/*max-height : 100px;
overflow : auto;
border-style : solid; border-style : solid;
border-color : @border-default; border-color : @border-default;
border-width : 1px 1px 1px 1px; border-width : 1px 1px 1px 1px;
background-color : @default-bg; background-color : @default-bg;
margin : 0px 0px 5px 0px; margin : 0px 0px 5px 0px;
padding : 4px; padding : 4px;
min-height : 16px; min-height : 16px;*/
} }
ul#filterDlg_Matches li, ul#filterDlg_Actions li { ul#filterDlg_Matches li, ul#filterDlg_Actions li {

20
themes/night.css
View File

@ -823,16 +823,18 @@ body.ttrss_main #headlines-spacer a:hover {
} }
body.ttrss_main ul#filterDlg_Matches, body.ttrss_main ul#filterDlg_Matches,
body.ttrss_main ul#filterDlg_Actions { body.ttrss_main ul#filterDlg_Actions {
max-height: 100px;
overflow: auto;
list-style-type: none; list-style-type: none;
border-style: solid; margin: 0;
border-color: #222; padding: 0;
border-width: 1px 1px 1px 1px; /*max-height : 100px;
background-color: #333; overflow : auto;
margin: 0px 0px 5px 0px; border-style : solid;
padding: 4px; border-color : @border-default;
min-height: 16px; border-width : 1px 1px 1px 1px;
background-color : @default-bg;
margin : 0px 0px 5px 0px;
padding : 4px;
min-height : 16px;*/
} }
body.ttrss_main ul#filterDlg_Matches li, body.ttrss_main ul#filterDlg_Matches li,
body.ttrss_main ul#filterDlg_Actions li { body.ttrss_main ul#filterDlg_Actions li {

20
themes/night_blue.css
View File

@ -823,16 +823,18 @@ body.ttrss_main #headlines-spacer a:hover {
} }
body.ttrss_main ul#filterDlg_Matches, body.ttrss_main ul#filterDlg_Matches,
body.ttrss_main ul#filterDlg_Actions { body.ttrss_main ul#filterDlg_Actions {
max-height: 100px;
overflow: auto;
list-style-type: none; list-style-type: none;
border-style: solid; margin: 0;
border-color: #222; padding: 0;
border-width: 1px 1px 1px 1px; /*max-height : 100px;
background-color: #333; overflow : auto;
margin: 0px 0px 5px 0px; border-style : solid;
padding: 4px; border-color : @border-default;
min-height: 16px; border-width : 1px 1px 1px 1px;
background-color : @default-bg;
margin : 0px 0px 5px 0px;
padding : 4px;
min-height : 16px;*/
} }
body.ttrss_main ul#filterDlg_Matches li, body.ttrss_main ul#filterDlg_Matches li,
body.ttrss_main ul#filterDlg_Actions li { body.ttrss_main ul#filterDlg_Actions li {