X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtout.pm;h=a8a609b96d76cfbdc2024d49453477f35d792161;hb=5b3c2c5e342c23fbab96b7573c5963344617878f;hp=b31eacdfe111942ded8607bc9759d85e1179a56c;hpb=f47bc72134852f42fe03ab6afe91a9ba1b0ff705;p=spider.git

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index b31eacdf..a8a609b9 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -68,12 +68,12 @@ sub pc12
 {
 	my ($call, $text, $tonode, $sysop, $wx, $origin) = @_;
 	my $hops = get_hops(12);
-	$origin ||= $main::mycall;
-	$sysop ||= ' ';
 	$text ||= ' ';
-	$wx ||= '0';
-	$tonode ||= '*';
 	$text =~ s/\^/%5E/g;
+	$tonode ||= '*';
+	$sysop ||= ' ';
+	$wx ||= '0';
+	$origin ||= $main::mycall;
 	return "PC12^$call^$tonode^$text^$sysop^$origin^$wx^$hops^~";
 }
 
@@ -123,7 +123,8 @@ sub pc17
 # Request init string
 sub pc18
 {
-	return "PC18^DXSpider Version: $main::version Build: $main::build^$DXProt::myprot_version^";
+	my $v = $DXProt::myprot_version + $main::version;
+	return "PC18^DXSpider Version: $main::version Build: $main::build^$v^";
 }
 
 #