add auth_hash to ajax calls
parent
2660c8316a
commit
3b6cf74ed3
|
@ -52,3 +52,7 @@ echo 'false';
|
||||||
var focusWindow = <?php echo !empty($focusWindow)?'true':'false' ?>;
|
var focusWindow = <?php echo !empty($focusWindow)?'true':'false' ?>;
|
||||||
|
|
||||||
var imagePrefix = "<?php echo viewImagePath( "", '&' ) ?>";
|
var imagePrefix = "<?php echo viewImagePath( "", '&' ) ?>";
|
||||||
|
|
||||||
|
<?php if ( ZM_OPT_USE_AUTH && ZM_AUTH_HASH_LOGINS ) { ?>
|
||||||
|
var auth_hash = '<?php echo $_SESSION['AuthHash']; ?>';
|
||||||
|
<?php } ?>
|
||||||
|
|
|
@ -94,6 +94,9 @@ function setAlarmState( currentAlarmState ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var streamCmdParms = "view=request&request=stream&connkey="+connKey;
|
var streamCmdParms = "view=request&request=stream&connkey="+connKey;
|
||||||
|
if ( auth_hash )
|
||||||
|
streamCmdParms += '&auth='+auth_hash;
|
||||||
|
|
||||||
var streamCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStreamCmdResponse } );
|
var streamCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStreamCmdResponse } );
|
||||||
var streamCmdTimer = null;
|
var streamCmdTimer = null;
|
||||||
|
|
||||||
|
@ -325,6 +328,8 @@ function streamCmdQuery() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
|
var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
|
||||||
|
if ( auth_hash )
|
||||||
|
statusCmdParms += '&auth='+auth_hash;
|
||||||
var statusCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } );
|
var statusCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } );
|
||||||
var statusCmdTimer = null;
|
var statusCmdTimer = null;
|
||||||
|
|
||||||
|
@ -350,6 +355,8 @@ function statusCmdQuery() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var alarmCmdParms = "view=request&request=alarm&id="+monitorId;
|
var alarmCmdParms = "view=request&request=alarm&id="+monitorId;
|
||||||
|
if ( auth_hash )
|
||||||
|
alarmCmdParms += '&auth='+auth_hash;
|
||||||
var alarmCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getAlarmCmdResponse, onTimeout: streamCmdQuery } );
|
var alarmCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getAlarmCmdResponse, onTimeout: streamCmdQuery } );
|
||||||
var alarmCmdFirst = true;
|
var alarmCmdFirst = true;
|
||||||
|
|
||||||
|
@ -390,6 +397,8 @@ function deleteEvent( event, eventId ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var eventCmdParms = "view=request&request=status&entity=events&id="+monitorId+"&count="+maxDisplayEvents+"&sort=Id%20desc";
|
var eventCmdParms = "view=request&request=status&entity=events&id="+monitorId+"&count="+maxDisplayEvents+"&sort=Id%20desc";
|
||||||
|
if ( auth_hash )
|
||||||
|
eventCmdParms += '&auth='+auth_hash;
|
||||||
var eventCmdReq = new Request.JSON( { url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, data: eventCmdParms, link: 'cancel', onSuccess: getEventCmdResponse, onTimeout: eventCmdQuery } );
|
var eventCmdReq = new Request.JSON( { url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, data: eventCmdParms, link: 'cancel', onSuccess: getEventCmdResponse, onTimeout: eventCmdQuery } );
|
||||||
var eventCmdTimer = null;
|
var eventCmdTimer = null;
|
||||||
var eventCmdFirst = true;
|
var eventCmdFirst = true;
|
||||||
|
@ -496,6 +505,8 @@ function eventCmdQuery() {
|
||||||
}
|
}
|
||||||
|
|
||||||
var controlParms = "view=request&request=control&id="+monitorId;
|
var controlParms = "view=request&request=control&id="+monitorId;
|
||||||
|
if ( auth_hash )
|
||||||
|
controlParms += '&auth='+auth_hash;
|
||||||
var controlReq = new Request.JSON( { url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getControlResponse } );
|
var controlReq = new Request.JSON( { url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getControlResponse } );
|
||||||
|
|
||||||
function getControlResponse( respObj, respText ) {
|
function getControlResponse( respObj, respText ) {
|
||||||
|
|
Loading…
Reference in New Issue