projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mojo' of /scm/spider into mojo
[spider.git]
/
perl
/
DXMsg.pm
diff --git
a/perl/DXMsg.pm
b/perl/DXMsg.pm
index f4a1b7aba0e66dd6818d288e1e229b90d03a30b3..e6662b59472fce0d46e8496235f3c52f271133e4 100644
(file)
--- a/
perl/DXMsg.pm
+++ b/
perl/DXMsg.pm
@@
-4,7
+4,7
@@
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
-#
$Id$
+#
#
#
# Notes for implementors:-
#
#
# Notes for implementors:-
@@
-32,12
+32,6
@@
eval {
use strict;
use strict;
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean $residencetime
@badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
$email_server $email_prog $email_from
use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean $residencetime
@badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
$email_server $email_prog $email_from
@@
-130,7
+124,7
@@
sub alloc
$self->{gotit} = [];
# $self->{lastt} = $main::systime;
$self->{lines} = [];
$self->{gotit} = [];
# $self->{lastt} = $main::systime;
$self->{lines} = [];
- $self->{private} = 1 if $bulltopriv && DXUser
->
get_current($self->{to});
+ $self->{private} = 1 if $bulltopriv && DXUser
::
get_current($self->{to});
return $self;
}
return $self;
}
@@
-206,7
+200,7
@@
sub handle_28
$ref->{lastt} = $main::systime;
# look to see whether this is a non private message sent to a known callsign
$ref->{lastt} = $main::systime;
# look to see whether this is a non private message sent to a known callsign
- my $uref = DXUser
->
get_current($ref->{to});
+ my $uref = DXUser
::
get_current($ref->{to});
if (is_callsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
$ref->{private} = 1;
dbg("set bull to $ref->{to} to private") if isdbg('msg');
if (is_callsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
$ref->{private} = 1;
dbg("set bull to $ref->{to} to private") if isdbg('msg');
@@
-355,13
+349,12
@@
sub handle_32
push @words, [$_, @bad] if @bad;
}
if (@words) {
push @words, [$_, @bad] if @bad;
}
if (@words) {
- dbg("$ref->{from} swore: $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $dxchan->call) if isdbg('msg');
- Log('msg',"$ref->{from} swore: $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
- dbg("subject: $ref->{subject}");
- Log('msg',"subject: $ref->{subject}");
+ LogDbg('msg',"$ref->{from} swore: $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
+ LogDbg('msg',"subject: $ref->{subject}");
for (@words) {
for (@words) {
- dbg("line: $_->[0] (using words: ". join(',',@{$_->[1]}).")");
- Log('msg', "line: $_->[0] (using words: ". join(',',@{$_->[1]}).")");
+ my $r = $_;
+ my $line = shift @$r;
+ LogDbg('msg', "line: $line (using words: ". join(',', @$r).")");
}
$ref->stop_msg($fromnode);
return;
}
$ref->stop_msg($fromnode);
return;
@@
-483,7
+476,7
@@
sub notify
{
my $ref = shift;
my $to = $ref->{to};
{
my $ref = shift;
my $to = $ref->{to};
- my $uref = DXUser
->
get_current($to);
+ my $uref = DXUser
::
get_current($to);
my $dxchan = DXChannel::get($to);
if (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
my $email = $uref->email;
my $dxchan = DXChannel::get($to);
if (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
my $email = $uref->email;
@@
-1114,7
+1107,7
@@
sub do_send_stuff
$ref->notify;
}
} else {
$ref->notify;
}
} else {
- Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
+ Log
Dbg
('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
}
delete $loc->{lines};
}
delete $loc->{lines};