X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=47d44c92c339e39a58c8b6076dfaf894619a57e9;hb=4a653ce0cd9140d4a7878cdf8ee835841ca039eb;hp=822beea5fe7bb3ce5ba0c0beaf81f5c206705f40;hpb=1910df7183401a62084e85c3ace179df492a6fbe;p=spider.git diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm index 822beea5..47d44c92 100644 --- a/perl/DXProtout.pm +++ b/perl/DXProtout.pm @@ -35,10 +35,9 @@ sub pc10 $user2 = ' '; $user1 = $to; } -# my $user2 = $via ? $to : ' '; -# my $user1 = $via ? $via : $to; $text = unpad($text); - $text = ' ' if !$text; + $text = ' ' unless $text && length $text > 0; + $text =~ s/\^/%5E/g; return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~"; } @@ -49,6 +48,7 @@ sub pc11 my $hops = get_hops(11); my $t = time; $text = ' ' if !$text; + $text =~ s/\^/%5E/g; return sprintf "PC11^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$hops^~", $freq, cldate($t), ztime($t); } @@ -61,6 +61,7 @@ sub pc12 $text = ' ' if !$text; $wx = '0' if !$wx; $tonode = '*' if !$tonode; + $text =~ s/\^/%5E/g; return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~"; } @@ -193,8 +194,8 @@ sub pc28 sub pc29 { my ($fromnode, $tonode, $stream, $text) = @_; - $text =~ s/\^/:/og; # remove ^ -# $text =~ s/\~/S/og; + $text = ' ' unless $text && length $text > 0; + $text =~ s/\^/%5E/og; # remove ^ return "PC29^$fromnode^$tonode^$stream^$text^~"; }