use Fcntl;
eval {
- require Mail::Send;
+ require Net::SMTP;
};
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;
+$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
$queueinterval $lastq $importfn $minchunk $maxchunk $bulltopriv);
%work = (); # outstanding jobs
$maxchunk = 6000; # maximum chunk size
$bulltopriv = 1; # convert msgs with callsigns to private if they are bulls
$residencetime = 2*86400; # keep deleted messages for this amount of time
-
+$email_server = undef; # DNS address of smtp server if 'smtp'
+$email_prog = undef; # program name + args for sending mail
+$email_from = undef; # the from address the email will appear to be from
$badmsgfn = "$msgdir/badmsg.pl"; # list of TO address we wont store
$forwardfn = "$msgdir/forward.pl"; # the forwarding table
deletetime => '5,Deletion Time,cldatetime',
);
+# fix up the default sendmail if available
+for (qw(/usr/sbin/sendmail /usr/lib/sendmail /usr/sbin/sendmail)) {
+ if (-e $_) {
+ $email_prog = $_;
+ last;
+ }
+}
+
# allocate a new object
# called fromnode, tonode, from, to, datetime, private?, subject, nolinesper
sub alloc
# $to =~ s/-\d+$//o;
$self->{to} = ($to eq $main::mycall) ? $main::myalias : $to;
my $from = shift;
- $from =~ s/-\d+$//o;
$self->{from} = uc $from;
$self->{t} = shift;
$self->{private} = shift;
$self->{'read'} = shift;
$self->{rrreq} = shift;
$self->{delete} = shift;
- $self->{deletetime} = shift;
+ $self->{deletetime} = shift || ($self->{t} + $maxage);
+ $self->{keep} = shift;
$self->{gotit} = [];
# $self->{lastt} = $main::systime;
$self->{lines} = [];
# clean the message queue
clean_old() if $main::systime - $last_clean > 3600 ;
+
+ # actual remove all the 'deleted' messages in one hit.
+ # this has to be delayed until here otherwise it only does one at
+ # a time because @msg is rewritten everytime del_msg is called.
+ my @del = grep {!$_->{tonode} && $_->{delete} && !$_->{keep} && $_->{deletetime} < $main::systime} @msg;
+ for (@del) {
+ $_->del_msg;
+ }
+
$last_clean = $main::systime;
return;
}
{
my $ref = shift;
my $to = $ref->{to};
- my $uref = DXUser->get($to);
+ my $uref = DXUser->get_current($to);
my $dxchan = DXChannel->get($to);
- if (*Mail::Send && $uref && $uref->wantemail) {
+ if (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
my $email = $uref->email;
if ($email) {
- my @list = ref $email ? @{$email} : $email;
- my $msg = new Mail::Send Subject=>"[DXSpider: $ref->{from}] $ref->{subject}";
- $msg->to(@list);
- my $fh = $msg->open;
- print $fh "From: $ref->{from} To: $to On Node: $main::mycall Origin: $ref->{origin} Msgno: $ref->{msgno}\r\n\r\n";
- print $fh map {"$_\r\n"} $ref->read_msg_body;
- $fh->close;
- for (@list) {
- Log('msg', "Msgno $ref->{msgno} from $ref->{from} emailed to $_");
+ my @rcpt = ref $email ? @{$email} : $email;
+ my $fromaddr = $email_from || $main::myemail;
+ my @headers = ("To: $ref->{to}",
+ "From: $fromaddr",
+ "Subject: [DXSpider: $ref->{from}] $ref->{subject}",
+ "X-DXSpider-To: $ref->{to}",
+ "X-DXSpider-From: $ref->{from}\@$ref->{origin}",
+ "X-DXSpider-Gateway: $main::mycall"
+ );
+ my @data = ("Msgno: $ref->{msgno} To: $to From: $ref->{from}\@$ref->{origin} Gateway: $main::mycall",
+ "",
+ $ref->read_msg_body
+ );
+ my $msg;
+ undef $!;
+ if (*Net::SMTP && $email_server) {
+ $msg = Net::SMTP->new($email_server);
+ if ($msg) {
+ $msg->mail($fromaddr);
+ $msg->to(@rcpt);
+ $msg->data(map {"$_\n"} @headers, '', @data);
+ $msg->quit;
+ }
+ } elsif ($email_prog) {
+ $msg = new IO::File "|$email_prog " . join(' ', @rcpt);
+ if ($msg) {
+ print $msg map {"$_\r\n"} @headers, '', @data, '.';
+ $msg->close;
+ }
}
+ dbg("email forwarding error $!") if isdbg('msg') && !$msg && defined $!;
}
}
$dxchan->send($dxchan->msg('m9')) if $dxchan && $dxchan->is_user;
my $rr = $ref->{rrreq} ? '1' : '0';
my $priv = $ref->{private} ? '1': '0';
my $del = $ref->{delete} ? '1' : '0';
- my $delt = $ref->{deletetime} || '0';
- print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr^$del^$delt\n";
+ my $delt = $ref->{deletetime} || ($ref->{t} + $maxage);
+ my $keep = $ref->{keep} || '0';
+ print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr^$del^$delt^$keep\n";
print $fh "=== ", join('^', @{$ref->{gotit}}), "\n";
my $line;
$ref->{size} = 0;
foreach $line (@{$lines}) {
+ $line =~ s/[\x00-\x08\x0a-\x1f\x80-\x9f]/./g;
$ref->{size} += (length $line) + 1;
print $fh "$line\n";
}
confess "can't open msg file $fn $!";
}
}
+
}
# delete a message
{
my $self = shift;
my $dxchan = shift;
+ my $call = '';
+ $call = ' by ' . $dxchan->call if $dxchan;
if ($self->{tonode}) {
$self->{delete}++;
$self->{deletetime} = 0;
+ dbg("Msgno $self->{msgno} but marked as expunged$call") if isdbg('msg');
} else {
# remove it from the active message list
@msg = grep { $_ != $self } @msg;
- my $call = '';
- $call = ' by ' . $dxchan->call if $dxchan;
Log('msg', "Msgno $self->{msgno} expunged$call");
+ dbg("Msgno $self->{msgno} expunged$call") if isdbg('msg');
# remove the file
unlink filename($self->{msgno});
{
my $ref = shift;
my $t = shift;
+
+ return if $ref->{keep};
+
$t = $main::systime + $residencetime unless defined $t;
$ref->{delete}++;
$ref->store( [$ref->read_msg_body] );
}
+sub unmark_delete
+{
+ my $ref = shift;
+ my $t = shift;
+ $ref->{delete} = 0;
+ $ref->{deletetime} = 0;
+}
+
# clean out old messages from the message queue
sub clean_old
{
# mark old messages for deletion
foreach $ref (@msg) {
- if (ref($ref) && !$ref->{keep} && $ref->{t} < $main::systime - $maxage) {
+ if (ref($ref) && !$ref->{keep} && $ref->{deletetime} < $main::systime) {
# this is for IMMEDIATE destruction
$ref->{delete}++;
$ref->stop_msg($node);
# delay any outgoing messages that fail
- $ref->{waitt} = $main::systime + $waittime + rand(120) if $node ne $main::mycall;
+ $ref->{waitt} = $main::systime + $waittime + int rand(120) if $node ne $main::mycall;
delete $ref->{lastt};
next;
}
next if $ref->{tonode}; # ignore it if it already being processed
# is it awaiting deletion?
- if ($ref->{delete} && $main::systime >= $ref->{deletetime}) {
- $ref->del_msg;
- next;
- }
next if $ref->{delete};
# firstly, is it private and unread? if so can I find the recipient
# if all the available nodes are busy then stop
last if @nodelist == scalar grep { get_busy($_->call) } @nodelist;
}
+
+
}
# is there a message for me?
{
my $call = uc shift;
my $ref;
+ my $count;
foreach $ref (@msg) {
# is it for me, private and unread?
if ($ref->{to} eq $call && $ref->{private}) {
- return 1 if !$ref->{'read'};
+ $count++ unless $ref->{'read'} || $ref->{delete};
}
}
- return 0;
+ return $count;
}
# start the message off on its travels with a PC28
delete $self->{loc};
$self->func(undef);
$self->state('prompt');
+ } elsif ($line =~ m|^/+\w+|) {
+ # this is a command that you want display for your own reference
+ # or if it has TWO slashes is a command
+ $line =~ s|^/||;
+ my $store = $line =~ s|^/+||;
+ my @in = $self->run_cmd($line);
+ push @out, @in;
+ if ($store) {
+ foreach my $l (@in) {
+ if (my @ans = BadWords::check($l)) {
+ $self->{badcount} += @ans;
+ Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} subject: '$loc->{subject}' in msg") unless $loc->{reject};
+ Log('msg', "line: $l");
+ $loc->{reject}++;
+ }
+ push @{$loc->{lines}}, length($l) > 0 ? $l : " ";
+ }
+ }
} else {
if (my @ans = BadWords::check($line)) {
$self->{badcount} += @ans;
Log('msg', "line: $line");
$loc->{reject}++;
}
+
+ if ($loc->{lines} && @{$loc->{lines}}) {
+ push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
+ } else {
+ # temporarily store any R: lines so that we end up with
+ # only the first and last ones stored.
+ if ($line =~ m|^R:\d{6}/\d{4}|) {
+ push @{$loc->{tempr}}, $line;
+ } else {
+ if (exists $loc->{tempr}) {
+ push @{$loc->{lines}}, shift @{$loc->{tempr}};
+ push @{$loc->{lines}}, pop @{$loc->{tempr}} if @{$loc->{tempr}};
+ delete $loc->{tempr};
+ }
+ push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
+ }
+ }
# i.e. it ain't and end or abort, therefore store the line
- push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
}
}
return @out;
sub dir
{
my $ref = shift;
- my $flag = $ref->read ? '-' : ' ';
- $flag = 'D' if $ref->delete;
- return sprintf "%6d%s%s%5d %8.8s %8.8s %-6.6s %5.5s %-30.30s",
- $ref->msgno, $flag, $ref->private ? 'p' : ' ', $ref->size,
- $ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
+ my $flag = $ref->{private} && $ref->{read} ? '-' : ' ';
+ if ($ref->{keep}) {
+ $flag = '!';
+ } elsif ($ref->{delete}) {
+ $flag = $ref->{deletetime} > $main::systime ? 'D' : 'E';
+ }
+ return sprintf("%6d%s%s%5d %8.8s %8.8s %-6.6s %5.5s %-30.30s",
+ $ref->{msgno}, $flag, $ref->{private} ? 'p' : ' ',
+ $ref->{size}, $ref->{to}, $ref->{from}, cldate($ref->{t}),
+ ztime($ref->{t}), $ref->{subject});
}
# load the forward table
return 0;
}
+#
+# look down the forward table to see whether this is a valid bull
+# or not (ie it will forward somewhere even if it is only here)
+#
+sub valid_bull_addr
+{
+ my $call = shift;
+ my $i;
+
+ unless (@forward) {
+ return 1 if $call =~ /^ALL/;
+ return 1 if $call =~ /^DX/;
+ return 0;
+ }
+
+ for ($i = 0; $i < @forward; $i += 5) {
+ my ($sort, $field, $pattern, $action, $bbs) = @forward[$i..($i+4)];
+ if ($field eq 'T') {
+ if (!$pattern || $call =~ m{$pattern}i) {
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
sub dump_it
{
my $ref = shift;
return @out;
}
-no strict;
+#no strict;
sub AUTOLOAD
{
- my $self = shift;
+ no strict;
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
- $name =~ s/.*:://o;
+ $name =~ s/^.*:://o;
confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
- *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
- @_ ? $self->{$name} = shift : $self->{$name} ;
+ *$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+ goto &$AUTOLOAD;
}
1;