X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=53695e51846a0bf140f75efe0ff3bf6cd42af065;hb=e4a8ea5a407f640bc6e1efd6ef6b5f88f8f0980a;hp=3e33ec33d3096f67284f5a214963acecaaf50696;hpb=d0d643e52b8c7ab9f481c78edb8ab953a5da3b29;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 3e33ec33..53695e51 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1533,18 +1533,15 @@ sub import_chat
 
 		foreach my $text (@msg) {
 			next unless $text && $text !~ /^\s*#/;
-			if ($target eq 'ALL' || $target eq 'LOCAL' || $target eq 'SYSOP') {
-				my $sysopflag = $target eq 'SYSOP' ? '*' : ' ';
-				if ($target ne 'LOCAL') {
-					send_announce($main::me, pc12($main::mycall, $text, '*', $sysopflag), $main::mycall, '*', $text, $sysopflag, $main::mycall, '0');
-				} else {
-					Log('ann', 'LOCAL', $main::mycall, $text);
-					DXChannel::broadcast_list("To LOCAL de ${main::mycall}: $text\a", 'ann', undef, DXCommandmode->get_all());
-				}
+			if ($target eq 'ALL' || $target eq 'LOCAL' || $target eq 'SYSOP' || $target eq 'WX') {
+				my $sysop = uc $target eq 'SYSOP' ? '*' : ' ';
+				my $wx = uc $target eq 'WX' ? '1' : '0';
+				my $via = $target;
+				$via = '*' if $target eq 'ALL' || $target eq 'SYSOP';
+				Log('ann', $target, $main::mycall, $text);
+				$main::me->normal(DXProt::pc93($target, $main::mycall, $via, $text));
 			} else {
-				my $msgid = nextchatmsgid();
-				$text = "#$msgid $text";
-				send_chat($main::me, pc12($main::mycall, $text, '*', $target), $main::mycall, '*', $text, $target, $main::mycall, '0');
+				$main::me->send_chats($target, $text);
 			}
 		}
 	}