X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FFilter.pm;h=5e89b08f68fe530ff08b1fd733863a7016a7aa05;hb=ccd8bcf26e31695caa0c6015e0756eebb2428cb1;hp=2c32bf025981465e9ae9b8f374fddeb2fa53527c;hpb=72568e838d146250a78fea19bd4bbafc760e6a49;p=spider.git

diff --git a/perl/Filter.pm b/perl/Filter.pm
index 2c32bf02..5e89b08f 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -368,7 +368,7 @@ sub parse
 	my $user;
 	
 	# check the line for non legal characters
-	return ('ill', $dxchan->msg('e19')) if $line =~ /[^\s\w,_\-\*\/\(\)]/;
+	return ('ill', $dxchan->msg('e19')) if $line =~ /[^\s\w,_\-\*\/\(\)!]/;
 	
 	# add some spaces for ease of parsing
 	$line =~ s/([\(\)])/ $1 /g;
@@ -444,12 +444,16 @@ sub parse
 
 				if ($s) {
 					$s .= $conj ;
-					$s .= $not;
 					$user .= $conj;
-					$user .= $not;
 					$conj = ' && ';
-					$not = "";
 				}
+
+				if ($not) {
+					$s .= $not;
+					$user .= $not;
+					$not = '';
+				}
+
 				$user .= "$tok $val";
 				
 				my $fref;