diff options
| -rw-r--r-- | ajax/chat.ajax.php | 2 | ||||
| -rw-r--r-- | do.php | 8 | ||||
| -rw-r--r-- | images/.htaccess | 2 | ||||
| -rw-r--r-- | images/marks/blank.png | bin | 0 -> 126 bytes | |||
| -rw-r--r-- | js/mapspecs.js | 1 | ||||
| -rw-r--r-- | pages/chat.php | 8 |
6 files changed, 15 insertions, 6 deletions
diff --git a/ajax/chat.ajax.php b/ajax/chat.ajax.php index 7f5684c..415c517 100644 --- a/ajax/chat.ajax.php +++ b/ajax/chat.ajax.php @@ -159,7 +159,7 @@ function chatFilter($chat) { $chat = str_ireplace("vagina", "femur bone", $chat);
$chat = str_ireplace("cunt", "femur bone", $chat);
- $chat = str_ireplace("hell", "the supermarket", $chat);
+ //$chat = str_ireplace("hell", "the supermarket", $chat);
$chat = str_ireplace("whore", "entrepreneur", $chat);
$chat = str_ireplace("stfu", "be still my beating heart", $chat);
$chat = str_ireplace("omfg", "omg", $chat);
@@ -244,7 +244,13 @@ if ($_GET['r'] == 'getpath') { $_SESSION['preCompletedTutorial'] = true;
$_SESSION['preCompletedTutorialNotified'] = false;
}
- if ($accepted == false) die(json_encode($json));
+ if ($accepted == false) {
+ if ($debug == true) {
+ echo json_encode($json);
+ }
+ exit;
+ }
+ //if ($accepted == false) die(json_encode($json));
//TODO: Where's $paths coming from?
getCompletedChallenges($userID, $mapID, $solution, $moves, $paths);
die(json_encode($json));
diff --git a/images/.htaccess b/images/.htaccess index cac0861..c9d7886 100644 --- a/images/.htaccess +++ b/images/.htaccess @@ -4,4 +4,4 @@ Header set Cache-Control "max-age=290304000, public" </filesMatch>
# Incase of missing images
-ErrorDocument 404 http://www.mazetd.4xg.net/images/blank.png?error404=true
\ No newline at end of file +ErrorDocument 404 http://www.pathery.com/images/blank.png?error404=true
\ No newline at end of file diff --git a/images/marks/blank.png b/images/marks/blank.png Binary files differnew file mode 100644 index 0000000..b5fd2c0 --- /dev/null +++ b/images/marks/blank.png diff --git a/js/mapspecs.js b/js/mapspecs.js index d8b4ed3..4658aa3 100644 --- a/js/mapspecs.js +++ b/js/mapspecs.js @@ -147,6 +147,7 @@ function grid_click(obj) { childdiv.setAttribute("class", "child w");
if (wallColor == false) setWallStyle(userObj);
+ if (wallColor == false) wallColor = '#666';
obj.style.backgroundColor = wallColor;
if (wallEmblem) {
diff --git a/pages/chat.php b/pages/chat.php index 68a0abf..da423bf 100644 --- a/pages/chat.php +++ b/pages/chat.php @@ -199,14 +199,16 @@ function getChat(message) { var dataString = 'getChatFromID='+lastID;
if (chatBuffer.length > 0) {
dataString += '&send=true&messages='+prepChat(chatBuffer);
- chatBuffer.length = 0;
}
$.ajax({
type: "POST",
url: "ajax/chat.ajax.php",
- data: dataString,
- success: function(data) {getChatDone(data);}
+ data: dataString,
+ success: function(data) {
+ getChatDone(data);
+ chatBuffer.length = 0;
+ }
});
}
|
