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

fix to montage which wasn't adding the auth_hash. Still need to add plain auth

This commit is contained in:
Isaac Connor 2017-10-19 17:56:50 -04:00
parent cd476192e9
commit 422b3d0c33
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/skins/classic/views/js/montage.js
View File

@ -10,6 +10,8 @@ function Monitor( monitorData ) {
this.streamCmdParms = "view=request&request=stream&connkey="+this.connKey; this.streamCmdParms = "view=request&request=stream&connkey="+this.connKey;
if ( auth_hash ) if ( auth_hash )
this.streamCmdParms += '&auth='+auth_hash; this.streamCmdParms += '&auth='+auth_hash;
else
console.log("No auth_hash");
this.streamCmdTimer = null; this.streamCmdTimer = null;
this.start = function( delay ) { this.start = function( delay ) {
@ -32,7 +34,7 @@ function Monitor( monitorData ) {
if ( this.streamCmdTimer ) if ( this.streamCmdTimer )
this.streamCmdTimer = clearTimeout( this.streamCmdTimer ); this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
var stream = $j('#liveStream'+this.id ); var stream = $j('#liveStream'+this.id )[0];
if ( respObj.result == 'Ok' ) { if ( respObj.result == 'Ok' ) {
this.status = respObj.status; this.status = respObj.status;
this.alarmState = this.status.state; this.alarmState = this.status.state;
@ -77,10 +79,12 @@ function Monitor( monitorData ) {
} }
} }
if ( this.status.auth ) { if ( this.status.auth ) {
// Try to reload the image stream. if ( this.status.auth != auth_hash ) {
if ( stream ) // Try to reload the image stream.
stream.src = stream.src.replace( /auth=\w+/i, 'auth='+this.status.auth ); if ( stream )
console.log("Changed auth to " + this.status.auth ); stream.src = stream.src.replace( /auth=\w+/i, 'auth='+this.status.auth );
console.log("Changed auth to " + this.status.auth );
}
} // end if haev a new auth hash } // end if haev a new auth hash
} else { } else {
console.error( respObj.message ); console.error( respObj.message );