mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-29 11:12:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Isaac Connor
2023-03-21 09:54:40 -04:00
parent 128b3d884a a45fc576c9
commit e60586feee
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
View File

@@ -47,11 +47,12 @@ use ZoneMinder::Database qw(:all);
use POSIX;
use vars qw/ $table $primary_key %fields $debug/;
$debug = 0;
use vars qw/ $serial $primark_key $table $primary_key %fields $debug/;
$serial = $primary_key = 'Id';
$debug = 1;
$table = 'Storage';
$primary_key = 'Id';
%fields = map { $_ => $_ } qw( Id Name Path DoDelete ServerId Type Url DiskSpace Scheme );
%fields = map { $_ => $_ } qw( Id Name Path DoDelete ServerId Type Url DiskSpace Scheme Enabled);
sub Path {
if ( @_ > 1 ) {

2
web/includes/Filter.php
View File

@@ -1034,7 +1034,7 @@ class Filter extends ZM_Object {
}
$html .= '<span>'. $term['op'].'</span>'.PHP_EOL;
#$html .= '<span>'.htmlSelect("filter[Query][terms][$i][op]", $opTypes, $term['op']).'</span>'.PHP_EOL;
$html .= '<span>'.htmlSelect("filter[Query][terms][$i][val]", $monitors, $term['val']).'</span>'.PHP_EOL;
$html .= '<span>'.htmlSelect("filter[Query][terms][$i][val]", $monitors, split(',',$term['val'])).'</span>'.PHP_EOL;
} else if ( $term['attr'] == 'MonitorName' ) {
$monitor_names = ['' => translate('All')];
foreach (Monitor::find() as $m) {

4
web/skins/classic/views/event.php
View File

@@ -112,7 +112,7 @@ if ((!$replayMode) or !$replayModes[$replayMode]) {
$replayMode = 'none';
}
$video_tag = ($Event->DefaultVideo() and ($codec == 'MP4' or $codec == 'auto'));
$video_tag = ((false !== strpos($Event->DefaultVideo(), 'h264')) and ($codec == 'MP4' or $codec == 'auto'));
// videojs zoomrotate only when direct recording
$Zoom = 1;
@@ -145,8 +145,8 @@ $filterQuery = $filter->querystring();
$connkey = generateConnKey();
xhtmlHeaders(__FILE__, translate('Event').' '.$Event->Id());
getBodyTopHTML();
?>
<body>
<div id="page">
<?php echo getNavBarHTML() ?>
<?php

6
web/skins/classic/views/js/cycle.js
View File

@@ -7,7 +7,7 @@ const playBtn = $j('#playBtn');
var monitor;
function nextCycleView() {
window.location.replace('?view=cycle&mid='+nextMid+'&mode='+mode, cycleRefreshTimeout);
window.location.replace('?view=cycle&mid='+nextMid+'&mode='+mode+'&'+auth_relay, cycleRefreshTimeout);
}
function cyclePause() {
@@ -31,7 +31,7 @@ function cycleNext() {
console.log('No monitorData for ' + monIdx);
}
window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode, cycleRefreshTimeout);
window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode+'&'+auth_relay, cycleRefreshTimeout);
}
function cyclePrev() {
@@ -43,7 +43,7 @@ function cyclePrev() {
console.log('No monitorData for ' + monIdx);
}
window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode, cycleRefreshTimeout);
window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode+'&'+auth_relay, cycleRefreshTimeout);
}
function initCycle() {