projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do non blocking connects
[spider.git]
/
perl
/
DXProtout.pm
diff --git
a/perl/DXProtout.pm
b/perl/DXProtout.pm
index 3d3a46bc1c01a46bb1ae3561dafd3d2cc242c888..47d44c92c339e39a58c8b6076dfaf894619a57e9 100644
(file)
--- a/
perl/DXProtout.pm
+++ b/
perl/DXProtout.pm
@@
-27,10
+27,17
@@
use strict;
sub pc10
{
my ($from, $to, $via, $text) = @_;
sub pc10
{
my ($from, $to, $via, $text) = @_;
- my $user2 = $via ? $to : ' ';
- my $user1 = $via ? $via : $to;
+ my ($user1, $user2);
+ if ($via && $via ne $to) {
+ $user1 = $via;
+ $user2 = $to;
+ } else {
+ $user2 = ' ';
+ $user1 = $to;
+ }
$text = unpad($text);
$text = unpad($text);
- $text = ' ' if !$text;
+ $text = ' ' unless $text && length $text > 0;
+ $text =~ s/\^/%5E/g;
return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~";
}
return "PC10^$from^$user1^$text^*^$user2^$main::mycall^~";
}
@@
-41,6
+48,7
@@
sub pc11
my $hops = get_hops(11);
my $t = time;
$text = ' ' if !$text;
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);
}
return sprintf "PC11^%.1f^$dxcall^%s^%s^$text^$mycall^$main::mycall^$hops^~", $freq, cldate($t), ztime($t);
}
@@
-53,6
+61,7
@@
sub pc12
$text = ' ' if !$text;
$wx = '0' if !$wx;
$tonode = '*' if !$tonode;
$text = ' ' if !$text;
$wx = '0' if !$wx;
$tonode = '*' if !$tonode;
+ $text =~ s/\^/%5E/g;
return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
}
return "PC12^$call^$tonode^$text^$sysop^$main::mycall^$wx^$hops^~";
}
@@
-185,8
+194,8
@@
sub pc28
sub pc29
{
my ($fromnode, $tonode, $stream, $text) = @_;
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^~";
}
return "PC29^$fromnode^$tonode^$stream^$text^~";
}
@@
-330,6
+339,7
@@
sub pc85
my($fromnode, $tonode, $call, $msg) = @_;
return "PC85^$tonode^$fromnode^$call^$msg^~";
}
my($fromnode, $tonode, $call, $msg) = @_;
return "PC85^$tonode^$fromnode^$call^$msg^~";
}
+
1;
__END__
1;
__END__