diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-12-17 13:21:08 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-12-17 13:21:08 -0500 |
| commit | 6615fdcab69470caf3dcdcf604d9c1c556db03fe (patch) | |
| tree | a3bf8e527e04b2ebab4462885202c2ed2431ad61 /www/js/NVR.js | |
| parent | 08b4d9e0872b3f11f2b73e3198f9caeb32804055 (diff) | |
#876 more logical naming
Diffstat (limited to 'www/js/NVR.js')
| -rw-r--r-- | www/js/NVR.js | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js index 37a6c816..4b7fe795 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -210,7 +210,7 @@ angular.module('zmApp.controllers') 'useAPICaching': true, 'pauseStreams': false, 'liveStreamBuffer': 100, - 'zmNinjaHeader':undefined, // filled in init. custom header + 'zmNinjaCustomId':undefined, // filled in init. custom header }; @@ -235,7 +235,7 @@ angular.module('zmApp.controllers') } // setup custom header - cordova.plugin.http.setHeader('*', 'X-ZmNinja', loginData.zmNinjaHeader); + cordova.plugin.http.setHeader('*', 'X-ZmNinja', loginData.zmNinjaCustomId); if (!loginData.enableStrictSSL) { @@ -1607,8 +1607,8 @@ angular.module('zmApp.controllers') loginData.liveStreamBuffer = 100; } - if ((typeof loginData.zmNinjaHeader == undefined) || (loginData.zmNinjaHeader == '')) { - loginData.zmNinjaHeader = 'zmNinja version:'+zmAppVersion; + if ((typeof loginData.zmNinjaCustomId == undefined) || (loginData.zmNinjaCustomId == '')) { + loginData.zmNinjaCustomId = 'zmNinja_'+zmAppVersion; } loginData.canSwipeMonitors = true; @@ -1680,10 +1680,14 @@ angular.module('zmApp.controllers') return { - insertBasicAuthToken: function () { - - return loginData.insertBasicAuthToken && $rootScope.basicAuthToken ? "&basicauth=" + $rootScope.basicAuthToken : ""; + insertSpecialTokens: function () { + var tokens = ''; + tokens+='&id='+loginData.zmNinjaCustomId; + if (loginData.insertBasicAuthToken && $rootScope.basicAuthToken) { + tokens += "&basicauth=" + $rootScope.basicAuthToken; + } + return tokens; }, setCurrentServerMultiPortSupported: function (val) { @@ -2298,7 +2302,7 @@ angular.module('zmApp.controllers') }, getCustomHeader: function () { - return loginData.zmNinjaHeader; + return loginData.zmNinjaCustomId; }, getAppVersion: function () { |