X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=60c7f1086d228ccc03c68f5364fe9ee71134803d;hb=428f70e71f52606449895be3d6b0d4fae7c0bc75;hp=8b704ab5333f4f011617bd0ca88ea795dbf8743a;hpb=f0323dc530e2aa3fe5b8cd50b1c8c35aac67c52e;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 8b704ab5..60c7f108 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -47,7 +47,7 @@ $maxbadcount = 3;				# no of bad words allowed before disconnection
 
 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;
 
@@ -155,9 +155,9 @@ sub start
 	# do we need to send a forward/opernam?
 	my $lastoper = $user->lastoper || 0;
 	my $homenode = $user->homenode || ""; 
-	if ($homenode eq $main::mycall && $lastoper + $DXUser::lastoperinterval < $main::systime) {
+	if ($homenode eq $main::mycall && $main::systime >= $lastoper + $DXUser::lastoperinterval) {
 		run_cmd($main::me, "forward/opernam $call");
-		$user->lastoper($main::systime);
+		$user->lastoper($main::systime + ((int rand(10)) * 86400));
 	}
 
 	# run a script send the output to the punter
@@ -186,6 +186,9 @@ sub normal
 	my $self = shift;
 	my $cmdline = shift;
 	my @ans;
+
+	# save this for them's that need it
+	my $rawline = $cmdline;
 	
 	# remove leading and trailing spaces
 	$cmdline =~ s/^\s*(.*)\s*$/$1/;
@@ -262,9 +265,24 @@ sub normal
 			}
 			$self->state('prompt');
 			delete $self->{talklist};
-		} elsif ($cmdline =~ m(^/\w+)) {
-			$cmdline =~ s(^/)();
-			$self->send_ans(run_cmd($self, $cmdline));
+		} elsif ($cmdline =~ m|^/+\w+|) {
+			$cmdline =~ s|^/||;
+			my $sendit = $cmdline =~ s|^/+||;
+			my @in = $self->run_cmd($cmdline);
+			$self->send_ans(@in);
+			if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
+				foreach my $l (@in) {
+					my @bad;
+					if (@bad = BadWords::check($l)) {
+						$self->badcount(($self->badcount||0) + @bad);
+						Log('DXCommand', "$self->{call} swore: $l");
+					} else {
+						for (@{$self->{talklist}}) {
+							$self->send_talks($_, $l);
+						}
+					}
+				}
+			}
 			$self->send($self->talk_prompt);
 		} elsif ($self->{talklist} && @{$self->{talklist}}) {
 			# send what has been said to whoever is in this person's talk list
@@ -274,7 +292,7 @@ sub normal
 				Log('DXCommand', "$self->{call} swore: $cmdline");
 			} else {
 				for (@{$self->{talklist}}) {
-					$self->send_talks($_, $cmdline);
+					$self->send_talks($_, $rawline);
 				}
 			}
 			$self->send($self->talk_prompt) if $self->{state} eq 'talk';
@@ -286,9 +304,9 @@ sub normal
 		no strict 'refs';
 		my @ans;
 		if (ref $self->{edit}) {
-			eval { @ans = $self->{edit}->$func($self, $cmdline)};
+			eval { @ans = $self->{edit}->$func($self, $rawline)};
 		} else {
-			eval {	@ans = &{$self->{func}}($self, $cmdline) };
+			eval {	@ans = &{$self->{func}}($self, $rawline) };
 		}
 		if ($@) {
 			$self->send_ans("Syserr: on stored func $self->{func}", $@);
@@ -628,7 +646,7 @@ sub clear_cmd_cache
 	no strict 'refs';
 	
 	for (keys %Cache) {
-		undef *{$_};
+		undef *{$_} unless /cmd_cache/;
 		dbg("Undefining cmd $_") if isdbg('command');
 	}
 	%cmd_cache = ();