diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-05-15 09:57:02 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-05-15 09:57:02 -0400 |
| commit | eb327c9b7cbca93c7fee43b3a25e47112ba7c595 (patch) | |
| tree | 62bfe43967d4e722f6751cd6bb5b5c7ef3e49245 /www/js/NVR.js | |
| parent | 151b26e60a18ccdc4231b2ce52abf864848eaa90 (diff) | |
add token support to PTZ and stream control #817
Diffstat (limited to 'www/js/NVR.js')
| -rw-r--r-- | www/js/NVR.js | 46 |
1 files changed, 2 insertions, 44 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js index 4f888c21..6c4736e4 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -2143,49 +2143,7 @@ angular.module('zmApp.controllers') ); }, - /*killStream: function (ck) { - debug ("Killing connKey: "+ck); - var myauthtoken = $rootScope.authSession.replace("&auth=", ""); - var req = $http( - { - method: 'POST', - - url: loginData.url + '/index.php', - headers: - { - 'Content-Type': 'application/x-www-form-urlencoded', - , - }, - transformRequest: function(obj) - { - var str = []; - for (var p in obj) - str.push(encodeURIComponent(p) + "=" + - encodeURIComponent(obj[p])); - var foo = str.join("&"); - //console.log("****RETURNING " + foo); - return foo; - }, - - data: - { - view: "request", - request: "stream", - connkey: ck, - command: 3, - auth: myauthtoken, - - } - }) - .then (function (succ) { - console.log ("STOP/KILL OK WITH: " + JSON.stringify(succ)); - }, - function (err) { - console.log ("KILL ERROR WITH: " + JSON.stringify(err)); - }); - - - },*/ + getMultiServersCached: function () { return multiservers; @@ -2626,7 +2584,7 @@ angular.module('zmApp.controllers') } catch (e) { debug("Login API approach did not work..."); - d.reject("API based login failed") + d.reject("API based login failed"); return d.promise; } |
