diff --git a/.htaccess b/.htaccess
index e35472c..e8a4181 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,6 +13,7 @@ RewriteBase /
RewriteRule error/(.*)\.html$ index.php?task=error&sub=$1
+RewriteRule ^np/images/(.+)$ /modules/nickpage/images/$1 [L,NC]
RewriteRule np/(.*) index.php?task=nickpage&user=$1
RewriteRule ^register/(.*)? register.php?regstring=$1
RewriteRule ^avatar/(.*)? index.php?task=rp&sum=avatar&id=$1
@@ -26,6 +27,6 @@ RewriteRule canon_chars.html index.php?task=rp&sub=canons [QSA,L]
RewriteRule logs.html index.php?task=chat&sub=logs [QSA,L]
RewriteRule private.html index.php?task=chat&sub=privatelogs [QSA,L]
RewriteRule ^guidelines.html$ /text/rules.html [R=301,L]
-RewriteRule ^(.*\.html?)$ index.php?task=text&url=$1 [L]
+RewriteRule ^/t/(.*\.html?)$ index.php?task=text&url=$1 [L]
diff --git a/modules/chat/chat.ajax.php b/modules/chat/chat.ajax.php
index 1c499ed..6dfaf48 100644
--- a/modules/chat/chat.ajax.php
+++ b/modules/chat/chat.ajax.php
@@ -126,13 +126,13 @@ class chat extends ajax_module{
}
if($session->userdata['rp_admin']==1){
$js="var menu = [
- { name: \"kick\", action: function (element) { sendMsg(\"/k \"+$(element).attr('id')); } },
- { name: \"jail\", action: function (element) { sendMsg(\"/jail \"+$(element).attr('id')); } },
+ { 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) { 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: \"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: \"whisperwindow\", action: function (element) { if ($('#'+$(element).attr('id')+'_whisper').length > 0){
$('#'+$(element).attr('id')+'_whisper').dialog('open');
$('#'+$(element).attr('id')+'_whisper').dialog('moveToTop');
@@ -140,12 +140,12 @@ class chat extends ajax_module{
create_whisper($(element).attr('id'),\"\");
} } },
{ name: \"report\", action: function (element) { reportwindow($(element).attr('id')); } },
- { name: \"reports\", action: function (element) { sendMsg(\"/rel \"+$(element).attr('id')); } }
+ { name: \"reports\", action: function (element) { window.socket.send(\"/rel \"+$(element).attr('id')); } }
];";
}else{
$js="var menu = [
- { name: \"ignore\", action: function (element) { sendMsg(\"/ig \"+$(element).attr('id')); } },
- { name: \"invite\", action: function (element) { sendMsg(\"/i \"+$(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: \"report\", action: function (element) { reportwindow($(element).attr('id')); } }
];";
}
diff --git a/modules/chat/chat.output.php b/modules/chat/chat.output.php
index 5a39f87..3eaa83e 100644
--- a/modules/chat/chat.output.php
+++ b/modules/chat/chat.output.php
@@ -35,7 +35,7 @@ class chat extends module{
if($db->num_rows($result)<=0){
$core->message('Sorry', 'You have to create a Char to participate.',FALSE,$config['path'].'/index.php');
}*/
- $rooms=array(array('room'=>'Lounge','selected'=>'selected="selected"'),array('room'=>'Flirt','selected'=>''));
+ $rooms=array(array('room'=>'Lounge','selected'=>'selected="selected"'),array('room'=>'Flirt','selected'=>''),array('room'=>'Quiz','selected'=>''));
$this->tpl->assign('options',$rooms);
if($session->userdata['allow_grimdark']==0){
$this->tpl->assign('usercount',$data['usercount']);
diff --git a/modules/chat/templates/default/allroomlist.tpl b/modules/chat/templates/default/allroomlist.tpl
index a920c3f..5fcdabb 100644
--- a/modules/chat/templates/default/allroomlist.tpl
+++ b/modules/chat/templates/default/allroomlist.tpl
@@ -12,7 +12,7 @@ No users.
{$key} 
{/if}
{foreach from=$user.u item=i}
-
{$i.l}{$i.n} 
+
{$i.l}{$i.n} 
{/foreach}
{/foreach}
{/if}
@@ -22,4 +22,4 @@ No users.
{$js}
$(".notice").rightClickMenu(menu);
-{/if}
+{/if}
\ No newline at end of file
diff --git a/modules/chat/templates/default/chat.tpl b/modules/chat/templates/default/chat.tpl
index b9d3a12..f6727bd 100644
--- a/modules/chat/templates/default/chat.tpl
+++ b/modules/chat/templates/default/chat.tpl
@@ -6,7 +6,7 @@ Raum:
-Es {$befinden} {$usercount} User im Chat.
+Es {$befinden} {$usercount} User im Chat.
@@ -20,3 +20,4 @@ Raum: