ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'release-1.34'

pull/3019/head
Isaac Connor 2020-08-11 11:41:11 -04:00
parent 81296bbe31 6918461c3e
commit d42424d6d8
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_monitor.cpp
View File

@ -1634,7 +1634,7 @@ bool Monitor::Analyse() {
} // end if pre_event_images
if ( ( alarm_frame_count > 1 ) && Event::PreAlarmCount() ) {
Debug(1, "alarm frame count so SavePreAlarmFrames");
Debug(1, "alarm frame count so SavePreAlarmFrames");
event->SavePreAlarmFrames();
}
} // end if event

11
utils/do_debian_package.sh
View File

@ -227,12 +227,11 @@ IFS=',' ;for DISTRO in `echo "$DISTROS"`; do
# Generate Changlog
if [ "$DISTRO" == "focal" ] || [ "$DISTRO" == "buster" ]; then
cp -Rpd distros/ubuntu2004 debian
else
if [ "$DISTRO" == "wheezy" ]; then
cp -Rpd distros/debian debian
else
cp -Rpd distros/ubuntu1604 debian
fi;
elif [ "$DISTRO" == "beowulf" ]
then
cp -Rpd distros/beowulf debian
else
cp -Rpd distros/ubuntu1604 debian
fi;
if [ "$DEBEMAIL" != "" ] && [ "$DEBFULLNAME" != "" ]; then

2
web/includes/functions.php
View File

@ -40,7 +40,7 @@ function CSPHeaders($view, $nonce) {
if ( ! $Servers )
$Servers = ZM\Server::find();
$additionalScriptSrc = implode(' ', array_map(function($S){return $S->Url();}, $Servers));
$additionalScriptSrc = implode(' ', array_map(function($S){return $S->Hostname();}, $Servers));
switch ($view) {
case 'login': {
if (defined('ZM_OPT_USE_GOOG_RECAPTCHA')

2
web/skins/classic/views/zones.php
View File

@ -62,7 +62,7 @@ xhtmlHeaders(__FILE__, translate('Zones'));
<?php
foreach( array_reverse($zones) as $zone ) {
?>
<polygon points="<?php echo $zone['AreaCoords'] ?>" class="popup-link <?php echo $zone['Type']?>" onclick="streamCmdQuit(true); return false;"
<polygon points="<?php echo $zone['AreaCoords'] ?>" class="popup-link <?php echo $zone['Type']?>" data-on-click-true="streamCmdQuit"
data-url="?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>"
data-window-name="zmZone<?php echo $zone['Id'] ?>"
data-window-tag="zone"