ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle term->val not being defined, and fix the code to strip quotes from the value.

pull/3750/head
Isaac Connor 2023-08-02 13:28:44 -04:00
parent f1b3bc08c1
commit 1628c4fa6b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
View File

@ -162,9 +162,6 @@ sub Sql {
next;
}
my $value = $term->{val};
my @value_list;
if ( $term->{attr} eq 'AlarmedZoneId' ) {
$term->{op} = 'EXISTS';
} elsif ( $term->{attr} =~ /^Monitor/ ) {
@ -192,7 +189,7 @@ sub Sql {
} elsif ( $term->{attr} eq 'Weekday' or $term->{attr} eq 'StartWeekday' ) {
$self->{Sql} .= 'weekday( E.StartDateTime )';
# EndTIme options
# EndTime options
} elsif ( $term->{attr} eq 'EndDateTime' ) {
$self->{Sql} .= 'E.EndDateTime';
} elsif ( $term->{attr} eq 'EndDate' ) {
@ -217,10 +214,15 @@ sub Sql {
$self->{Sql} .= 'E.'.$term->{attr};
}
my $value = defined($term->{val}) ? $term->{val} : '';
my @value_list;
if ( $term->{attr} eq 'ExistsInFileSystem' ) {
# PostCondition, so no further SQL
} else {
( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
my $stripped_value = $value;
$stripped_value =~ s/^["\']+?(.+)["\']+?$/$1/ if $stripped_value;
# Empty value will result in () from split
foreach my $temp_value ( $stripped_value ne '' ? split( /["'\s]*?,["'\s]*?/, $stripped_value ) : $stripped_value ) {
if ( $term->{attr} eq 'AlarmedZoneId' ) {