From: djk <djk>
Date: Sat, 22 May 1999 20:52:59 +0000 (+0000)
Subject: merge in changes from BAA
X-Git-Tag: R_1_28~16
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=77727aa5c288b8b34cb0e05cea45a367fa1f9b6c;p=spider.git

merge in changes from BAA
---

diff --git a/Changes b/Changes
index 11bea0bc..1fa3106c 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,9 @@
+22May99=======================================================================
+1. added check for -1 from Date::Parse and return undef for out of range dates
+2. added show/files and type commands
 21May99=======================================================================
 1. made set/nodx work again.
-2. mode dx stuff queue nicely again.
+2. made dx stuff queue nicely again.
 18May99=======================================================================
 1. Added announce dup checking.
 2. Added system announce filtering.
diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 61734e44..d5f57c03 100644
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -441,7 +441,8 @@ filearea 'bulletins' you want to look at file 'arld051' you would
 enter:-
    TYPE bulletins/arld051
 
-See also SHOW/FILES to see what fileareas are available and a list of content
+See also SHOW/FILES to see what fileareas are available and a 
+list of content.
 
 === 0^WX <text>^Send a weather message to local users
 === 0^WX FULL <text>^Send a weather message to all cluster users
diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 97aaa355..a43880a2 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -253,7 +253,7 @@ sub process
 			$f[3] =~ s/^\///o;   # remove the leading /
 			$f[3] = lc $f[3];	# to lower case;
 			dbg('msg', "incoming file $f[3]\n");
-			last SWITCH if $f[3] =~ /^(perl|cmd|local|src|lib|include|sys|msg|connect)/; # prevent access to executables
+			$f[3] = 'packclus/' . $f[3] unless $f[3] =~ /^packclus\//o;
 			
 			# create any directories
 			my @part = split /\//, $f[3];
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 7cde642c..04d62e4b 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -737,7 +737,7 @@ sub send_dx_spot
 			}
 		} elsif ($dxchan->is_user && $dxchan->{dx}) {
 			my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]);
-			$buf .= "\a\a" if $dxchan->beep;
+			$buf .= "\a\a" if $dxchan->{beep};
 			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
 				$dxchan->send($buf) if !$hops || ($hops && $filter);
 			} else {
diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 07e3f4cb..868110ea 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -72,7 +72,8 @@ sub cltounix
 	$date = "$1 $2 $3";
 	return 0 unless $time =~ /^([012]\d)([012345]\d)Z$/;
 	$time = "$1:$2 +0000";
-	return str2time("$date $time");
+	my $r = str2time("$date $time");
+	return $r == -1 ? undef : $r;
 }
 
 # turn a latitude in degrees into a string