From 3e712865070a5b6bae3a0b2100015f6e40ea7a29 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 18 Dec 2013 14:45:59 +0100 Subject: [PATCH] Added Access-Control-Allow-Origin to the players HTTPD module --- buildnumber.properties | 4 ++-- .../TotalFreedomMod/HTTPD/Module_players.java | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index ee3b4a8e..a2039ab6 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Wed Dec 18 14:11:43 CET 2013 -build.number=694 +#Wed Dec 18 14:44:11 CET 2013 +build.number=695 diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_players.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_players.java index 303a765f..6663941d 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_players.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_players.java @@ -19,7 +19,7 @@ public class Module_players extends TFM_HTTPD_Module @Override public NanoHTTPD.Response getResponse() { - final JSONObject response = new JSONObject(); + final JSONObject responseObject = new JSONObject(); final JSONArray players = new JSONArray(); final JSONArray superadmins = new JSONArray(); @@ -68,13 +68,15 @@ public class Module_players extends TFM_HTTPD_Module // Developers developers.addAll(TFM_Util.DEVELOPERS); - response.put("players", players); - response.put("superadmins", superadmins); - response.put("telnetadmins", telnetadmins); - response.put("senioradmins", senioradmins); - response.put("developers", developers); + responseObject.put("players", players); + responseObject.put("superadmins", superadmins); + responseObject.put("telnetadmins", telnetadmins); + responseObject.put("senioradmins", senioradmins); + responseObject.put("developers", developers); - return new NanoHTTPD.Response(NanoHTTPD.Response.Status.OK, NanoHTTPD.MIME_JSON, response.toString()); + final NanoHTTPD.Response response = new NanoHTTPD.Response(NanoHTTPD.Response.Status.OK, NanoHTTPD.MIME_JSON, responseObject.toString()); + response.addHeader("Access-Control-Allow-Origin", "*"); + return response; } private String getName(String caseInsensitiveName)