mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-10 18:06:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-1.34'

Browse Source
This commit is contained in:
Isaac Connor
2020-04-04 16:58:53 -04:00
parent 571ff260cc 210d380029
commit d0fe1b60df
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/includes/functions.php
View File

@@ -39,7 +39,7 @@ function CSPHeaders($view, $nonce) {
global $Servers;
if ( ! $Servers )
$Servers = ZM\Server::find();
$additionalScriptSrc = implode(' ', array_map(function($S){return $S->Url();}, $Servers));
switch ($view) {
case 'login': {
@@ -47,7 +47,7 @@ function CSPHeaders($view, $nonce) {
&& defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY')
&& defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
&& ZM_OPT_USE_GOOG_RECAPTCHA && ZM_OPT_GOOG_RECAPTCHA_SITEKEY && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY) {
$additionalScriptSrc = ' https://www.google.com';
$additionalScriptSrc .= ' https://www.google.com';
}
// fall through
}
@@ -2194,7 +2194,6 @@ function ajaxError($message, $code=HTTP_STATUS_OK) {
if ( $code == HTTP_STATUS_OK ) {
$response = array('result'=>'Error', 'message'=>$message);
header('Content-type: application/json');
#header('Content-type: text/plain');
exit(jsonEncode($response));
}
header("HTTP/1.0 $code $message");
@@ -2211,7 +2210,6 @@ function ajaxResponse($result=false) {
$response['message'] = $result;
}
header('Content-type: application/json');
#header('Content-type: text/plain');
exit(jsonEncode($response));
}

8
web/skins/classic/views/montage.php
View File

@@ -173,19 +173,19 @@ if ( $showZones ) {
<span id="widthControl">
<label><?php echo translate('Width') ?></label>
<?php echo htmlSelect('width', $widths, $options['width'], 'changeSize(this);'); ?>
<?php echo htmlSelect('width', $widths, $options['width'], array('data-on-change-this'=>'changeSize')); ?>
</span>
<span id="heightControl">
<label><?php echo translate('Height') ?></label>
<?php echo htmlSelect('height', $heights, $options['height'], 'changeSize(this);'); ?>
<?php echo htmlSelect('height', $heights, $options['height'], array('data-on-change-this'=>'changeSize')); ?>
</span>
<span id="scaleControl">
<label><?php echo translate('Scale') ?></label>
<?php echo htmlSelect('scale', $scales, $scale, 'changeScale(this);'); ?>
<?php echo htmlSelect('scale', $scales, $scale, array('data-on-change-this'=>'changeScale')); ?>
</span>
<span id="layoutControl">
<label for="layout"><?php echo translate('Layout') ?></label>
<?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('onchange'=>'selectLayout(this);')); ?>
<?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('data-on-change-this'=>'selectLayout')); ?>
</span>
<input type="hidden" name="Positions"/>
<button type="button" id="EditLayout" data-on-click-this="edit_layout"><?php echo translate('EditLayout') ?></button>