X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fchat.pl;h=80cb12664e49e361e19a4667b694601860d4eae7;hb=0c1082247c57a0ec2fa35a0a81af54b1e6ac2b89;hp=4062358cc57279feacbbe1df39e1266da852289c;hpb=defc60f3e7fab9bb99d1c9f7b8bccc4ec37628d5;p=spider.git

diff --git a/cmd/chat.pl b/cmd/chat.pl
index 4062358c..80cb1266 100644
--- a/cmd/chat.pl
+++ b/cmd/chat.pl
@@ -10,7 +10,7 @@
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line, 2;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 return (1, $self->msg('e34')) unless @f == 2;
 return (1, $self->msg('e28')) unless $self->registered;
 
@@ -29,15 +29,17 @@ $line =~ s/\^/:/og;
 my @bad;
 if (@bad = BadWords::check($line)) {
 	$self->badcount(($self->badcount||0) + @bad);
-	Log('DXCommand', "$self->{call} swore: $line");
+	LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
 	Log('chat', $target, $from, "[to $from only] $line");
 	return (1, "$target de $from <$t>: $line");
 }
 
-#PC12^IZ4DYU^GROUP^PSE QSL INFO TO A71AW TNX IN ADV 73's^ ^IK5PWJ-6^0^H21^~
+#PC12^IZ4DYU^*^PSE QSL INFO TO A71AW TNX IN ADV 73's^<group>^IK5PWJ-6^0^H21^~
 my $msgid = DXProt::nextchatmsgid();
 $text = "#$msgid $text";
 
-DXProt::send_chat($self, DXProt::pc12($from, $text, $target), $from, $target, $text, ' ', $main::mycall, '0');
+$main::me->normal(DXProt::pc93($to, $from, undef, $text));
+
+#DXProt:):send_chat($self, 1, DXProt::pc12($from, $text, '*', $target), $from, '*', $text, $target, $main::mycall, '0');
 
 return (1, ());