increase interval between auto for/opers and add up to 9 days of randomi-

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 8b704ab5333f4f011617bd0ca88ea795dbf8743a..d562437a6460d3ca380803db27784b3d2417ba15 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -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/;
@@ -274,7 +277,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 +289,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}", $@);