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;
$self->{'read'} = shift;
$self->{rrreq} = shift;
$self->{delete} = shift;
- $self->{deletetime} = shift;
+ $self->{deletetime} = shift || $self->{delete} ? 0 : ($self->{t} + $maxage);
$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} && $_->{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 (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
my $email = $uref->email;
my $rr = $ref->{rrreq} ? '1' : '0';
my $priv = $ref->{private} ? '1': '0';
my $del = $ref->{delete} ? '1' : '0';
- my $delt = $ref->{deletetime} || '0';
+ my $delt = $ref->{deletetime} || $ref->{t} + $maxage;
print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr^$del^$delt\n";
print $fh "=== ", join('^', @{$ref->{gotit}}), "\n";
my $line;
$ref->{size} = 0;
foreach $line (@{$lines}) {
- $line =~ s/[\x00-\x08\x0a-\x1f\xf0-\xff]/./g;
+ $line =~ s/[\x00-\x08\x0a-\x1f\x80-\x9f]/./g;
$ref->{size} += (length $line) + 1;
print $fh "$line\n";
}
}
}
- # 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} && $_->{deletetime} < $main::systime} @msg;
- for (@del) {
- $_->del_msg;
- }
}
# delete a message
# 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}++;
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}};
+ &$AUTOLOAD($self, @_);
+# *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
+# @_ ? $self->{$name} = shift : $self->{$name} ;
}
1;