#933 remove spaces, removed encodeURIComponent, add back encodeURI in cordova http

10 files changed, 41 insertions, 39 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index be276131..30c94874 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1875,10 +1875,10 @@ angular.module('zmApp.controllers')
       //https://server/zm/api/events/consoleEvents/5%20minute.json
       var ld = NVR.getLogin();
 
-      var af = "/"+encodeURIComponent("AlarmFrames >=:") + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
+      var af = "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
 
       if (ld.objectDetectionFilter) {
-        af = af + '/'+encodeURIComponent('Notes REGEXP:detected:');
+        af = af + '/'+'Notes REGEXP:detected:';
       }
 
      
diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js
index e22bd0c1..9e834f67 100644
--- a/www/js/EventDateTimeFilterCtrl.js
+++ b/www/js/EventDateTimeFilterCtrl.js
@@ -154,11 +154,11 @@ angular.module('zmApp.controllers')
         for (var i=0; i < $scope.monitors.length; i++) {
           if ($scope.monitors[i].Monitor.isChecked) {
             totalChecked += 1;
-            includeString = includeString + '/'+encodeURIComponent('MonitorId =:')+$scope.monitors[i].Monitor.Id;
+            includeString = includeString + '/'+'MonitorId=:'+$scope.monitors[i].Monitor.Id;
           }
           else {
             totalUnchecked +=1;
-            excludeString = excludeString + '/'+encodeURIComponent('MonitorId !=:')+$scope.monitors[i].Monitor.Id;
+            excludeString = excludeString + '/'+'MonitorId!=:'+$scope.monitors[i].Monitor.Id;
           }
         }
         if (!totalUnchecked) {
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 2cc08bf7..c93bd8f4 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1478,20 +1478,20 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     // now get event details to show alarm frames
     var loginData = NVR.getLogin();
     var nextEvent = loginData.apiurl + "/events/index" +
-      "/StartTime >: " + currentEvent.Event.StartTime +
-      ($scope.followSameMonitor == '1' ? "/"+encodeURIComponent("MonitorId =: ") + currentEvent.Monitor.Id : "") ;
+      "/StartTime >:" + currentEvent.Event.StartTime +
+      ($scope.followSameMonitor == '1' ? "/"+"MonitorId=:" + currentEvent.Monitor.Id : "") ;
       if ($scope.useFilters) {
-        nextEvent = nextEvent + "/"+encodeURIComponent("AlarmFrames >=: ") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+        nextEvent = nextEvent + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
       }
       nextEvent = nextEvent + ".json?sort=StartTime&direction=asc&limit=1"+$rootScope.authSession;
       
 
     var prevEvent = loginData.apiurl + "/events/index" +
-      "/"+encodeURIComponent("StartTime <: ") + currentEvent.Event.StartTime +
-      ($scope.followSameMonitor == '1' ? "/"+encodeURIComponent("MonitorId =: " )+ currentEvent.Monitor.Id : "");
+      "/"+"StartTime<:" + currentEvent.Event.StartTime +
+      ($scope.followSameMonitor == '1' ? "/"+"MonitorId=:"+ currentEvent.Monitor.Id : "");
 
       if ($scope.useFilters) {
-        prevEvent = prevEvent + "/"+encodeURIComponent("AlarmFrames >=: ") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+        prevEvent = prevEvent + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
       }
       prevEvent = prevEvent + ".json?sort=StartTime&direction=desc&limit=1"+$rootScope.authSession;
 
diff --git a/www/js/EventsGraphsCtrl.js b/www/js/EventsGraphsCtrl.js
index d0c79614..8701f542 100644
--- a/www/js/EventsGraphsCtrl.js
+++ b/www/js/EventsGraphsCtrl.js
@@ -182,10 +182,10 @@ angular.module('zmApp.controllers').controller('zmApp.EventsGraphsCtrl', ['$ioni
 
           var dateString = "";
           if (hrs) {
-            dateString = "/"+encodeURIComponent("StartTime <=:") + endDate + "/"+encodeURIComponent("EndTime >=:") + startDate;
+            dateString = "/"+"StartTime<=:" + endDate + "/"+"EndTime>=:" + startDate;
           }
           var url = loginData.apiurl +
-            "/events/index/"+encodeURIComponent("MonitorId:") + monitors[j].Monitor.Id + dateString +
+            "/events/index/"+"MonitorId:" + monitors[j].Monitor.Id + dateString +
             ".json?page=1"+$rootScope.authSession;
           // console.log("Monitor event URL:" + url);
           NVR.log("EventGraph: composed url is " + url);
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js
index dcf8a721..07f8b09d 100644
--- a/www/js/MomentCtrl.js
+++ b/www/js/MomentCtrl.js
@@ -73,7 +73,7 @@ var masonry = null;
 
     excludeMonitorsFilter = "";
     for (var i = 0; i < excludeMonitors.length; i++) {
-      excludeMonitorsFilter = excludeMonitorsFilter + "/"+encodeURIComponent("MonitorId !=:") + excludeMonitors[i];
+      excludeMonitorsFilter = excludeMonitorsFilter + "/"+"MonitorId!=:" + excludeMonitors[i];
     }
     NVR.debug("Constructed Monitor Filter =" + excludeMonitorsFilter);
   }
@@ -785,7 +785,7 @@ var masonry = null;
     var ld = NVR.getLogin();
 
     // in API, always sort by StartTime so all monitors are represented
-    var myurl = ld.apiurl + "/events/index/"+encodeURIComponent("AlarmFrames >=:1") + excludeMonitorsFilter + "/"+encodeURIComponent("StartTime <=:") + timeTo + "/"+encodeURIComponent("EndTime >=:") + timeFrom + ".json?sort=" + "StartTime" + "&direction=desc"+$rootScope.authSession;
+    var myurl = ld.apiurl + "/events/index/"+"AlarmFrames>=:1" + excludeMonitorsFilter + "/"+"StartTime<=:" + timeTo + "/"+"EndTime>=:" + timeFrom + ".json?sort=" + "StartTime" + "&direction=desc"+$rootScope.authSession;
     NVR.debug("Retrieving " + myurl);
 
 
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index f6d5967a..518a2687 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -583,18 +583,18 @@ angular.module('zmApp.controllers')
       //  https:///zm/api/events/index/MonitorId=:2.json?sort=StartTime&direction=desc&limit=1
 
         var apiurl = ld.apiurl +'/events/index'; // we need some interval or it errors
-        apiurl += "/"+encodeURIComponent("MonitorId =:") + monitor.Monitor.Id;
+        apiurl += "/"+"MonitorId=:" + monitor.Monitor.Id;
         if (monitor.Monitor.Id in ld.lastEventCheckTimes) {
 
             // now is server TZ time
             var now = ld.lastEventCheckTimes[monitor.Monitor.Id];
-            apiurl += "/StartTime >:" + now;
+            apiurl += "/StartTime>:" + now;
 
         }
        
-        apiurl += "/"+encodeURIComponent("AlarmFrames >=:") + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
+        apiurl += "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
         if (ld.objectDetectionFilter) {
-          apiurl +='/'+encodeURIComponent('Notes REGEXP:detected:');
+          apiurl +='/'+'Notes REGEXP:detected:';
         }
         
         /*if ( !(monitor.Monitor.Id in ld.lastEventCheckTimes)) {
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 6d331735..4363099a 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -264,7 +264,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     function getNextSetHistory() {
 
       // grab events that start on or after the time 
-      apiurl = ld.apiurl + "/events/index/"+encodeURIComponent("StartTime >=:") + TimeObjectFrom + "/"+encodeURIComponent("AlarmFrames >=:") + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?sort=StartTime&direction=asc"+$rootScope.authSession;
+      apiurl = ld.apiurl + "/events/index/"+"StartTime>=:" + TimeObjectFrom + "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?sort=StartTime&direction=asc"+$rootScope.authSession;
       NVR.log("Grabbing history using: " + apiurl);
       // make sure there are no more than 5 active streams (noevent is ok)
       $scope.currentLimit = $scope.monLimit;
@@ -357,7 +357,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
         for (i = 0; i < $scope.MontageMonitors.length; i++) {
           //console.log("Fair chance check for " + $scope.MontageMonitors[i].Monitor.Name);
           if ($scope.MontageMonitors[i].Monitor.eventUrl == 'img/noimage.png') {
-            var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/"+encodeURIComponent("StartTime >=:") + TimeObjectFrom + "/"+encodeURIComponent("AlarmFrames >=:") + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?"+$rootScope.authSession;
+            var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/"+"StartTime>=:" + TimeObjectFrom + "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json?"+$rootScope.authSession;
             NVR.debug("Monitor " + $scope.MontageMonitors[i].Monitor.Id + ":" + $scope.MontageMonitors[i].Monitor.Name + " does not have events, trying " + indivGrab);
             var p = getExpandedEvents(i, indivGrab);
             promises.push(p);
diff --git a/www/js/NVR.js b/www/js/NVR.js
index bdeadece..482fcd7e 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -240,6 +240,8 @@ angular.module('zmApp.controllers')
        * @returns 
        */
       function setCordovaHttpOptions() {
+        /*debug ("Cordova HTTP: Setting JSON serializer");
+        cordova.plugin.http.setDataSerializer('utf8');*/
         if (loginData.isUseBasicAuth) {
           debug("Cordova HTTP: configuring basic auth");
           cordova.plugin.http.useBasicAuth(loginData.basicAuthUser, loginData.basicAuthPassword);
@@ -2823,7 +2825,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/"+encodeURIComponent("Type !=:WebSite.json") + "?"+$rootScope.authSession;
+            myurl += "/index/"+"Type!=:WebSite.json" + "?"+$rootScope.authSession;
 
             getZmsMultiPortSupport()
               .then(function (zmsPort) {
@@ -3479,17 +3481,17 @@ angular.module('zmApp.controllers')
 
           var myurl = apiurl + "/events/index";
           if (monitorId != 0)
-            myurl = myurl + "/"+encodeURIComponent("MonitorId:") + monitorId;
+            myurl = myurl + "/"+"MonitorId:" + monitorId;
           if (startTime)
-            myurl = myurl + "/"+encodeURIComponent("StartTime <=:") + endTime;
+            myurl = myurl + "/"+"StartTime<=:" + endTime;
           if (endTime)
-            myurl = myurl + "/"+encodeURIComponent("EndTime >=:") + startTime;
+            myurl = myurl + "/"+"EndTime>=:" + startTime;
 
-          myurl = myurl + "/"+encodeURIComponent("AlarmFrames >=:") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+          myurl = myurl + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
 
           //https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json
           if (loginData.objectDetectionFilter && !noObjectFilter) {
-            myurl = myurl +'/'+ encodeURIComponent('Notes REGEXP:detected:');
+            myurl = myurl +'/'+ 'Notes REGEXP:detected:';
           }
 
 
@@ -3570,13 +3572,13 @@ angular.module('zmApp.controllers')
 
           var myurl = apiurl + "/events/index";
           if (monitorId != 0)
-            myurl = myurl + "/"+encodeURIComponent("MonitorId:") + monitorId;
+            myurl = myurl + "/"+"MonitorId:" + monitorId;
           if (startTime)
-            myurl = myurl + "/"+encodeURIComponent("StartTime <=:") + endTime;
+            myurl = myurl + "/"+"StartTime<=:" + endTime;
           if (endTime)
-            myurl = myurl + "/"+encodeURIComponent("EndTime >=:") + startTime;
+            myurl = myurl + "/"+"EndTime>=:" + startTime;
 
-          myurl = myurl + "/"+encodeURIComponent("AlarmFrames >=:") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
+          myurl = myurl + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0);
 
           //console.log ('********* MON FILTER '+monListFilter);
           if (monListFilter) 
@@ -3585,7 +3587,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 + '/'+encodeURIComponent('Notes REGEXP:detected:');
+            myurl = myurl + '/'+'Notes REGEXP:detected:';
           }
 
       
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index aaab1f24..9de37c18 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -783,12 +783,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     // FIXME: totally ignoring event pages - hoping it wont be more than 100 or 150 whatever
     // the events per page limit is. Why? laziness.
     // 
-    var completedEvents = ld.apiurl + '/events/index/'+encodeURIComponent('EndTime >=:') + from;
+    var completedEvents = ld.apiurl + '/events/index/'+'EndTime>=:' + from;
     // we can add alarmCount as this is really for completed events
-    completedEvents = completedEvents + "/"+encodeURIComponent("AlarmFrames >=:") + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
+    completedEvents = completedEvents + "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
 
     if (ld.objectDetectionFilter) {
-      completedEvents = completedEvents + '/'+ encodeURIComponent('Notes REGEXP:"detected:"');
+      completedEvents = completedEvents + '/'+ 'Notes REGEXP:"detected:"';
     }
 
     completedEvents = completedEvents + ".json?"+$rootScope.authSession;
@@ -800,7 +800,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
     var st = moment(lastTimeForEvent).tz(NVR.getTimeZoneNow());
     st = st.subtract(10, 'minutes').locale('en').format("YYYY-MM-DD HH:mm:ss");
-    var ongoingEvents = ld.apiurl + '/'+encodeURIComponent('events/index/StartTime >=:') + st + encodeURIComponent('/EndTime =:.json')+'?'+$rootScope.authSession;
+    var ongoingEvents = ld.apiurl + '/'+'events/index/StartTime>=:' + st + '/EndTime=:.json'+'?'+$rootScope.authSession;
     //NVR.debug("Getting incremental events using: " + completedEvents);
 
     NVR.debug("Completed events API:" + completedEvents);
diff --git a/www/js/app.js b/www/js/app.js
index ee04948f..45d8d02f 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -2098,10 +2098,10 @@ angular.module('zmApp', [
           if (arguments[0].timeout) options.timeout = arguments[0].timeout;
           // console.log ("**** -->"+method+"<-- using native HTTP with:"+encodeURI(url)+" payload:"+JSON.stringify(options));
          
-         // nvr.debug ("cordova: got url "+url);
-         // nvr.debug ("cordova: url after encode "+encodeURI(url));
+          nvr.debug ("cordova: got url "+url);
+          nvr.debug ("cordova: url after encode "+encodeURI(url));
           //cordova.plugin.http.sendRequest(encodeURI(url), options,
-          cordova.plugin.http.sendRequest(url, options,
+          cordova.plugin.http.sendRequest(encodeURI(url), options,
             function (succ) {
               // automatic JSON parse if no responseType: text
               // fall back to text if JSON parse fails too
@@ -2142,7 +2142,7 @@ angular.module('zmApp', [
             },
             function (err) {
             
-              nvr.debug("***  Inside native HTTP error for url:"+err.url);
+              nvr.debug("***  Inside native HTTP error for url:"+JSON.stringify(url));
               if (err.status == 401 && !options.skipIntercept && nvr.apiValid) {
                 if (err.error && err.error.indexOf("API is disabled for user") != -1) {
                   nvr.apiValid = false;