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

filter dialog: add tooltip re: filter syntax

This commit is contained in:
Andrew Dolgov 2018-03-21 13:38:36 +03:00
parent e35a46733f
commit e794e434da
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
classes/pref/filters.php
View File

@ -301,7 +301,7 @@ class Pref_Filters extends Handler_Protected {
$match_ok = false; $match_ok = false;
if ($filter_search) { if ($filter_search) {
$rules_sth = $this->pdo->prepare("SELECT reg_exp $rules_sth = $this->pdo->prepare("SELECT reg_exp
FROM ttrss_filters2_rules WHERE filter_id = ?"); FROM ttrss_filters2_rules WHERE filter_id = ?");
$rules_sth->execute([$line['id']]); $rules_sth->execute([$line['id']]);
@ -356,7 +356,7 @@ class Pref_Filters extends Handler_Protected {
$filter_id = clean($_REQUEST["id"]); $filter_id = clean($_REQUEST["id"]);
$sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2 $sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2
WHERE id = ? AND owner_uid = ?"); WHERE id = ? AND owner_uid = ?");
$sth->execute([$filter_id, $_SESSION['uid']]); $sth->execute([$filter_id, $_SESSION['uid']]);
@ -529,7 +529,7 @@ class Pref_Filters extends Handler_Protected {
print "</div>"; print "</div>";
print "</form>"; print "</form>";
} }
} }
@ -646,7 +646,7 @@ class Pref_Filters extends Handler_Protected {
$ids = explode(",", clean($_REQUEST["ids"])); $ids = explode(",", clean($_REQUEST["ids"]));
$ids_qmarks = arr_qmarks($ids); $ids_qmarks = arr_qmarks($ids);
$sth = $this->pdo->prepare("DELETE FROM ttrss_filters2 WHERE id IN ($ids_qmarks) $sth = $this->pdo->prepare("DELETE FROM ttrss_filters2 WHERE id IN ($ids_qmarks)
AND owner_uid = ?"); AND owner_uid = ?");
$sth->execute(array_merge($ids, [$_SESSION['uid']])); $sth->execute(array_merge($ids, [$_SESSION['uid']]));
} }
@ -662,7 +662,7 @@ class Pref_Filters extends Handler_Protected {
if (!is_array(clean($_REQUEST["rule"]))) $_REQUEST["rule"] = []; if (!is_array(clean($_REQUEST["rule"]))) $_REQUEST["rule"] = [];
if (!is_array(clean($_REQUEST["action"]))) $_REQUEST["action"] = []; if (!is_array(clean($_REQUEST["action"]))) $_REQUEST["action"] = [];
if ($filter_id) { if ($filter_id) {
/* create rules */ /* create rules */
@ -980,9 +980,14 @@ class Pref_Filters extends Handler_Protected {
print "<input dojoType=\"dijit.form.ValidationTextBox\" print "<input dojoType=\"dijit.form.ValidationTextBox\"
required=\"true\" id=\"filterDlg_regExp\" required=\"true\" id=\"filterDlg_regExp\"
placeholder=\"match|keywords\"
style=\"font-size : 16px; width : 20em;\" style=\"font-size : 16px; width : 20em;\"
name=\"reg_exp\" value=\"$reg_exp\"/>"; name=\"reg_exp\" value=\"$reg_exp\"/>";
print "<div dojoType=\"dijit.Tooltip\" connectId=\"filterDlg_regExp\" position=\"below\">
".__("Regular expression, without outer delimiters (i.e. slashes)")."
</div>";
print "<hr/>"; print "<hr/>";
print "<input id=\"filterDlg_inverse\" dojoType=\"dijit.form.CheckBox\" print "<input id=\"filterDlg_inverse\" dojoType=\"dijit.form.CheckBox\"
name=\"inverse\" $inverse_checked/>"; name=\"inverse\" $inverse_checked/>";
@ -1136,7 +1141,7 @@ class Pref_Filters extends Handler_Protected {
$title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", (int) $num_rules), $title, $num_rules); $title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", (int) $num_rules), $title, $num_rules);
$sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2_actions $sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2_actions
WHERE filter_id = ? ORDER BY id LIMIT 1"); WHERE filter_id = ? ORDER BY id LIMIT 1");
$sth->execute([$id]); $sth->execute([$id]);