Merge remote-tracking branch 'kilandor/master'

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">

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);
 				}
 			});
 		}

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

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.');
+}
+
+
+?>