#822 more missed tokens

ZoneMinder · Jun 6, 2019 · 8c059e6 · 8c059e6
1 parent c351857
commit 8c059e6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 30 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.060" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.061" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version":"1.3.060",
+  "version":"1.3.061",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
@@ -724,13 +724,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
       url = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand +
         "&eid=" + $scope.eventId +
-        "&fid=" + $scope.slides[$scope.mycarousel.index - 1].id;
+        "&fid=" + $scope.slides[$scope.mycarousel.index - 1].id + $rootScope.authSession;
 
 
-    if ($rootScope.authSession != 'undefined') {
-      url += $rootScope.authSession;
-
-    }
+
     if ($rootScope.basicAuthToken) {
       url += "&basicauth=" + $rootScope.basicAuthToken;
 
@@ -757,12 +754,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             if ($scope.slideIndex > 0) $scope.slideIndex--;
 
 
-              $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id;
+              $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id+ $rootScope.authSession;
 
-            if ($rootScope.authSession != 'undefined') {
-              $scope.selectEventUrl += $rootScope.authSession;
-
-            }
+
             if ($rootScope.basicAuthToken) {
               $scope.selectEventUrl += "&basicauth=" + $rootScope.basicAuthToken;
 
@@ -783,12 +777,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             if ($scope.slideIndex < $scope.slideLastIndex) $scope.slideIndex++;
 
 
-              $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id;
+              $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id+ $rootScope.authSession;
 
-            if ($rootScope.authSession != 'undefined') {
-              $scope.selectEventUrl += $rootScope.authSession;
-
-            }
+
             if ($rootScope.basicAuthToken) {
               $scope.selectEventUrl += "&basicauth=" + $rootScope.basicAuthToken;
 
@@ -810,12 +801,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             $scope.slideIndex = tempVar;
 
 
-              $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id;
-
-            if ($rootScope.authSession != 'undefined') {
-              $scope.selectEventUrl += $rootScope.authSession;
-
-            }
+              $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id+ $rootScope.authSession;
+
             if ($rootScope.basicAuthToken) {
               $scope.selectEventUrl += "&basicauth=" + $rootScope.basicAuthToken;
 
@@ -837,12 +824,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
             if ($scope.slideIndex < $scope.slideLastIndex) $scope.slideIndex++;
 
 
-              $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id;
+              $scope.selectEventUrl = $scope.playbackURL + '/index.php?view=image&rand=' + $rootScope.rand + "&eid=" + $scope.eventId + "&fid=" + $scope.slides[$scope.slideIndex].id+ $rootScope.authSession;
 
-            if ($rootScope.authSession != 'undefined') {
-              $scope.selectEventUrl += $rootScope.authSession;
-
-            }
+
             if ($rootScope.basicAuthToken) {
               $scope.selectEventUrl += "&basicauth=" + $rootScope.basicAuthToken;
 

diff --git a/www/js/NVR.js b/www/js/NVR.js
@@ -20,7 +20,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.3.060";
+      var zmAppVersion = "1.3.061";
       var isBackground = false;
       var justResumed = false;
       var timeSinceResumed = -1;

diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js
@@ -122,7 +122,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
     var img;
     //console.log("Image Mode " + imode);
 
-      img = "<img width='100%' ng-src='" + p + "/index.php?view=image&fid=" + id + "'>";
+      img = "<img width='100%' ng-src='" + p + "/index.php?view=image&fid=" + id + $rootScope.authSession + "'>";
       // console.log ("IS MULTISERVER SO IMAGE IS " + img);
 
     $rootScope.zmPopup = $ionicPopup.alert({