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

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 53695e51..af28b192 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -41,7 +41,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
 			$pingint $obscount %pc19list $chatdupeage $chatimportfn
 			$investigation_int $pc19_version $myprot_version
-			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
+			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist
 			$eph_pc15_restime $pc92_update_period $pc92_obs_timeout
 			%pc92_find $pc92_find_timeout $pc92_short_update_period
@@ -63,8 +63,7 @@ $badspotter = new DXHash "badspotter";
 $badnode = new DXHash "badnode";
 $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
-$rspfcheck = 1;
-$eph_restime = 180;
+$eph_restime = 60;
 $eph_info_restime = 60*60;
 $eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
@@ -659,7 +658,8 @@ sub send_announce
 		}
 	}
 
-	if (AnnTalk::dup($from, $target, $_[2])) {
+	# the sysop ('*') thing is an attempt to minimise the damage caused by non-updated PC93 generators
+	if (AnnTalk::dup($from, $target, $_[2]) || ($_[3] eq '*' && AnnTalk::dup($from, 'ALL', $_[2]))) {
 		my $dxchan = DXChannel::get($from);
 		if ($self == $main::me && $dxchan && $dxchan->is_user) {
 			if ($dxchan->priv < 5) {
@@ -1541,7 +1541,7 @@ sub import_chat
 				Log('ann', $target, $main::mycall, $text);
 				$main::me->normal(DXProt::pc93($target, $main::mycall, $via, $text));
 			} else {
-				$main::me->send_chats($target, $text);
+				DXCommandmode::send_chats($main::me, $target, $text);
 			}
 		}
 	}