diff --git a/modules/chat/chat.ajax.php b/modules/chat/chat.ajax.php
index 219fe40..1c499ed 100644
--- a/modules/chat/chat.ajax.php
+++ b/modules/chat/chat.ajax.php
@@ -9,7 +9,7 @@ class chat extends ajax_module{
function ajax(){
global $session,$config,$db,$tpl,$log,$error,$ccache;
- $curl='chat';
+ $curl='chat.funch.at';
$locs=array('default'=>array(array('title'=>'N/A','name'=>'nolocation','icon'=>'nolocation.png')),'Ponyville'=>array(array('title'=>'N/A','name'=>'nolocation','icon'=>'nolocation.png'),array('title'=>'Marketplace','name'=>'marketplace','icon'=>'marketplace.png'),array('title'=>'SCC','name'=>'candycane','icon'=>'candycane.png'),array('title'=>'SAA','name'=>'apple','icon'=>'apple.png'),array('title'=>'Library','name'=>'book','icon'=>'book.png'),array('title'=>'Fountain','name'=>'fountain','icon'=>'fountain.png'),array('title'=>'Spa','name'=>'spa','icon'=>'spa.png'),array('title'=>'Hospital','name'=>'redcross','icon'=>'redcross.png'),array('title'=>'Guard-House','name'=>'shield','icon'=>'shield.png'),array('title'=>'Home','name'=>'house','icon'=>'house.png')),'Wilds'=>array(array('title'=>'N/A','name'=>'nolocation','icon'=>'nolocation.png'),array('title'=>'Everfree Forest','name'=>'everfree','icon'=>'everfree.png'),array('title'=>'Zecoras Hut','name'=>'zecora','icon'=>'zecora.png'),array('title'=>'Ghastly Gorge','name'=>'ghastlygorge','icon'=>'ghastlygorge.png'),array('title'=>'Old Castle Ruins','name'=>'castle','icon'=>'castle.png')));
$weather=array('clear'=>array('day'=>array('name'=>'Sunny Day'),'night'=>array('name'=>'Clear Night')),'cloudy'=>array('night'=>array('name'=>'Cloudy Night'),'day'=>array('name'=>'Cloudy Day')),'drizzle'=>array('name'=>'Drizzle'),'rain'=>array('name'=>'Rain'),'rainbow'=>array('name'=>'Rainbow'),'fog'=>array('name'=>'Foggy'),'thunderstorm'=>array('name'=>'Thunderstorm'),'overcast'=>array('name'=>'Overcast'),'snow'=>array('name'=>'Snowing'),'snowstorm'=>array('name'=>'Blizzard'),'winter'=>array('name'=>'Winter'),'storm'=>array('name'=>'Stormy'));
$adminweather=array('magicstorm'=>array('name'=>'Magical Storm'));
@@ -52,31 +52,30 @@ class chat extends ajax_module{
}
if($session->userdata['rp_admin']==1){
$js="var menu = [
- { name: \"kick\", action: function (element) { window.socket.send(\"/k \"+$(element).attr('id')); } },
- { name: \"jail\", action: function (element) { window.socket.send(\"/jail \"+$(element).attr('id')); } },
- { name: \"gag\", action: function (element) { window.socket.send(\"/gag \"+$(element).attr('id')); } },
- { name: \"toggle private\", action: function (element) { window.socket.send(\"/tpc \"+$(element).attr('id')); } },
- { name: \"ignore\", action: function (element) { window.socket.send(\"/ig \"+$(element).attr('id')); } },
- { name: \"invite\", action: function (element) { window.socket.send(\"/i \"+$(element).attr('id')); } },
- { name: \"catch\", action: function (element) { window.socket.send(\"/c \"+$(element).attr('id')); } },
+ { name: \"kick\", action: function (element) { sendMsg(\"/k \"+$(element).attr('id')); } },
+ { name: \"jail\", action: function (element) { sendMsg(\"/jail \"+$(element).attr('id')); } },
+ { name: \"gag\", action: function (element) { sendMsg(\"/gag \"+$(element).attr('id')); } },
+ { name: \"ignore\", action: function (element) { sendMsg(\"/ig \"+$(element).attr('id')); } },
+ { name: \"invite\", action: function (element) { sendMsg(\"/i \"+$(element).attr('id')); } },
+ { name: \"catch\", action: function (element) { sendMsg(\"/c \"+$(element).attr('id')); } },
{ name: \"whisperwindow\", action: function (element) { if ($('#'+$(element).attr('id')+'_whisper').length > 0){
$('#'+$(element).attr('id')+'_whisper').dialog('open');
$('#'+$(element).attr('id')+'_whisper').dialog('moveToTop');
}else{
- cwhisp($(element).attr('id'),\"\");
+ create_whisper($(element).attr('id'),\"\");
} } },
{ name: \"report\", action: function (element) { reportwindow($(element).attr('id')); } },
- { name: \"reports\", action: function (element) { window.socket.send(\"/rel \"+$(element).attr('id')); } }
+ { name: \"reports\", action: function (element) { sendMsg(\"/rel \"+$(element).attr('id')); } }
];";
}else{
$js="var menu = [
- { name: \"ignore\", action: function (element) { window.socket.send(\"/ig \"+$(element).attr('id')); } },
- { name: \"invite\", action: function (element) { window.socket.send(\"/i \"+$(element).attr('id')); } },
+ { name: \"ignore\", action: function (element) { sendMsg(\"/ig \"+$(element).attr('id')); } },
+ { name: \"invite\", action: function (element) { sendMsg(\"/i \"+$(element).attr('id')); } },
{ name: \"whisperwindow\", action: function (element) { if ($('#'+$(element).attr('id')+'_whisper').length > 0){
$('#'+$(element).attr('id')+'_whisper').dialog('open');
$('#'+$(element).attr('id')+'_whisper').dialog('moveToTop');
}else{
- cwhisp($(element).attr('id'),\"\");
+ create_whisper($(element).attr('id'),\"\");
} } },
{ name: \"report\", action: function (element) { reportwindow($(element).attr('id')); } }
];";
@@ -127,26 +126,26 @@ class chat extends ajax_module{
}
if($session->userdata['rp_admin']==1){
$js="var menu = [
- { name: \"kick\", action: function (element) { window.socket.send(\"/k \"+$(element).attr('id')); } },
- { name: \"jail\", action: function (element) { window.socket.send(\"/jail \"+$(element).attr('id')); } },
- { name: \"gag\", action: function (element) { window.socket.send(\"/gag \"+$(element).attr('id')); } },
- { name: \"toggle private\", action: function (element) { window.socket.send(\"/tpc \"+$(element).attr('id')); } },
- { name: \"ignore\", action: function (element) { window.socket.send(\"/ig \"+$(element).attr('id')); } },
- { name: \"invite\", action: function (element) { window.socket.send(\"/i \"+$(element).attr('id')); } },
- { name: \"catch\", action: function (element) { window.socket.send(\"/c \"+$(element).attr('id')); } },
+ { name: \"kick\", action: function (element) { sendMsg(\"/k \"+$(element).attr('id')); } },
+ { name: \"jail\", action: function (element) { sendMsg(\"/jail \"+$(element).attr('id')); } },
+ { name: \"gag\", action: function (element) { socket.send(\"/gag \"+$(element).attr('id')); } },
+ { name: \"toggle private\", action: function (element) { sendMsg(\"/tpc \"+$(element).attr('id')); } },
+ { name: \"ignore\", action: function (element) { sendMsg(\"/ig \"+$(element).attr('id')); } },
+ { name: \"invite\", action: function (element) { sendMsg(\"/i \"+$(element).attr('id')); } },
+ { name: \"catch\", action: function (element) { sendMsg(\"/c \"+$(element).attr('id')); } },
{ name: \"whisperwindow\", action: function (element) { if ($('#'+$(element).attr('id')+'_whisper').length > 0){
$('#'+$(element).attr('id')+'_whisper').dialog('open');
$('#'+$(element).attr('id')+'_whisper').dialog('moveToTop');
}else{
- cwhisp($(element).attr('id'),\"\");
+ create_whisper($(element).attr('id'),\"\");
} } },
{ name: \"report\", action: function (element) { reportwindow($(element).attr('id')); } },
- { name: \"reports\", action: function (element) { window.socket.send(\"/rel \"+$(element).attr('id')); } }
+ { name: \"reports\", action: function (element) { sendMsg(\"/rel \"+$(element).attr('id')); } }
];";
}else{
$js="var menu = [
- { name: \"ignore\", action: function (element) { window.socket.send(\"/ig \"+$(element).attr('id')); } },
- { name: \"invite\", action: function (element) { window.socket.send(\"/i \"+$(element).attr('id')); } },
+ { name: \"ignore\", action: function (element) { sendMsg(\"/ig \"+$(element).attr('id')); } },
+ { name: \"invite\", action: function (element) { sendMsg(\"/i \"+$(element).attr('id')); } },
{ name: \"report\", action: function (element) { reportwindow($(element).attr('id')); } }
];";
}
diff --git a/modules/chat/chat.output.php b/modules/chat/chat.output.php
index ebd917b..5a39f87 100644
--- a/modules/chat/chat.output.php
+++ b/modules/chat/chat.output.php
@@ -564,7 +564,6 @@ function inmeta2(){
$meta.="
-