projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct convert-users-v3-to-v4.pl
[spider.git]
/
perl
/
BadWords.pm
diff --git
a/perl/BadWords.pm
b/perl/BadWords.pm
index d0572cc2de4cb9f99b60b02461383d56c8117e6f..141b3e9a729b6a933149cb0bf71bf4a942938285 100644
(file)
--- a/
perl/BadWords.pm
+++ b/
perl/BadWords.pm
@@
-3,7
+3,7
@@
#
# Copyright (c) 2000 Dirk Koopman
#
#
# Copyright (c) 2000 Dirk Koopman
#
-#
$Id$
+#
#
package BadWords;
#
package BadWords;
@@
-19,9
+19,9
@@
use IO::File;
use vars qw($badword $regexcode);
use vars qw($badword $regexcode);
-my $oldfn =
"$main::data/badwords"
;
-my $regex =
"$main::data/badw_regex"
;
-my $bwfn =
"$main::data/badword"
;
+my $oldfn =
localdata("badwords")
;
+my $regex =
localdata("badw_regex")
;
+my $bwfn =
localdata("badword")
;
# copy issue ones across
filecopy("$regex.gb.issue", $regex) unless -e $regex;
# copy issue ones across
filecopy("$regex.gb.issue", $regex) unless -e $regex;
@@
-29,12
+29,6
@@
filecopy("$bwfn.issue", $bwfn) unless -e $bwfn;
$badword = new DXHash "badword";
$badword = new DXHash "badword";
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
# load the badwords file
sub load
{
# load the badwords file
sub load
{
@@
-106,8
+100,7
@@
sub check
return @out if @out;
return @out if @out;
- for (split(/\s+/, $s)) {
- s/\'?S$//;
+ for (split(/\b/, $s)) {
push @out, $_ if $badword->in($_);
}
push @out, $_ if $badword->in($_);
}