From f286615882223adf7bc309c75a142286b5044cc1 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 30 Apr 2018 10:55:59 -0400
Subject: #618 add token for basic auth as "fyi" for all images

---
 www/js/MonitorModalCtrl.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'www/js/MonitorModalCtrl.js')

diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index b5bfdd92..ed81cd4e 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -225,6 +225,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
   //----------------------------------
   // toggles monitor cycling
   //----------------------------------
+
   $scope.toggleCycle = function () {
     //console.log ("HERE");
     $scope.isCycle = !$scope.isCycle;
@@ -1079,8 +1080,17 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     var canvas, context, imageDataUrl, imageData;
     var loginData = NVRDataModel.getLogin();
     var url = loginData.streamingurl +
-      '/zms?mode=single&monitor=' + mid +
-      $rootScope.authSession;
+      '/zms?mode=single&monitor=' + mid;
+
+      if ($rootScope.authSession !='undefined'){
+        url +=$rootScope.authSession;
+       
+     } 
+     if ($rootScope.basicAuthToken) {
+         url +="&basicauth="+$rootScope.basicAuthToken;
+       
+     } 
+
     NVRDataModel.log("SavetoPhone:Trying to save image from " + url);
 
     var img = new Image();
@@ -1143,6 +1153,8 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
                 
         //console.log ("STREAM="+stream);
 
+        if ($rootScope.basicAuthToken) stream +="&basicauth="+$rootScope.basicAuthToken;
+
         return stream;
 
 
-- 
cgit v1.2.3