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

Triggers cannot be null, it is '' instead

This commit is contained in:
Isaac Connor 2020-03-08 17:23:48 -04:00
parent bb72e3000c
commit e56976c800
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/skins/classic/views/monitor.php
View File

@ -724,22 +724,19 @@ switch ( $tab ) {
$breakCount = (int)(ceil(count($optTriggers))); $breakCount = (int)(ceil(count($optTriggers)));
$breakCount = min(3, $breakCount); $breakCount = min(3, $breakCount);
$optCount = 0; $optCount = 0;
foreach( $optTriggers as $optTrigger ) { foreach ( $optTriggers as $optTrigger ) {
if ( !ZM_OPT_X10 && $optTrigger == 'X10' ) if ( $optTrigger == 'X10' and !ZM_OPT_X10 )
continue; continue;
if ( $optCount && ($optCount%$breakCount == 0) ) if ( $optCount && ($optCount%$breakCount == 0) )
echo '</br>'; echo '</br>';
?> echo '<input type="checkbox" name="newMonitor[Triggers][]" value="'. $optTrigger '"'.
<input type="checkbox" name="newMonitor[Triggers][]" value="<?php echo $optTrigger ?>"<?php if ( ( null !== $monitor->Triggers() ) && in_array( $optTrigger, $monitor->Triggers() ) ) { ?> checked="checked"<?php } ?>/>&nbsp;<?php echo $optTrigger ?> ( ( '' !== $monitor->Triggers()) && in_array($optTrigger, $monitor->Triggers()) ) ? ' checked="checked"':''). '/> '. $optTrigger;
<?php
$optCount ++; $optCount ++;
} } # end foreach trigger option
if ( !$optCount ) { if ( !$optCount ) {
?> echo '<em>'. translate('NoneAvailable') .'</em>';
<em><?php echo translate('NoneAvailable') ?></em> }
<?php ?>
}
?>
</td></tr> </td></tr>
<?php <?php
} }