projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed swopping on msgs in all places
[spider.git]
/
perl
/
DXMsg.pm
diff --git
a/perl/DXMsg.pm
b/perl/DXMsg.pm
index 7cef3adb4f8f5bb7a8415e8a3cf196d8c20e53a4..168a978280e56337e8b17db7de48e894b92347c1 100644
(file)
--- a/
perl/DXMsg.pm
+++ b/
perl/DXMsg.pm
@@
-846,13
+846,14
@@
sub do_send_stuff
my $mycall = $main::mycall;
$ref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
uc $to,
my $mycall = $main::mycall;
$ref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
uc $to,
- $self->call,
+
exists $loc->{from} ? $loc->{from} :
$self->call,
$systime,
$loc->{private},
$loc->{subject},
$systime,
$loc->{private},
$loc->{subject},
- $mycall,
+
exists $loc->{origin} ? $loc->{origin} :
$mycall,
'0',
$loc->{rrreq});
'0',
$loc->{rrreq});
+ $ref->swop_it($self->call);
$ref->store($loc->{lines});
$ref->add_dir();
push @out, $self->msg('m11', $ref->{msgno}, $to);
$ref->store($loc->{lines});
$ref->add_dir();
push @out, $self->msg('m11', $ref->{msgno}, $to);
@@
-1109,12
+1110,14
@@
sub import_one
$rr = '1';
} elsif ($f eq '@' && @f) { # this is bbs syntax, for origin
$origin = uc shift @f;
$rr = '1';
} elsif ($f eq '@' && @f) { # this is bbs syntax, for origin
$origin = uc shift @f;
+ } elsif ($f eq '<' && @f) { # this is bbs syntax for from call
+ $from = uc shift @f;
} elsif ($f =~ /^\$/) { # this is bbs syntax for a bid
next;
} elsif ($f =~ /^\$/) { # this is bbs syntax for a bid
next;
- } elsif ($f =~ /^</) { # this is bbs syntax for from call
+ } elsif ($f =~ /^<
\S+
/) { # this is bbs syntax for from call
($from) = $f =~ /^<(\S+)$/;
($from) = $f =~ /^<(\S+)$/;
- } elsif ($f
eq '<' && @f) { # this is bbs syntax for from call
-
$from = uc shift @f
;
+ } elsif ($f
=~ /^\@\S+/) { # this is bbs syntax for origin
+
($origin) = $f =~ /^\@(\S+)$/
;
} else {
# callsign ?
} else {
# callsign ?
@@
-1170,6
+1173,7
@@
sub import_one
$origin,
'0',
$rr);
$origin,
'0',
$rr);
+ $mref->swop_it($main::mycall);
$mref->store($ref);
$mref->add_dir();
push @out, $dxchan->msg('m11', $mref->{msgno}, $to);
$mref->store($ref);
$mref->add_dir();
push @out, $dxchan->msg('m11', $mref->{msgno}, $to);