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

Merge branch 'master' into zma_to_thread

This commit is contained in:
Isaac Connor 2021-01-11 17:08:44 -05:00
parent 8204d2d7eb a51dfe552b
commit c6cf1da47d
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/index.php
View File

@ -230,6 +230,7 @@ if (
( $request != 'control' ) &&
//( $view != 'frames' ) && // big html can overflow ob
( $view != 'archive' ) // returns data
&& ( (!isset($_SERVER['CONTENT_TYPE']) or ($_SERVER['CONTENT_TYPE'] != 'application/csp-report')) )
) {
require_once('includes/csrf/csrf-magic.php');
#ZM\Debug("Calling csrf_check with the following values: \$request = \"$request\", \$view = \"$view\", \$action = \"$action\"");

3
web/js/logger.js
View File

@ -54,7 +54,6 @@ function logReport( level, message, file, line ) {
/* eslint-disable no-caller */
if ( arguments && arguments.callee && arguments.callee.caller && arguments.callee.caller.caller && arguments.callee.caller.caller.name ) {
message += ' - '+arguments.callee.caller.caller.name+'()';
//console.log("arguments");
}
var data = {
@ -75,7 +74,7 @@ function logReport( level, message, file, line ) {
if ( line ) data.line = line;
$j.getJSON(thisUrl, data);
$j.post(thisUrl, data, null, 'json');
}
function Panic(message) {

10
web/skins/classic/views/js/watch.js
View File

@ -1,6 +1,5 @@
var streamCmdTimer = null;
var streamStatus;
var auth_hash;
var alarmState = STATE_IDLE;
var lastAlarmState = STATE_IDLE;
var backBtn = $j('#backBtn');
@ -119,8 +118,7 @@ function changeScale() {
streamImg.width(newWidth);
streamImg.height(newHeight);
streamImg.src = ''; // Some browsers need it to be cleared first
streamImg.src = newSrc;
streamImg.attr('src', newSrc);
} else {
console.error('No element found for liveStream'+monitorId);
}
@ -282,7 +280,7 @@ function getStreamCmdResponse(respObj, respText) {
if ( streamImg ) {
var oldSrc = streamImg.attr('src');
var newSrc = oldSrc.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
streamImg.src = newSrc;
streamImg.attr('src', newSrc);
}
table.bootstrapTable('refresh');
} // end if have a new auth hash
@ -300,8 +298,8 @@ function getStreamCmdResponse(respObj, respText) {
var oldSrc = streamImg.attr('src');
var newSrc = oldSrc.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
streamImg.src = newSrc;
console.log('Changing livestream src to ' + streamImg.src);
streamImg.attr('src', newSrc);
console.log('Changing livestream src to ' + newSrc);
} else {
console.log('Unable to find streamImg liveStream');
}