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

Merge branch 'release-1.34'

This commit is contained in:
Isaac Connor 2020-09-25 11:01:25 -04:00
parent bcb430d393 3db8490d9c
commit c14e141295
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/zm_update-1.31.13.sql
View File

@ -13,6 +13,8 @@ SET @s = (SELECT IF(
PREPARE stmt FROM @s; PREPARE stmt FROM @s;
EXECUTE stmt; EXECUTE stmt;
UPDATE `Events` SET `SaveJPEGs`=(SELECT `SaveJPEGs` FROM `Monitors` WHERE Monitors.Id = MonitorId) WHERE `SaveJPEGs` IS NULL;
SET @s = (SELECT IF( SET @s = (SELECT IF(
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE() (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
AND table_name = 'Storage' AND table_name = 'Storage'

10
scripts/ZoneMinder/lib/ZoneMinder/Database.pm
View File

@ -146,15 +146,15 @@ sub zmDbGetMonitors {
if ( $function ) { if ( $function ) {
if ( $function == DB_MON_CAPT ) { if ( $function == DB_MON_CAPT ) {
$sql .= " where `Function` >= 'Monitor'"; $sql .= " WHERE `Function` >= 'Monitor'";
} elsif ( $function == DB_MON_ACTIVE ) { } elsif ( $function == DB_MON_ACTIVE ) {
$sql .= " where `Function` > 'Monitor'"; $sql .= " WHERE `Function` > 'Monitor'";
} elsif ( $function == DB_MON_MOTION ) { } elsif ( $function == DB_MON_MOTION ) {
$sql .= " where `Function` = 'Modect' or Function = 'Mocord'"; $sql .= " WHERE `Function` = 'Modect' OR `Function` = 'Mocord'";
} elsif ( $function == DB_MON_RECORD ) { } elsif ( $function == DB_MON_RECORD ) {
$sql .= " where `Function` = 'Record' or Function = 'Mocord'"; $sql .= " WHERE `Function` = 'Record' OR `Function` = 'Mocord'";
} elsif ( $function == DB_MON_PASSIVE ) { } elsif ( $function == DB_MON_PASSIVE ) {
$sql .= " where `Function` = 'Nodect'"; $sql .= " WHERE `Function` = 'Nodect'";
} }
} }
my $sth = $dbh->prepare_cached( $sql ); my $sth = $dbh->prepare_cached( $sql );