diff options
Diffstat (limited to 'www/js/NVR.js')
| -rw-r--r-- | www/js/NVR.js | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js index 914b824a..01d82e41 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.4.1"; + var zmAppVersion = "1.4.3"; var isBackground = false; var justResumed = false; @@ -939,7 +939,7 @@ angular.module('zmApp.controllers') auth = success.data.match("user=(.*?)&"); if (auth && (auth[1] != null)) { log("NVR: Found simple stream auth mode (user=)"); - as = "&user=" + loginData.username + "&pass=" + loginData.password; + as = "&user=" + loginData.username + "&pass=" + encodeURIComponent(loginData.password); $rootScope.authSession = as; d.resolve(as); } else { @@ -2816,7 +2816,7 @@ angular.module('zmApp.controllers') log((forceReload == 1) ? "getMonitors:Force reloading all monitors" : "getMonitors:Loading all monitors"); var apiurl = loginData.apiurl; var myurl = apiurl + "/monitors"; - myurl += "/index/Type !=:WebSite.json?" + $rootScope.authSession; + myurl += "/index/"+encodeURIComponent("Type !=:WebSite.json") + "?"+$rootScope.authSession; getZmsMultiPortSupport() .then(function (zmsPort) { @@ -3472,17 +3472,17 @@ angular.module('zmApp.controllers') var myurl = apiurl + "/events/index"; if (monitorId != 0) - myurl = myurl + "/MonitorId:" + monitorId; + myurl = myurl + "/"+encodeURIComponent("MonitorId:") + monitorId; if (startTime) - myurl = myurl + "/StartTime <=:" + endTime; + myurl = myurl + "/"+encodeURIComponent("StartTime <=:") + endTime; if (endTime) - myurl = myurl + "/EndTime >=:" + startTime; + myurl = myurl + "/"+encodeURIComponent("EndTime >=:") + startTime; - myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + myurl = myurl + "/"+encodeURIComponent("AlarmFrames >=:") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); //https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json if (loginData.objectDetectionFilter && !noObjectFilter) { - myurl = myurl + '/Notes REGEXP:detected:'; + myurl = myurl +'/'+ encodeURIComponent('Notes REGEXP:detected:'); } @@ -3563,13 +3563,13 @@ angular.module('zmApp.controllers') var myurl = apiurl + "/events/index"; if (monitorId != 0) - myurl = myurl + "/MonitorId:" + monitorId; + myurl = myurl + "/"+encodeURIComponent("MonitorId:") + monitorId; if (startTime) - myurl = myurl + "/StartTime <=:" + endTime; + myurl = myurl + "/"+encodeURIComponent("StartTime <=:") + endTime; if (endTime) - myurl = myurl + "/EndTime >=:" + startTime; + myurl = myurl + "/"+encodeURIComponent("EndTime >=:") + startTime; - myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + myurl = myurl + "/"+encodeURIComponent("AlarmFrames >=:") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); //console.log ('********* MON FILTER '+monListFilter); if (monListFilter) @@ -3578,7 +3578,7 @@ angular.module('zmApp.controllers') // don't know why but adding page messes up Notes //https:///zm/api/events/index/Notes%20REGEXP: detected%3A.json if (loginData.objectDetectionFilter && !noObjectFilter) { - myurl = myurl + '/Notes REGEXP:detected:'; + myurl = myurl + '/'+encodeURIComponent('Notes REGEXP:detected:'); } |