X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=153a2c1b1dc998379fd3e69ea999d7bd3f6a47d9;hb=48f0cb90d0cfbe3037f353fc25adfc33561634fa;hp=f4a1b7aba0e66dd6818d288e1e229b90d03a30b3;hpb=cbf3c0cd90df4c4df05dae6a00d03f7f9482d631;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index f4a1b7ab..153a2c1b 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 #
 # Notes for implementors:-
@@ -32,12 +32,6 @@ eval {
 
 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
@@ -72,30 +66,30 @@ $importfn = "$msgdir/import";       # import directory
 
 
 %valid = (
-		  fromnode => '5,From Node',
-		  tonode => '5,To Node',
-		  to => '0,To',
-		  from => '0,From',
-		  t => '0,Msg Time,cldatetime',
-		  private => '5,Private,yesno',
-		  subject => '0,Subject',
-		  linesreq => '0,Lines per Gob',
-		  rrreq => '5,Read Confirm,yesno',
-		  origin => '0,Origin',
-		  lines => '5,Data',
-		  stream => '9,Stream No',
+		  'read' => '5,Times read',
 		  count => '5,Gob Linecnt',
+		  delete => '5,Awaiting Delete,yesno',
+		  deletetime => '5,Deletion Time,cldatetime',
 		  file => '5,File?,yesno',
+		  from => '0,From',
+		  fromnode => '5,From Node',
 		  gotit => '5,Got it Nodes,parray',
-		  lines => '5,Lines,parray',
-		  'read' => '5,Times read',
-		  size => '0,Size',
-		  msgno => '0,Msgno',
 		  keep => '0,Keep this?,yesno',
 		  lastt => '5,Last processed,cldatetime',
+		  lines => '5,Data',
+		  lines => '5,Lines,parray',
+		  linesreq => '0,Lines per Gob',
+		  msgno => '0,Msgno',
+		  origin => '0,Origin',
+		  private => '5,Private,yesno',
+		  rrreq => '5,Read Confirm,yesno',
+		  size => '0,Size',
+		  stream => '9,Stream No',
+		  subject => '0,Subject',
+		  t => '0,Msg Time,cldatetime',
+		  to => '0,To',
+		  tonode => '5,To Node',
 		  waitt => '5,Wait until,cldatetime',
-		  delete => '5,Awaiting Delete,yesno',
-		  deletetime => '5,Deletion Time,cldatetime',
 		 );
 
 # fix up the default sendmail if available
@@ -130,7 +124,7 @@ sub alloc
 	$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;
 }
@@ -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
-	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');
@@ -355,13 +349,12 @@ sub handle_32
 					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) {
-						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;
@@ -483,7 +476,7 @@ sub notify
 {
 	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;
@@ -1114,7 +1107,7 @@ sub do_send_stuff
 					$ref->notify;
 				}
 			} else {
-				Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
+				LogDbg('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
 			}
 			
 			delete $loc->{lines};