VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-16 14:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Escape regexp characters in patterns unless specifically requested otherwise

Browse Source 
https://www.virtualmin.com/node/17692
This commit is contained in:
Jamie Cameron
2011-03-29 14:08:33 -07:00
parent 21627a308d
commit 3e2e011f7e
5 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
filter/edit.cgi
View File

@ -72,6 +72,22 @@ elsif ($filter->{'condvalue'} =~ /^(.*)\.\*$/ ||
$condvalue = $1;
$condmode = 0;
}
if ($condvalue =~ /^[a-zA-Z0-9_ ]*$/) {
# Contains no special chars, so not a regexp
$regexp = 0;
}
else {
# Has special chars .. but if they are all escaped, then not a regexp
$condre = $condvalue;
$condre =~ s/\\./x/g;
if ($condre =~ /^[a-zA-Z0-9_ ]*$/) {
$condvalue =~ s/\\(.)/$1/g;
$regexp = 0;
}
else {
$regexp = 1;
}
}
print &ui_table_row(
&ui_oneradio("cmode", 4, $text{'edit_cmode4'}, $cmode == 4),
&text('edit_cheader2',
@ -89,7 +105,8 @@ print &ui_table_row(
[ 1, $text{'edit_modecont'} ],
[ 2, $text{'edit_modeend'} ] ]),
&ui_textbox("condvalue", $condvalue, 40, 0, undef,
"onFocus='form.cmode[3].checked = true'")),
"onFocus='form.cmode[3].checked = true'")." ".
&ui_checkbox("condregexp", 1, $text{'edit_regexp'}, $regexp)),
undef, \@tds);
# Smaller