Commit f4d7db71 authored by jake%acutex.net's avatar jake%acutex.net

Fix for bug 57821 - Empty regular expression causes a software error.

Patch by Nick Hibma <n_hibma@qubesoft.com> r= jake@acutex.net
parent 0d14b47f
...@@ -292,20 +292,25 @@ List users with login name matching: ...@@ -292,20 +292,25 @@ List users with login name matching:
if ($action eq 'list') { if ($action eq 'list') {
PutHeader("Select user"); PutHeader("Select user");
my $query = ""; my $query = "";
my $matchstr = $::FORM{'matchstr'};
if (exists $::FORM{'matchtype'}) { if (exists $::FORM{'matchtype'}) {
$query = "SELECT login_name,realname,disabledtext " . $query = "SELECT login_name,realname,disabledtext " .
"FROM profiles WHERE login_name "; "FROM profiles WHERE login_name ";
if ($::FORM{'matchtype'} eq 'substr') { if ($::FORM{'matchtype'} eq 'substr') {
$query .= "like"; $query .= "like";
$::FORM{'matchstr'} = '%' . $::FORM{'matchstr'} . '%'; $matchstr = '%' . $matchstr . '%';
} elsif ($::FORM{'matchtype'} eq 'regexp') { } elsif ($::FORM{'matchtype'} eq 'regexp') {
$query .= "regexp"; $query .= "regexp";
$matchstr = '.'
unless $matchstr;
} elsif ($::FORM{'matchtype'} eq 'notregexp') { } elsif ($::FORM{'matchtype'} eq 'notregexp') {
$query .= "not regexp"; $query .= "not regexp";
$matchstr = '.'
unless $matchstr;
} else { } else {
die "Unknown match type"; die "Unknown match type";
} }
$query .= SqlQuote($::FORM{'matchstr'}) . " ORDER BY login_name"; $query .= SqlQuote($matchstr) . " ORDER BY login_name";
} elsif (exists $::FORM{'query'}) { } elsif (exists $::FORM{'query'}) {
$query = "SELECT login_name,realname,disabledtext " . $query = "SELECT login_name,realname,disabledtext " .
"FROM profiles WHERE " . $::FORM{'query'} . " ORDER BY login_name"; "FROM profiles WHERE " . $::FORM{'query'} . " ORDER BY login_name";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment