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

quotes, fix status ajax call using old auth_hash

pull/2872/head
Isaac Connor 2020-03-04 11:17:48 -05:00
parent d0e70fc501
commit a9e3d0691f
1 changed files with 89 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ function showEvents() {
if ( $('controlControl') ) { if ( $('controlControl') ) {
$('controlControl').removeClass('hidden'); $('controlControl').removeClass('hidden');
} }
showMode = "events"; showMode = 'events';
} }
function showPtzControls() { function showPtzControls() {
@ -20,14 +20,14 @@ function showPtzControls() {
if ( $('controlControl') ) { if ( $('controlControl') ) {
$('controlControl').addClass('hidden'); $('controlControl').addClass('hidden');
} }
showMode = "control"; showMode = 'control';
} }
function changeScale() { function changeScale() {
var scale = $('scale').get('value'); var scale = $('scale').get('value');
var newWidth; var newWidth;
var newHeight; var newHeight;
if (scale == "0") { if ( scale == '0' || scale == 'auto' ) {
var newSize = scaleToFit(monitorWidth, monitorHeight, $j('#liveStream'+monitorId), $j('#replayStatus')); var newSize = scaleToFit(monitorWidth, monitorHeight, $j('#liveStream'+monitorId), $j('#replayStatus'));
newWidth = newSize.width; newWidth = newSize.width;
newHeight = newSize.height; newHeight = newSize.height;
@ -90,8 +90,8 @@ function setAlarmState( currentAlarmState ) {
window.focus(); window.focus();
} }
} }
if ( oldAlarm ) { // done with an event do a refresh
if ( SOUND_ON_ALARM ) { if ( SOUND_ON_ALARM ) {
if ( oldAlarm ) {
// Disable alarm sound // Disable alarm sound
if ( !canPlayPauseAudio ) { if ( !canPlayPauseAudio ) {
$('alarmSound').addClass('hidden'); $('alarmSound').addClass('hidden');
@ -99,13 +99,11 @@ function setAlarmState( currentAlarmState ) {
$('MediaPlayer').Stop(); $('MediaPlayer').Stop();
} }
} }
}
if (oldAlarm) { // done with an event do a refresh
eventCmdQuery(); eventCmdQuery();
} }
lastAlarmState = alarmState; lastAlarmState = alarmState;
} } // end function setAlarmState( currentAlarmState )
if ( monitorType != 'WebSite' ) { if ( monitorType != 'WebSite' ) {
var streamCmdParms = 'view=request&request=stream&connkey='+connKey; var streamCmdParms = 'view=request&request=stream&connkey='+connKey;
@ -149,11 +147,11 @@ function getStreamCmdResponse(respObj, respText) {
$('levelValue').set('text', streamStatus.level); $('levelValue').set('text', streamStatus.level);
if ( streamStatus.level > 95 ) { if ( streamStatus.level > 95 ) {
$('levelValue').className = "alarm"; $('levelValue').className = 'alarm';
} else if ( streamStatus.level > 80 ) { } else if ( streamStatus.level > 80 ) {
$('levelValue').className = "alert"; $('levelValue').className = 'alert';
} else { } else {
$('levelValue').className = "ok"; $('levelValue').className = 'ok';
} }
var delayString = secsToTime(streamStatus.delay); var delayString = secsToTime(streamStatus.delay);
@ -188,7 +186,7 @@ function getStreamCmdResponse(respObj, respText) {
} }
} // rate } // rate
} else { } else {
$('modeValue').set( 'text', "Live" ); $('modeValue').set( 'text', 'Live' );
$('rate').addClass( 'hidden' ); $('rate').addClass( 'hidden' );
$('delay').addClass( 'hidden' ); $('delay').addClass( 'hidden' );
$('level').addClass( 'hidden' ); $('level').addClass( 'hidden' );
@ -224,7 +222,6 @@ function getStreamCmdResponse(respObj, respText) {
if ( streamStatus.auth ) { if ( streamStatus.auth ) {
auth_hash = streamStatus.auth; auth_hash = streamStatus.auth;
console.log("Have a new auth hash" + streamStatus.auth);
// Try to reload the image stream. // Try to reload the image stream.
var streamImg = $('liveStream'); var streamImg = $('liveStream');
if ( streamImg ) { if ( streamImg ) {
@ -237,7 +234,7 @@ function getStreamCmdResponse(respObj, respText) {
} // end if have a new auth hash } // end if have a new auth hash
} // end if respObj.status } // end if respObj.status
} else { } else {
checkStreamForErrors("getStreamCmdResponse", respObj);//log them checkStreamForErrors('getStreamCmdResponse', respObj);//log them
// Try to reload the image stream. // Try to reload the image stream.
// If it's an auth error, we should reload the whole page. // If it's an auth error, we should reload the whole page.
window.location.reload(); window.location.reload();
@ -245,9 +242,9 @@ function getStreamCmdResponse(respObj, respText) {
var streamImg = $('liveStream'+monitorId); var streamImg = $('liveStream'+monitorId);
if ( streamImg ) { if ( streamImg ) {
streamImg.src = streamImg.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) )); streamImg.src = streamImg.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
console.log("Changing livestream src to " + streamImg.src); console.log('Changing livestream src to ' + streamImg.src);
} else { } else {
console.log("Unable to find streamImg liveStream"); console.log('Unable to find streamImg liveStream');
} }
} }
} }
@ -389,12 +386,18 @@ if ( monitorType != 'WebSite' ) {
if ( auth_hash ) { if ( auth_hash ) {
statusCmdParms += '&auth='+auth_hash; statusCmdParms += '&auth='+auth_hash;
} }
var statusCmdReq = new Request.JSON( {url: monitorUrl, method: 'get', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse} ); var statusCmdReq = new Request.JSON( {
url: monitorUrl,
method: 'get',
timeout: AJAX_TIMEOUT,
link: 'cancel',
onSuccess: getStatusCmdResponse
} );
var statusCmdTimer = null; var statusCmdTimer = null;
} }
function getStatusCmdResponse(respObj, respText) { function getStatusCmdResponse(respObj, respText) {
watchdogOk("status"); watchdogOk('status');
if ( statusCmdTimer ) { if ( statusCmdTimer ) {
statusCmdTimer = clearTimeout(statusCmdTimer); statusCmdTimer = clearTimeout(statusCmdTimer);
} }
@ -403,7 +406,7 @@ function getStatusCmdResponse(respObj, respText) {
$('fpsValue').set('text', respObj.monitor.FrameRate); $('fpsValue').set('text', respObj.monitor.FrameRate);
setAlarmState(respObj.monitor.Status); setAlarmState(respObj.monitor.Status);
} else { } else {
checkStreamForErrors("getStatusCmdResponse", respObj); checkStreamForErrors('getStatusCmdResponse', respObj);
} }
var statusCmdTimeout = statusRefreshTimeout; var statusCmdTimeout = statusRefreshTimeout;
@ -414,11 +417,11 @@ function getStatusCmdResponse(respObj, respText) {
} }
function statusCmdQuery() { function statusCmdQuery() {
statusCmdReq.send(); statusCmdReq.send(statusCmdParms);
} }
if ( monitorType != 'WebSite' ) { if ( monitorType != 'WebSite' ) {
var alarmCmdParms = "view=request&request=alarm&id="+monitorId; var alarmCmdParms = 'view=request&request=alarm&id='+monitorId;
if ( auth_hash ) { if ( auth_hash ) {
alarmCmdParms += '&auth='+auth_hash; alarmCmdParms += '&auth='+auth_hash;
} }
@ -434,7 +437,7 @@ if ( monitorType != 'WebSite' ) {
} }
function getAlarmCmdResponse(respObj, respText) { function getAlarmCmdResponse(respObj, respText) {
checkStreamForErrors("getAlarmCmdResponse", respObj); checkStreamForErrors('getAlarmCmdResponse', respObj);
} }
function cmdDisableAlarms() { function cmdDisableAlarms() {
@ -471,7 +474,7 @@ function getActResponse( respObj, respText ) {
} }
function deleteEvent(event, eventId) { function deleteEvent(event, eventId) {
var actParms = "view=request&request=event&action=delete&id="+eventId; var actParms = 'view=request&request=event&action=delete&id='+eventId;
if ( auth_hash ) { if ( auth_hash ) {
actParms += '&auth='+auth_hash; actParms += '&auth='+auth_hash;
} }
@ -479,10 +482,9 @@ function deleteEvent( event, eventId ) {
url: thisUrl, url: thisUrl,
method: 'post', method: 'post',
timeout: 3000, timeout: 3000,
data: actParms,
onSuccess: getActResponse onSuccess: getActResponse
} ); } );
actReq.send(); actReq.send(actParms);
event.stop(); event.stop();
} }
@ -495,7 +497,6 @@ if ( monitorType != 'WebSite' ) {
url: monitorUrl, url: monitorUrl,
method: 'get', method: 'get',
timeout: AJAX_TIMEOUT, timeout: AJAX_TIMEOUT,
data: eventCmdParms,
link: 'cancel', link: 'cancel',
onSuccess: getEventCmdResponse, onSuccess: getEventCmdResponse,
onTimeout: eventCmdQuery onTimeout: eventCmdQuery
@ -509,7 +510,7 @@ function highlightRow( row ) {
} }
function getEventCmdResponse( respObj, respText ) { function getEventCmdResponse( respObj, respText ) {
watchdogOk("event"); watchdogOk('event');
if ( eventCmdTimer ) { if ( eventCmdTimer ) {
eventCmdTimer = clearTimeout(eventCmdTimer); eventCmdTimer = clearTimeout(eventCmdTimer);
} }
@ -609,7 +610,7 @@ function getEventCmdResponse( respObj, respText ) {
rows.length--; rows.length--;
} }
} else { } else {
checkStreamForErrors("getEventCmdResponse", respObj); checkStreamForErrors('getEventCmdResponse', respObj);
} }
var eventCmdTimeout = eventsRefreshTimeout; var eventCmdTimeout = eventsRefreshTimeout;
@ -624,15 +625,21 @@ function eventCmdQuery() {
if ( eventCmdTimer ) { // avoid firing another if we are firing one if ( eventCmdTimer ) { // avoid firing another if we are firing one
eventCmdTimer = clearTimeout(eventCmdTimer); eventCmdTimer = clearTimeout(eventCmdTimer);
} }
eventCmdReq.send(); eventCmdReq.send(eventCmdParms);
} }
if ( monitorType != 'WebSite' ) { if ( monitorType != 'WebSite' ) {
var controlParms = "view=request&request=control&id="+monitorId; var controlParms = 'view=request&request=control&id='+monitorId;
if ( auth_hash ) { if ( auth_hash ) {
controlParms += '&auth='+auth_hash; controlParms += '&auth='+auth_hash;
} }
var controlReq = new Request.JSON( {url: monitorUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getControlResponse} ); var controlReq = new Request.JSON( {
url: monitorUrl,
method: 'post',
timeout: AJAX_TIMEOUT,
link: 'cancel',
onSuccess: getControlResponse
} );
} }
function getControlResponse(respObj, respText) { function getControlResponse(respObj, respText) {
@ -675,18 +682,18 @@ function controlCmd( control, event, xtell, ytell ) {
} }
} }
controlReq.send(controlParms+"&control="+control+locParms); controlReq.send(controlParms+"&control="+control+locParms);
if ( streamMode == "single" ) { if ( streamMode == 'single' ) {
fetchImage.pass($('imageFeed').getElement('img')).delay(1000); fetchImage.pass($('imageFeed').getElement('img')).delay(1000);
} }
} }
function controlCmdImage( x, y ) { function controlCmdImage( x, y ) {
var imageControlParms = controlParms; var imageControlParms = controlParms;
imageControlParms += "&scale="+scale; imageControlParms += '&scale='+scale;
imageControlParms += "&control="+imageControlMode; imageControlParms += '&control='+imageControlMode;
controlReq.send( imageControlParms+"&x="+x+"&y="+y ); controlReq.send( imageControlParms+"&x="+x+"&y="+y );
if ( streamMode == "single" ) { if ( streamMode == 'single' ) {
fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 ); fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 );
} }
} }
@ -700,7 +707,7 @@ function handleClick( event ) {
var x = event.page.x - $(target).getLeft(); var x = event.page.x - $(target).getLeft();
var y = event.page.y - $(target).getTop(); var y = event.page.y - $(target).getTop();
if ( showMode == "events" || !imageControlMode ) { if ( showMode == 'events' || !imageControlMode ) {
if ( event.shift ) { if ( event.shift ) {
streamCmdPan( x, y ); streamCmdPan( x, y );
} else if ( event.event.ctrlKey ) { } else if ( event.event.ctrlKey ) {
@ -760,7 +767,7 @@ function reloadWebSite() {
function initPage() { function initPage() {
if ( monitorType != 'WebSite' ) { if ( monitorType != 'WebSite' ) {
if ( streamMode == "single" ) { if ( streamMode == 'single' ) {
statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
watchdogCheck.pass('status').periodical(statusRefreshTimeout*2); watchdogCheck.pass('status').periodical(statusRefreshTimeout*2);
} else { } else {
@ -771,12 +778,12 @@ function initPage() {
eventCmdTimer = eventCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); eventCmdTimer = eventCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
watchdogCheck.pass('event').periodical(eventsRefreshTimeout*2); watchdogCheck.pass('event').periodical(eventsRefreshTimeout*2);
if ( canStreamNative || streamMode == "single" ) { if ( canStreamNative || streamMode == 'single' ) {
var streamImg = $('imageFeed').getElement('img'); var streamImg = $('imageFeed').getElement('img');
if ( !streamImg ) { if ( !streamImg ) {
streamImg = $('imageFeed').getElement('object'); streamImg = $('imageFeed').getElement('object');
} }
if ( streamMode == "single" ) { if ( streamMode == 'single' ) {
streamImg.addEvent('click', fetchImage.pass(streamImg)); streamImg.addEvent('click', fetchImage.pass(streamImg));
fetchImage.pass(streamImg).periodical(imageRefreshTimeout); fetchImage.pass(streamImg).periodical(imageRefreshTimeout);
} else { } else {
@ -789,7 +796,7 @@ function initPage() {
if ( refreshApplet && appletRefreshTime ) { if ( refreshApplet && appletRefreshTime ) {
appletRefresh.delay(appletRefreshTime*1000); appletRefresh.delay(appletRefreshTime*1000);
} }
if ( scale == "auto" ) changeScale(); if ( scale == 'auto' ) changeScale();
if ( window.history.length == 1 ) { if ( window.history.length == 1 ) {
$j('#closeControl').html(''); $j('#closeControl').html('');
} }