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

Merge branch 'master' of github.com:ZoneMinder/zoneminder

This commit is contained in:
Isaac Connor 2019-08-14 16:18:31 -04:00
parent c7b6db9be7 e390195ebb
commit 81dadc17dc
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,8 +562,8 @@ sub CopyTo {
return 'Old Storage path changed, Event has moved somewhere else.'; return 'Old Storage path changed, Event has moved somewhere else.';
} }
$$self{Storage} = $NewStorage; $NewPath .= $self->Relative_Path();
( $NewPath ) = ( $self->Path(undef) =~ /^(.*)$/ ); # De-taint $NewPath = ( $NewPath =~ /^(.*)$/ ); # De-taint
if ( $NewPath eq $OldPath ) { if ( $NewPath eq $OldPath ) {
$ZoneMinder::Database::dbh->commit(); $ZoneMinder::Database::dbh->commit();
return "New path and old path are the same! $NewPath"; return "New path and old path are the same! $NewPath";
@ -685,7 +685,7 @@ sub MoveTo {
# Succeeded in copying all files, so we may now update the Event. # Succeeded in copying all files, so we may now update the Event.
$$self{StorageId} = $$NewStorage{Id}; $$self{StorageId} = $$NewStorage{Id};
$$self{Storage} = $NewStorage; $self->Storage($NewStorage);
$error .= $self->save(); $error .= $self->save();
if ( $error ) { if ( $error ) {
$ZoneMinder::Database::dbh->commit(); $ZoneMinder::Database::dbh->commit();

5
web/ajax/stream.php
View File

@ -60,7 +60,8 @@ if ( sem_acquire($semaphore,1) !== false ) {
// Pi can take up to 3 seconds for zms to start up. // Pi can take up to 3 seconds for zms to start up.
$max_socket_tries = 1000; $max_socket_tries = 1000;
// FIXME This should not exceed web_ajax_timeout // FIXME This should not exceed web_ajax_timeout
while ( !file_exists($remSockFile) && $max_socket_tries-- ) { //sometimes we are too fast for our own good, if it hasn't been setup yet give it a second. while ( !file_exists($remSockFile) && $max_socket_tries-- ) {
//sometimes we are too fast for our own good, if it hasn't been setup yet give it a second.
// WHY? We will just send another one... // WHY? We will just send another one...
// ANSWER: Because otherwise we get a log of errors logged // ANSWER: Because otherwise we get a log of errors logged
@ -157,7 +158,7 @@ if ( sem_acquire($semaphore,1) !== false ) {
} }
sem_release($semaphore); sem_release($semaphore);
} else { } else {
ZM\Logger::Debug("Couldn't get semaphore"); ZM\Logger::Debug('Couldn\'t get semaphore');
ajaxResponse(array()); ajaxResponse(array());
} }