From a1d7805116666f64c18f27d8d45b6133e11f1dbd Mon Sep 17 00:00:00 2001
From: Jason Booth <Kilandor@gmail.com>
Date: Wed, 23 Feb 2011 17:07:04 -0600
Subject: [PATCH 1/3] Fix for NPE JsonTimerTask.java using wrong playerList
 Removed unused PlayerList variable in MapManager.java

---
 src/main/java/org/dynmap/JsonTimerTask.java | 2 +-
 src/main/java/org/dynmap/MapManager.java    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/dynmap/JsonTimerTask.java b/src/main/java/org/dynmap/JsonTimerTask.java
index 1c355b0f..4fece6ef 100644
--- a/src/main/java/org/dynmap/JsonTimerTask.java
+++ b/src/main/java/org/dynmap/JsonTimerTask.java
@@ -35,7 +35,7 @@ class JsonTimerTask extends TimerTask {
             update.timestamp = current;
             update.servertime = world.getTime() % 24000;
 
-            Player[] players = mapManager.playerList.getVisiblePlayers();
+            Player[] players = plugin.playerList.getVisiblePlayers();
             update.players = new Client.Player[players.length];
             for (int i = 0; i < players.length; i++) {
                 Player p = players[i];
diff --git a/src/main/java/org/dynmap/MapManager.java b/src/main/java/org/dynmap/MapManager.java
index aa24dffb..4d4f4eb1 100644
--- a/src/main/java/org/dynmap/MapManager.java
+++ b/src/main/java/org/dynmap/MapManager.java
@@ -24,8 +24,6 @@ public class MapManager {
     public Map<String, DynmapWorld> worlds = new HashMap<String, DynmapWorld>();
     public Map<String, DynmapWorld> inactiveworlds = new HashMap<String, DynmapWorld>();
     
-    public PlayerList playerList;
-
     /* lock for our data structures */
     public static final Object lock = new Object();
 

From 965686d44c93472fee0fca648857a74a2ca0c42b Mon Sep 17 00:00:00 2001
From: Jason Booth <Kilandor@gmail.com>
Date: Wed, 9 Mar 2011 17:43:24 -0600
Subject: [PATCH 2/3] Cleanup Moved CSS and JS to matching folders

---
 web/{ => css}/chat_style.css       |  0
 web/{ => css}/dynmap_style.css     |  0
 web/{ => css}/embedded_example.css |  0
 web/{ => css}/override_example.css |  0
 web/{ => css}/standalone.css       |  0
 web/index.html                     | 26 +++++++++++++-------------
 web/{ => js}/chat.js               |  0
 web/{ => js}/clock.digital.js      |  0
 web/{ => js}/clock.timeofday.js    |  0
 web/{ => js}/custommarker.js       |  0
 web/{ => js}/flatmap.js            |  0
 web/{ => js}/jquery-1.4.4.min.js   |  0
 web/{ => js}/jquery.json.js        |  0
 web/{ => js}/kzedmaps.js           |  0
 web/{ => js}/map.js                |  0
 web/{ => js}/minecraft.js          |  0
 16 files changed, 13 insertions(+), 13 deletions(-)
 rename web/{ => css}/chat_style.css (100%)
 rename web/{ => css}/dynmap_style.css (100%)
 rename web/{ => css}/embedded_example.css (100%)
 rename web/{ => css}/override_example.css (100%)
 rename web/{ => css}/standalone.css (100%)
 rename web/{ => js}/chat.js (100%)
 rename web/{ => js}/clock.digital.js (100%)
 rename web/{ => js}/clock.timeofday.js (100%)
 rename web/{ => js}/custommarker.js (100%)
 rename web/{ => js}/flatmap.js (100%)
 rename web/{ => js}/jquery-1.4.4.min.js (100%)
 rename web/{ => js}/jquery.json.js (100%)
 rename web/{ => js}/kzedmaps.js (100%)
 rename web/{ => js}/map.js (100%)
 rename web/{ => js}/minecraft.js (100%)

diff --git a/web/chat_style.css b/web/css/chat_style.css
similarity index 100%
rename from web/chat_style.css
rename to web/css/chat_style.css
diff --git a/web/dynmap_style.css b/web/css/dynmap_style.css
similarity index 100%
rename from web/dynmap_style.css
rename to web/css/dynmap_style.css
diff --git a/web/embedded_example.css b/web/css/embedded_example.css
similarity index 100%
rename from web/embedded_example.css
rename to web/css/embedded_example.css
diff --git a/web/override_example.css b/web/css/override_example.css
similarity index 100%
rename from web/override_example.css
rename to web/css/override_example.css
diff --git a/web/standalone.css b/web/css/standalone.css
similarity index 100%
rename from web/standalone.css
rename to web/css/standalone.css
diff --git a/web/index.html b/web/index.html
index 6fa6557f..9c557d85 100644
--- a/web/index.html
+++ b/web/index.html
@@ -10,22 +10,22 @@
 	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
 	<link rel="icon" href="images/dynmap.ico" type="image/ico" />
 
-	<!--<link rel="stylesheet" type="text/css" href="/map/embedded.css" media="screen" />-->
-	<link rel="stylesheet" type="text/css" href="standalone.css" media="screen" />
-	<link rel="stylesheet" type="text/css" href="dynmap_style.css" media="screen" />
-	<!-- <link rel="stylesheet" type="text/css" href="override.css" media="screen" /> -->
+	<!--<link rel="stylesheet" type="text/css" href="css/embedded.css" media="screen" />-->
+	<link rel="stylesheet" type="text/css" href="css/standalone.css" media="screen" />
+	<link rel="stylesheet" type="text/css" href="css/dynmap_style.css" media="screen" />
+	<!-- <link rel="stylesheet" type="text/css" href="css/override.css" media="screen" /> -->
 
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
-	<script type="text/javascript" src="jquery.json.js"></script>
+	<script type="text/javascript" src="js/jquery.json.js"></script>
 	<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-	<script type="text/javascript" src="custommarker.js"></script>
-	<script type="text/javascript" src="minecraft.js"></script>
-	<script type="text/javascript" src="map.js"></script>
-	<script type="text/javascript" src="kzedmaps.js"></script>
-	<script type="text/javascript" src="flatmap.js"></script>
-	<script type="text/javascript" src="clock.timeofday.js"></script>
-	<script type="text/javascript" src="clock.digital.js"></script>
-	<script type="text/javascript" src="chat.js"></script>
+	<script type="text/javascript" src="js/custommarker.js"></script>
+	<script type="text/javascript" src="js/minecraft.js"></script>
+	<script type="text/javascript" src="js/map.js"></script>
+	<script type="text/javascript" src="js/kzedmaps.js"></script>
+	<script type="text/javascript" src="js/flatmap.js"></script>
+	<script type="text/javascript" src="js/clock.timeofday.js"></script>
+	<script type="text/javascript" src="js/clock.digital.js"></script>
+	<script type="text/javascript" src="js/chat.js"></script>
 	<script type="text/javascript" src="config.js"></script>
 
 	<script type="text/javascript">
diff --git a/web/chat.js b/web/js/chat.js
similarity index 100%
rename from web/chat.js
rename to web/js/chat.js
diff --git a/web/clock.digital.js b/web/js/clock.digital.js
similarity index 100%
rename from web/clock.digital.js
rename to web/js/clock.digital.js
diff --git a/web/clock.timeofday.js b/web/js/clock.timeofday.js
similarity index 100%
rename from web/clock.timeofday.js
rename to web/js/clock.timeofday.js
diff --git a/web/custommarker.js b/web/js/custommarker.js
similarity index 100%
rename from web/custommarker.js
rename to web/js/custommarker.js
diff --git a/web/flatmap.js b/web/js/flatmap.js
similarity index 100%
rename from web/flatmap.js
rename to web/js/flatmap.js
diff --git a/web/jquery-1.4.4.min.js b/web/js/jquery-1.4.4.min.js
similarity index 100%
rename from web/jquery-1.4.4.min.js
rename to web/js/jquery-1.4.4.min.js
diff --git a/web/jquery.json.js b/web/js/jquery.json.js
similarity index 100%
rename from web/jquery.json.js
rename to web/js/jquery.json.js
diff --git a/web/kzedmaps.js b/web/js/kzedmaps.js
similarity index 100%
rename from web/kzedmaps.js
rename to web/js/kzedmaps.js
diff --git a/web/map.js b/web/js/map.js
similarity index 100%
rename from web/map.js
rename to web/js/map.js
diff --git a/web/minecraft.js b/web/js/minecraft.js
similarity index 100%
rename from web/minecraft.js
rename to web/js/minecraft.js

From d296724755b9b9daf3c531be440fcfa5971f31a6 Mon Sep 17 00:00:00 2001
From: Jason Booth <Kilandor@gmail.com>
Date: Thu, 10 Mar 2011 00:11:43 -0600
Subject: [PATCH 3/3] Fix client side timestamp problem Added Support for
 standalone webchat by reading a json file Fix for jsonfile-interval in code
 Added working php script with spam prevention, for webchat

---
 src/main/java/org/dynmap/DynmapPlugin.java  | 13 +++--
 src/main/java/org/dynmap/JsonTimerTask.java | 63 ++++++++++++++++++---
 web/js/chat.js                              |  4 +-
 web/js/map.js                               |  3 +-
 web/standalone/sendmessage.php              | 32 +++++++++++
 5 files changed, 102 insertions(+), 13 deletions(-)
 create mode 100644 web/standalone/sendmessage.php

diff --git a/src/main/java/org/dynmap/DynmapPlugin.java b/src/main/java/org/dynmap/DynmapPlugin.java
index c18c8f6c..f63085b8 100644
--- a/src/main/java/org/dynmap/DynmapPlugin.java
+++ b/src/main/java/org/dynmap/DynmapPlugin.java
@@ -134,9 +134,7 @@ public class DynmapPlugin extends JavaPlugin {
             messageHandler.onMessageReceived.addListener(new Listener<SendMessageHandler.Message>() {
                 @Override
                 public void triggered(Message t) {
-                    mapManager.pushUpdate(new Client.WebChatMessage(t.name, t.message));
-                    log.info("[WEB]" + t.name + ": " + t.message);
-                    getServer().broadcastMessage("[WEB]" + t.name + ": " + t.message);
+                    webChat(t.name, t.message);
                 }
             });
             webServer.handlers.put("/up/sendmessage", messageHandler);
@@ -345,7 +343,7 @@ public class DynmapPlugin extends JavaPlugin {
     private void jsonConfig() {
         File outputFile;
         Map<?, ?> clientConfig = (Map<?, ?>) configuration.getProperty("web");
-        File webpath = new File(configuration.getString("webpath", "web"), "dynmap_config.json");
+        File webpath = new File(configuration.getString("webpath", "web"), "standalone/dynmap_config.json");
         if (webpath.isAbsolute())
             outputFile = webpath;
         else
@@ -361,4 +359,11 @@ public class DynmapPlugin extends JavaPlugin {
             log.log(Level.SEVERE, "Exception while writing JSON-configuration-file.", ioe);
         }
     }
+    
+    public void webChat(String name, String message)
+    {
+        mapManager.pushUpdate(new Client.WebChatMessage(name, message));
+        log.info("[WEB]" + name + ": " + message);
+        getServer().broadcastMessage("[WEB]" + name + ": " + message);
+    }
 }
diff --git a/src/main/java/org/dynmap/JsonTimerTask.java b/src/main/java/org/dynmap/JsonTimerTask.java
index d7f95e76..08981f1f 100644
--- a/src/main/java/org/dynmap/JsonTimerTask.java
+++ b/src/main/java/org/dynmap/JsonTimerTask.java
@@ -3,7 +3,9 @@ package org.dynmap;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
+import java.util.Iterator;
 import java.util.TimerTask;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -13,7 +15,12 @@ import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.util.config.Configuration;
+import org.dynmap.Event;
 import org.dynmap.web.Json;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 class JsonTimerTask extends TimerTask {
     protected static final Logger log = Logger.getLogger("Minecraft");
@@ -22,6 +29,8 @@ class JsonTimerTask extends TimerTask {
     private Server server;
     private MapManager mapManager;
     private Configuration configuration;
+    private static final JSONParser parser = new JSONParser();
+    private long lastTimestamp = 0;
 
     public JsonTimerTask(DynmapPlugin instance, Configuration config) {
         this.plugin = instance;
@@ -31,8 +40,48 @@ class JsonTimerTask extends TimerTask {
     }
 
     public void run() {
+        long jsonInterval = configuration.getInt("jsonfile-interval", 1) * 1000;
+        long current = System.currentTimeMillis();
+        File outputFile;
+
+        //Handles Reading WebChat
+        if(configuration.getNode("web").getBoolean("allowwebchat", false))
+        {
+            File webChatPath = new File(this.configuration.getString("webpath", "web"), "standalone/dynmap_webchat.json");
+            if (webChatPath.isAbsolute())
+                outputFile = webChatPath;
+            else {
+                outputFile = new File(plugin.getDataFolder(), webChatPath.toString());
+            }
+            if(webChatPath.exists() && lastTimestamp != 0)
+            {
+                JSONArray jsonMsgs = null;
+                try {
+                    FileReader inputFileReader = new FileReader(webChatPath);
+                    jsonMsgs = (JSONArray) parser.parse(inputFileReader);
+                    inputFileReader.close();
+                } catch(IOException ex){
+                    log.log(Level.SEVERE, "Exception while reading JSON-file.", ex);
+                } catch(ParseException ex) {
+                    log.log(Level.SEVERE, "Exception while parsing JSON-file.", ex);
+                }
+
+                if(jsonMsgs != null) {
+                    Iterator iter = jsonMsgs.iterator();
+                    while(iter.hasNext()) {
+                        JSONObject o = (JSONObject)iter.next();
+                        if(Long.parseLong(String.valueOf(o.get("timestamp"))) >= (lastTimestamp))
+                        {
+                            plugin.webChat(String.valueOf(o.get("name")), String.valueOf(o.get("message")));
+                        }
+                    }
+                }
+            }
+        }
+
+        //Handles Updates
         for (World world : this.server.getWorlds()) {
-            long current = System.currentTimeMillis();
+            current = System.currentTimeMillis();
 
             Client.Update update = new Client.Update();
 
@@ -47,14 +96,13 @@ class JsonTimerTask extends TimerTask {
                 update.players[i] = new Client.Player(p.getName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ());
             }
 
-            update.updates = mapManager.getWorldUpdates(world.getName(), current - (configuration.getInt("jsonfile-interval", 1) + 10000));
+            update.updates = mapManager.getWorldUpdates(world.getName(), current - (jsonInterval + 10000));
 
-            File webpath = new File(this.configuration.getString("webpath", "web"), "dynmap_" + world.getName() + ".json");
-            File outputFile;
-            if (webpath.isAbsolute())
-                outputFile = webpath;
+            File webWorldPath = new File(this.configuration.getString("webpath", "web"), "standalone/dynmap_" + world.getName() + ".json");
+            if (webWorldPath.isAbsolute())
+                outputFile = webWorldPath;
             else {
-                outputFile = new File(plugin.getDataFolder(), webpath.toString());
+                outputFile = new File(plugin.getDataFolder(), webWorldPath.toString());
             }
             try {
                 FileOutputStream fos = new FileOutputStream(outputFile);
@@ -66,5 +114,6 @@ class JsonTimerTask extends TimerTask {
                 log.log(Level.SEVERE, "Exception while writing JSON-file.", ioe);
             }
         }
+        lastTimestamp = System.currentTimeMillis();
     }
 }
diff --git a/web/js/chat.js b/web/js/chat.js
index a944631c..49bc792d 100644
--- a/web/js/chat.js
+++ b/web/js/chat.js
@@ -1,4 +1,4 @@
-function sendChat(message) {
+function sendChat(me, message) {
 	var ip;
 	$.ajax({
 		type: "GET",
@@ -13,6 +13,8 @@ function sendChat(message) {
 					dataType: 'json',
 					success: function(response) {
 						//handle response
+						if(response)
+							me.onPlayerChat('', response);
 				}
 			});
 		}
diff --git a/web/js/map.js b/web/js/map.js
index 5d6c33d8..3a638188 100644
--- a/web/js/map.js
+++ b/web/js/map.js
@@ -213,7 +213,7 @@ DynMap.prototype = {
 					.keydown(function(event) {
 						if (event.keyCode == '13') {
 							event.preventDefault();
-							sendChat(chatinput.val());
+							sendChat(me, chatinput.val());
 							chatinput.val('');
 						}
 					})
@@ -329,6 +329,7 @@ DynMap.prototype = {
 					//var divs = $('div[rel]');
 					//divs.filter(function(i){return parseInt(divs[i].attr('rel')) > timestamp+me.options.messagettl;}).remove();
 				});
+				me.lasttimestamp = update.timestamp;
 				setTimeout(function() { me.update(); }, me.options.updaterate);
 			}, function(status, statusText, request) {
 				me.alertbox
diff --git a/web/standalone/sendmessage.php b/web/standalone/sendmessage.php
new file mode 100644
index 00000000..f36b8961
--- /dev/null
+++ b/web/standalone/sendmessage.php
@@ -0,0 +1,32 @@
+<?php
+$msginterval = 5; //In seconds - add this to dynmap web config??
+
+session_start();
+if($_SERVER['REQUEST_METHOD'] == 'POST' && $_SESSION['lastchat'] < time())
+{
+	$config =  json_decode(file_get_contents('dynmap_config.json'), true);
+	$micro = explode(' ', microtime());
+	$timestamp = $micro[1].round($micro[0]*1000);
+	
+	$data = json_decode(trim(file_get_contents('php://input')));
+	$data->timestamp = $timestamp;
+	$old_messages = json_decode(file_get_contents('dynmap_webchat.json'), true);
+	if(!empty($old_messages))
+	{
+		foreach($old_messages as $message)
+		{
+			if(($timestamp - $config['updaterate'] - 10000) < $message['timestamp'])
+				$new_messages[] = $message;
+		}
+	}
+	$new_messages[] = $data;
+	file_put_contents('dynmap_webchat.json', json_encode($new_messages));
+	$_SESSION['lastchat'] = time()+$msginterval;
+}
+elseif($_SERVER['REQUEST_METHOD'] == 'POST' && $_SESSION['lastchat'] > time())
+{
+	echo json_encode('You may only chat once every '.$msginterval.' seconds.');
+}
+
+
+?>
\ No newline at end of file