diff options
author | Andrew Dolgov <[email protected]> | 2020-02-28 13:53:45 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2020-02-28 13:53:45 +0300 |
commit | f24ece85a6ea85ccff5fcdab2730d248892746fc (patch) | |
tree | b20a131f8168bc2fb95e1acd2f4d9d4c937701a9 /classes | |
parent | 2fefb4fd8741b38f28831f2da9e359ab4f7fa8a6 (diff) |
add validationtextarea control, use it for filter match editor
Diffstat (limited to 'classes')
-rwxr-xr-x | classes/pref/filters.php | 17 | ||||
-rwxr-xr-x | classes/rssutils.php | 1 |
2 files changed, 9 insertions, 9 deletions
diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 681f197cd..dba2568f2 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -964,19 +964,18 @@ class Pref_Filters extends Handler_Protected { print "<section>"; - print "<input dojoType=\"dijit.form.ValidationTextBox\" - required=\"true\" id=\"filterDlg_regExp\" - onchange='Filters.filterDlgCheckRegExp(this)' - onblur='Filters.filterDlgCheckRegExp(this)' - onfocus='Filters.filterDlgCheckRegExp(this)' - style=\"font-size : 16px; width : 500px\" - name=\"reg_exp\" value=\"$reg_exp\"/>"; + 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'><input id=\"filterDlg_inverse\" dojoType=\"dijit.form.CheckBox\" - name=\"inverse\" $inverse_checked/> ". + print "<label class='checkbox'><input id='filterDlg_inverse' dojoType='dijit.form.CheckBox' + name='inverse' $inverse_checked/> ". __("Inverse regular expression matching")."</label>"; print "</fieldset>"; diff --git a/classes/rssutils.php b/classes/rssutils.php index 831ac1baf..87e194603 100755 --- a/classes/rssutils.php +++ b/classes/rssutils.php @@ -1343,6 +1343,7 @@ class RSSUtils { foreach ($filter["rules"] as $rule) { $match = false; $reg_exp = str_replace('/', '\/', $rule["reg_exp"]); + $reg_exp = str_replace("\n", "", $reg_exp); // reg_exp may be formatted with CRs now because of textarea, we need to strip those $rule_inverse = $rule["inverse"]; if (!$reg_exp) |