Merge remote-tracking branch 'upstream/master' into ai_server

Author: connortechnology

web/includes/Monitor.php

@@ -549,10 +549,7 @@ public function Monitor_Status() {
   }
 
   public function getStreamSrc($args, $querySep='&') {
-    $streamSrc = $this->Server()->UrlToZMS(
-      ZM_MIN_STREAMING_PORT ?
-      ZM_MIN_STREAMING_PORT+(int)($this->{'Id'}/5) :
-      null);
+    $streamSrc = $this->Server()->UrlToZMS(ZM_MIN_STREAMING_PORT ? ZM_MIN_STREAMING_PORT+(int)($this->{'Id'}/5) : null);
 
     $args['monitor'] = $this->{'Id'};
 

web/js/MonitorStream.js

@@ -1154,7 +1154,8 @@ function MonitorStream(monitorData) {
       // Try to reload the image stream.
       if (stream.src) {
         console.log('Reloading stream: ' + stream.src);
-        let src = (-1 != stream.src.indexOf('rand=')) ? stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) )) : '&rand='+Math.floor((Math.random() * 1000000));
+        // Instead of changing rand, perhaps we should be changing connKey.
+        let src = (-1 != stream.src.indexOf('rand=')) ? stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) )) : stream.src+'&rand='+Math.floor((Math.random() * 1000000));
         src = src.replace(/auth=\w+/i, 'auth='+auth_hash);
         // Maybe updated auth
         if (src != stream.src) {