ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contains due to glob

This commit is contained in:
Isaac Connor 2016-09-20 15:54:37 -04:00
parent bc0b499697
commit f40c8d0da8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/zmaudit.pl.in
View File

@ -206,11 +206,11 @@ MAIN: while( $loop ) {
Debug( "Checking day dir $day_dir" ); Debug( "Checking day dir $day_dir" );
( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint ( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint
if ( ! chdir( $day_dir ) ) { if ( ! chdir( $day_dir ) ) {
Error( "Can't chdir to '$$Storage{Path}/$monitor_dir/$day_dir': $!" ); Error( "Can't chdir to '$$Storage{Path}/$day_dir': $!" );
next; next;
} }
if ( ! opendir( DIR, '.' ) ) { if ( ! opendir( DIR, '.' ) ) {
Error( "Can't open directory $$Storage{Path}/$monitor_dir/'$day_dir': $!" ); Error( "Can't open directory '$$Storage{Path}/$day_dir': $!" );
next; next;
} }
my @event_links = sort { $b <=> $a } grep { -l $_ } readdir( DIR ); my @event_links = sort { $b <=> $a } grep { -l $_ } readdir( DIR );
@ -237,7 +237,7 @@ MAIN: while( $loop ) {
Debug( "Checking link $event_link points to $event_path " ); Debug( "Checking link $event_link points to $event_path " );
my $Event = $fs_events->{$event} = new ZoneMinder::Event(); my $Event = $fs_events->{$event} = new ZoneMinder::Event();
$$Event{Id} = $event; $$Event{Id} = $event;
$$Event{Path} = join('/', $Storage->Path(), $monitor_dir,$day_dir,$event_path); $$Event{Path} = join('/', $Storage->Path(), $day_dir,$event_path);
$Event->MonitorId( $monitor_dir ); $Event->MonitorId( $monitor_dir );
$Event->StorageId( $Storage->Id() ); $Event->StorageId( $Storage->Id() );
} # event path exists } # event path exists