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

Add some parenthesis and use logic and/or install of binary

This commit is contained in:
Isaac Connor 2021-04-07 14:15:51 -04:00
parent a63186444b
commit 30dfadcbf1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/zmtrigger.pl.in
View File

@ -226,10 +226,10 @@ while (!$zm_terminate) {
#print( "$monitor->{Id}: S:$state, LE:$last_event" ); #print( "$monitor->{Id}: S:$state, LE:$last_event" );
#print( "$monitor->{Id}: mS:$monitor->{LastState}, mLE:$monitor->{LastEvent}" ); #print( "$monitor->{Id}: mS:$monitor->{LastState}, mLE:$monitor->{LastEvent}" );
if ( $state == STATE_ALARM || $state == STATE_ALERT ) { if ( $state == STATE_ALARM or $state == STATE_ALERT ) {
# In alarm state # In alarm state
if ( !defined($monitor->{LastEvent}) if ( !defined($monitor->{LastEvent})
|| ($last_event != $monitor->{LastEvent}) or ($last_event != $monitor->{LastEvent})
) { ) {
# A new event # A new event
push @out_messages, $monitor->{Id}.'|on|'.time().'|'.$last_event; push @out_messages, $monitor->{Id}.'|on|'.time().'|'.$last_event;
@ -238,9 +238,9 @@ while (!$zm_terminate) {
# Do nothing # Do nothing
} }
} elsif ( } elsif (
($state == STATE_IDLE && $monitor->{LastState} != STATE_IDLE) (($state == STATE_IDLE) and ($monitor->{LastState} != STATE_IDLE))
|| or
($state == STATE_TAPE && $monitor->{LastState} != STATE_TAPE) (($state == STATE_TAPE) and ($monitor->{LastState} != STATE_TAPE))
) { ) {
# Out of alarm state # Out of alarm state
push @out_messages, $monitor->{Id}.'|off|'.time().'|'.$last_event; push @out_messages, $monitor->{Id}.'|off|'.time().'|'.$last_event;