diff --git a/htroot/Network.java b/htroot/Network.java index abc29b513..5e993fc68 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -72,7 +72,8 @@ public class Network { prop.put("menu", post == null ? 2 : (post.get("menu", "").equals("embed")) ? 0 : (post.get("menu","").equals("simple")) ? 1 : 2); if (sb.peers.mySeed() != null) prop.put("menu_newpeer_peerhash", sb.peers.mySeed().hash); - prop.setLocalized(!requestHeader.getPathInfo().endsWith(".xml")); + String pathInfo = requestHeader.getPathInfo(); + prop.setLocalized(!pathInfo.endsWith(".xml") && !pathInfo.endsWith(".json")); prop.putHTML("page_networkTitle", sb.getConfig("network.unit.description", "unspecified")); prop.putHTML("page_networkName", sb.getConfig(SwitchboardConstants.NETWORK_NAME, "unspecified")); final boolean overview = (post == null) || (post.get("page", "0").equals("0")); diff --git a/htroot/Network.json b/htroot/Network.json index 8b07ae7e4..dac22f750 100644 --- a/htroot/Network.json +++ b/htroot/Network.json @@ -7,14 +7,14 @@ "ppm": #[ppm]#, "qph": #[qph]#, "uptime": "#[uptime]#", - "links": "#[LCount]#", - "words": "#[ICount]#", - "rurls": "#[RCount]#", + "links": #[LCount]#, + "words": #[ICount]#, + "rurls": #[RCount]#, "lastseen": #[lastSeen]#, - "sendWords": "#[sI]#", - "receivedWords": "#[rI]#", - "sendURLs": "#[sU]#", - "receivedURLs": "#[rU]#", + "sendWords": #[sI]#, + "receivedWords": #[rI]#, + "sendURLs": #[sU]#, + "receivedURLs": #[rU]#, "type": "#(type)#junior::senior::principal#(/type)#", "direct": "#(type_direct)#direct::passive#(/type_direct)#", "acceptcrawl": #[acceptcrawl]#, @@ -24,7 +24,7 @@ "seedurl": "#[type_url]#", "age": #[age]#, "seeds": #[seeds]#, - "connects": "#[connects]#", + "connects": #[connects]#, #{ips}#"ip": "#(c)##[ip]#::#[ip]##(/c)#",#{/ips}# #{ips}#"address": "#(c)##(ipv6)#::[#(/ipv6)##[ip]##(ipv6)#::]#(/ipv6)#:#[port]#::#(/c)#",#{/ips}#