#768 migrate to GET instead of POST

2 files changed, 18 insertions, 60 deletions

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 97e3aee0..5dde11a4 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -313,43 +313,23 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
     var loginData = NVR.getLogin();
     //console.log("Sending CGI command to " + loginData.url);
     var rqtoken = rq ? rq : "stream";
-    var myauthtoken = $rootScope.authSession.replace("&auth=", "");
+    
+    var cmdUrl = loginData.url + '/index.php?view=request&request='+rqtoken+'&connkey='+connkey+'&command='+cmd+$rootScope.authSession;
+    if (extras)
+      cmdUrl = cmdUrl+extras;
+
     //&auth=
+
+    NVR.debug ("Control: Sending "+cmdUrl);
     $http({
-        method: 'POST',
+        //method: 'POST',
+        method: 'GET',
         /*timeout: 15000,*/
-        url: loginData.url + '/index.php',
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          //'Accept': '*/*',
-        },
-        transformRequest: function (obj) {
-          var str = [];
-          for (var p in obj)
-            str.push(encodeURIComponent(p) + "=" +
-              encodeURIComponent(obj[p]));
-          var foo = str.join("&");
-          if (extras) {
-            foo = foo + extras;
-            //console.log("EXTRAS****SUB RETURNING " + foo);
-          }
-          //console.log("CGI subcommand=" + foo);
-          return foo;
-
-        },
+        url: cmdUrl
 
-        data: {
-          view: "request",
-          request: rqtoken,
-          connkey: connkey,
-          command: cmd,
-          auth: myauthtoken,
-          // user: loginData.username,
-          // pass: loginData.password
-        }
       })
       .then(function (resp) {
-         // NVR.debug("sendCmd response:" + JSON.stringify(resp));
+          NVR.debug("sendCmd response:" + JSON.stringify(resp));
           d.resolve(resp);
           return (d.promise);
 
@@ -372,35 +352,14 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     var loginData = NVR.getLogin();
     //console.log("sending process Event command to " + loginData.url);
-    var myauthtoken = $rootScope.authSession.replace("&auth=", "");
+    
+    var cmdUrl = loginData.url + '/index.php?view=request&request=stream&connkey='+connkey+'&command='+cmd+$rootScope.authSession;
     //&auth=
     return $http({
-        method: 'POST',
+        method: 'GET',
         /*timeout: 15000,*/
-        url: loginData.url + '/index.php',
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          //'Accept': '*/*',
-        },
-        transformRequest: function (obj) {
-          var str = [];
-          for (var p in obj)
-            str.push(encodeURIComponent(p) + "=" +
-              encodeURIComponent(obj[p]));
-          var foo = str.join("&");
-          //console.log("****processEvent subcommands RETURNING " + foo);
-          return foo;
-        },
-
-        data: {
-          view: "request",
-          request: "stream",
-          connkey: connkey,
-          command: cmd,
-          auth: myauthtoken,
-          // user: loginData.username,
-          // pass: loginData.password
-        }
+        url: cmdUrl,
+        
       })
       .then(function (resp) {
           //NVR.debug ("processEvent success:"+JSON.stringify(resp));
diff --git a/www/templates/events.html b/www/templates/events.html
index b3da4bf3..e6d05e3e 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -27,9 +27,8 @@
     <!-- lets make sure the events list is not empty as collection repeat needs height -->
     <div ng-if="!eventsBeingLoaded">
       <ion-list show-delete="eventList.showDelete">
-        <ion-item force-refresh-images="true" collection-repeat="event in events| filter:search.text |  eventListFilter
-                "
-          item-height="event.Event.height" id="item-{{$index}}" on-swipe-left="checkSwipe($index);">
+        <ion-item force-refresh-images="true" collection-repeat="event in events| filter:search.text |  eventListFilter"
+          item-height="event.Event.height" id="item-{{$index}}" on-swipe-left="checkSwipe($index);"  >
           <span style="float:left;margin-top:-18px;background-color:#96281B;color:#fff;font-size:11px;opacity:0.7;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;
             <i class="ion-calendar"></i>&nbsp;&nbsp;{{prettifyTime(event.Event.StartTime)}}&nbsp;{{tzAbbr}}&nbsp;</span>&nbsp;&nbsp;
           <span style="float:left;margin-top:-18px;background-color:#fff;color:#888;font-size:11px;opacity:1;">&nbsp;&nbsp;