Applied changes from emailed code review

lib/typedItCollector.js

 /* This Source Code Form is subject to the terms of the Mozilla Public

[Wladimir Palant, 2012/09/28 09:29:34]

Comments from previous review haven't been addressed in this file - one of my
changes addresses them however.

  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
 
 let domains = null;
 let userCorrections = null;
@@ skipping 129 matching lines @@
   if (!("service" in privateBrowsingEnabled))
     privateBrowsingEnabled.service = Cc["@mozilla.org/privatebrowsing;1"].getService(Ci.nsIPrivateBrowsingService);
 
   return privateBrowsingEnabled.service.privateBrowsingEnabled;
 }
 
 function sendAnonymousData()
 {
   if (!Prefs.domainOptIn || (domains.length == 0 && falsePositives.length == 0 && userCorrections.length == 0) || privateBrowsingEnabled())
     return;
-
-  let args = [];
+  
+  let postData = {};
   let savedDomains = domains;
   let savedFalsePositives = falsePositives;
   let savedUserCorrections = userCorrections;
 
   if(domains.length > 0)
   {
-    args.push(domains.map(function(d) "domains[]=" + encodeURIComponent(d)).join("&"));
+    postData.domains = domains;
     domains = [];
   }
   if(falsePositives.length > 0)
   {
-    args.push(
-      falsePositives.map(
-        function(fp)
-        {
-          return "falsePositives[]=" + encodeURIComponent(
-            encodeURIComponent(fp[0]) + ((fp[1]) ? "&" + encodeURIComponent(fp[1]) : "")
-          );
-        }
-      ).join("&")
-    );
+    postData.falsePositives = falsePositives;
     falsePositives = [];
   }
   if(userCorrections.length > 0)
   {
-    args.push(
-      userCorrections.map(
-        function(uc)
-        {
-          return "userCorrections[]=" + encodeURIComponent(
-            encodeURIComponent(uc[0]) + ((uc[1]) ? "&" + encodeURIComponent(uc[1]) : "")
-          );
-        }
-      ).join("&")
-    );
+    postData.userCorrections = userCorrections;
     userCorrections = [];
   }
-
+  
   let request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest);
   request.open("POST", "http://typed.it/submitData");
   request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
   request.addEventListener("load", function(event)
   {
     if (event.target.status != 200)
     {
       domains = domains.concat(savedDomains);
       falsePositives = falsePositives.concat(savedFalsePositives);
       userCorrections = userCorrections.concat(savedUserCorrections);
     }
   }, false);
-  request.send(args.join("&"));
+  request.send("data=" + JSON.stringify(postData));
 }
 
 function initWebUI(event)
 {
   if (Prefs.domainOptIn)
     return;
 
   let container = event.target;
   let source = container.ownerDocument.defaultView.location.hostname;
   if (!/(^|\.)urlfixer\.org$/.test(source))
@@ skipping 12 matching lines @@
 
     Prefs.domainOptInAsk = true;
     Prefs.domainOptIn = true;
     button.style.display = "none";
     message.style.display = "";
   }, false);
 
   message.style.display = "none";
   container.style.display = "";
 }