X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=10d1e4dc77bb816157501d3bf30a66a2f4d0431f;hb=cb5f21f8f960a003b80e7415f945d718f4b7d43e;hp=8db35b9df78c29c1721d549084ac77f8e5b2a458;hpb=e18c9b8b9a003bfb56416ab1d2aee0f232146d25;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 8db35b9d..10d1e4dc 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -34,7 +34,7 @@ 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;
 
@@ -435,7 +435,7 @@ sub notify
 {
 	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;
@@ -518,7 +518,7 @@ sub store
 			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";
 			}
@@ -1506,19 +1506,22 @@ sub import_one
 	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;