diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/DevOptionsCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/NVR.js | 16 |
3 files changed, 15 insertions, 7 deletions
diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index bbd1bc9a..2ad40bfa 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -149,7 +149,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' $scope.useDefaultCustom = function() { if ($scope.loginData.zmNinjaCustomId=='') { - $scope.loginData.zmNinjaCustomId = 'zmNinja_'+NVR.getAppVersion(); + $scope.loginData.zmNinjaCustomId = 'zmNinja_%APPVER%'; } diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index ca6328ea..2f449896 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -976,7 +976,7 @@ angular.module('zmApp.controllers') 'selection': val }) } - $scope.tempZMGroups.unshift({'name':$translate.instant('kNone'), 'selection':false}); + $scope.tempZMGroups.unshift({'name':$translate.instant('kAll'), 'selection':false}); $rootScope.zmPopup = $ionicPopup.show({ @@ -1000,7 +1000,7 @@ angular.module('zmApp.controllers') var ld = NVR.getLogin(); var old_ZMGroupNames = ld.currentZMGroupNames; ld.currentZMGroupNames = []; - if (!$scope.tempZMGroups[0].selection) { // None is not selected + if (!$scope.tempZMGroups[0].selection) { // All is not selected for (var i=1; i <$scope.tempZMGroups.length; i++) { if ($scope.tempZMGroups[i].selection) ld.currentZMGroupNames.push($scope.tempZMGroups[i].name); diff --git a/www/js/NVR.js b/www/js/NVR.js index fc3a579e..5b1cbc56 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -251,9 +251,10 @@ angular.module('zmApp.controllers') debug("Cordova HTTP: configuring basic auth"); cordova.plugin.http.useBasicAuth(loginData.basicAuthUser, loginData.basicAuthPassword); } - debug ("Setting cordova header X-ZmNinja to "+loginData.zmNinjaCustomId); + var cid = loginData.zmNinjaCustomId.replace('%APPVER%',zmAppVersion); + debug ("Setting cordova header X-ZmNinja to "+cid); // setup custom header - cordova.plugin.http.setHeader('*', 'X-ZmNinja', loginData.zmNinjaCustomId); + cordova.plugin.http.setHeader('*', 'X-ZmNinja', cid); if (!loginData.enableStrictSSL) { @@ -1723,7 +1724,13 @@ angular.module('zmApp.controllers') } if ((typeof loginData.zmNinjaCustomId == 'undefined') || (loginData.zmNinjaCustomId == '')) { - loginData.zmNinjaCustomId = 'zmNinja_'+zmAppVersion; + loginData.zmNinjaCustomId = 'zmNinja_%APPVER%'; + } + + // Silly error to hardcode the version when I released + // 1.3.x. Let's fix it + if (loginData.zmNinjaCustomId.indexOf('zmNinja_1.3')!=-1) { + loginData.zmNinjaCustomId = 'zmNinja_%APPVER%'; } if (typeof loginData.obfuscationScheme == 'undefined') { @@ -1888,7 +1895,8 @@ angular.module('zmApp.controllers') insertSpecialTokens: function () { var tokens = ''; - tokens+='&id='+loginData.zmNinjaCustomId; + var cid = loginData.zmNinjaCustomId.replace('%APPVER%', zmAppVersion); + tokens+='&id='+cid; if (loginData.insertBasicAuthToken && $rootScope.basicAuthToken) { tokens += "&basicauth=" + $rootScope.basicAuthToken; } |