X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;fp=perl%2FDXCommandmode.pm;h=6e6b176ea928e4b3be8d5b51aa90351a12c0d7d2;hb=cee0bfe61e83c87a6ded04034cc57789a0950f9e;hp=64483a07407cd3ced942d7d248d63feae0f4c8f1;hpb=f2882b6c4323ac02e60e54bcf2d9c9fdd396de9b;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 64483a07..6e6b176e 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -335,6 +335,8 @@ sub normal
 			for (@{$self->{talklist}}) {
 				if ($self->{state} eq 'talk') {
 					$self->send_talks($_,  $self->msg('talkend'));
+				} elsif ($self->{state} eq 'chat') {
+					$self->send_talks($_,  $self->msg('chatend'));
 				} else {
 					$self->local_send('C', $self->msg('chatend', $_));
 				}
@@ -343,21 +345,25 @@ sub normal
 			delete $self->{talklist};
 		} elsif ($cmdline =~ m|^[/\w\\]+|) {
 			$cmdline =~ s|^/||;
-			my $sendit = $cmdline =~ s|^/+||;
+			my $sendit = ($cmdline = unpad($cmdline));
 			if (@bad = BadWords::check($cmdline)) {
 				$self->badcount(($self->badcount||0) + @bad);
 				LogDbg('DXCommand', "$self->{call} swore: '$cmdline' with badwords: '" . join(',', @bad) . "'");
 			} else {
-				my @cmd = split /\s*\\n\s*/, $cmdline;
-				foreach my $l (@cmd) {
-					my @in = $self->run_cmd($l);
+				my $c;
+				my @in;
+				if (($c) = $cmdline =~ /^cmd\s+(.*)$/) {
+					@in = $self->run_cmd($c);
 					$self->send_ans(@in);
+				} else {
+					push @in, $cmdline;
 					if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
 						foreach my $l (@in) {
 							for (@{$self->{talklist}}) {
 								if ($self->{state} eq 'talk') {
 									$self->send_talks($_, $l);
-								} else {
+								}
+								else {
 									send_chats($self, $_, $l)
 								}
 							}