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

fix Event Moving

This commit is contained in:
Isaac Connor 2017-12-05 10:21:43 -08:00
parent b1a887dbd8
commit 073b055b4c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/ZoneMinder/lib/ZoneMinder/Event.pm
View File

@ -414,19 +414,21 @@ sub MoveTo {
$$self{Storage} = $NewStorage;
my ( $NewPath ) = ( $self->Path(undef) =~ /^(.*)$/ ); # De-taint
my ( $NewPath ) = ( $NewStorage->Path(undef) =~ /^(.*)$/ ); # De-taint
if ( ! $$NewStorage{Id} ) {
return "New storage does not have an id. Moving will not happen.";
} elsif ( !$NewPath) {
} elsif ( !$NewPath ) {
return "$NewPath is empty.";
}elsif ( $NewPath eq $OldPath ) {
return "New path and old path are the same! $NewPath";
} elsif ( ! -e $NewPath ) {
return "New path $NewPath does not exist.";
}elsif ( ! -e $OldPath ) {
} elsif ( ! -e $OldPath ) {
return "Old path $OldPath does not exist.";
}
Debug("Moving event $$self{Id} from $OldPath to $NewPath");
( $NewPath ) = ( $self->Path(undef) =~ /^(.*)$/ ); # De-taint
if ( $NewPath eq $OldPath ) {
return "New path and old path are the same! $NewPath";
}
Debug("Moving event $$self{Id} from $OldPath to $NewPath");
my $error = '';
File::Path::make_path( $NewPath, {error => \my $err} );