X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fapi%2FFindAgent.java;h=a78cd659d5dc3e7ecc692f3f07974db9cef518cb;hp=29e536e1e1e92fd90f8113ea24e5a450a500d800;hb=a09f042a230804825c3d22726dce65e7b8ed814e;hpb=85b9c7cfd0426eca278b609b96dd6b17b0a5144f

diff --git a/src/org/cacert/gigi/api/FindAgent.java b/src/org/cacert/gigi/api/FindAgent.java
index 29e536e1..a78cd659 100644
--- a/src/org/cacert/gigi/api/FindAgent.java
+++ b/src/org/cacert/gigi/api/FindAgent.java
@@ -1,6 +1,7 @@
 package org.cacert.gigi.api;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
@@ -14,6 +15,7 @@ import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.pages.account.FindAgentAccess;
 import org.cacert.gigi.util.ServerConstants;
+import org.json.JSONWriter;
 
 public class FindAgent extends APIPoint {
 
@@ -69,16 +71,29 @@ public class FindAgent extends APIPoint {
             resp.setContentType("text/plain; charset=UTF-8");
             resp.getWriter().print(us.getId());
         } else if (pi.equals(PATH_INFO)) {
-            resp.setContentType("text/plain; charset=UTF-8");
+            resp.setContentType("application/json; charset=UTF-8");
+            PrintWriter out = resp.getWriter();
             String[] uids = req.getParameterValues("id");
+            JSONWriter jw = new JSONWriter(out);
+            jw.array();
             for (String i : uids) {
                 User u1 = User.getById(Integer.parseInt(i));
                 if ( !u1.isInGroup(Group.LOCATE_AGENT)) {
                     continue;
                 }
                 // date, recheck(?), name
-                resp.getWriter().println(i + "," + u1.canAssure() + "," + u1.getName().toString());
+                jw.object();
+                jw.key("id");
+                jw.value(u1.getId());
+
+                jw.key("canAssure");
+                jw.value(u1.canAssure());
+
+                jw.key("name");
+                jw.value(u1.getPreferredName().toAbbreviatedString());
+                jw.endObject();
             }
+            jw.endArray();
         } else if (pi.equals(PATH_MAIL)) {
             String id = req.getParameter("from");
             String rid = req.getParameter("to");
@@ -99,7 +114,7 @@ public class FindAgent extends APIPoint {
                 return;
 
             }
-            EmailProvider.getInstance().sendMail(to.getEmail(), "[Find Agent] " + subject, body, to.getEmail(), null, null, null, null, false);
+            EmailProvider.getInstance().sendMail(to.getEmail(), "[Find Agent] " + subject, body, null, null, null, null, false);
         }
     }
 }