#################################################################################
#
# File: $RCSfile: MAPSDB.pm,v $
-# Revision: $Revision: 1.1 $
+# Revision: $Revision: 1.1 $
# Description: MAPS Database routines
# Author: Andrew@DeFaria.com
# Created: Fri Nov 29 14:17:21 2002
$update //= 1;
- my $status = 0;
- my $rule;
+ my $status = 0;
+ my ($rule, $hit_count);
my $statement = "select pattern, domain, comment, sequence, hit_count from list where userid = '$userid' and type = '$listtype'";
while (my @row = $sth->fetchrow_array) {
last if !@row;
- my $hit_count = pop (@row);
+ $hit_count = pop (@row);
my $sequence = pop (@row);
my $comment = pop (@row);
my $domain = pop (@row);
$sth->finish;
- return ($status, $rule);
+ return ($status, $rule, $hit_count);
} # CheckOnList
sub CleanEmail ($) {
foreach my $sender (ReturnSenders $userid, $type, $next, $lines, $date) {
my @msgs = ReturnMessages $userid, $sender;
my @msgs2 = @msgs;
+ my $onlist;
+ my $rule = 'none';
+ my $hit_count = 0;
- my ($onlist, $rule);
- $rule = 'none';
-
- ($onlist, $rule) = OnWhitelist $sender, $userid, 0;
+ ($onlist, $rule, $hit_count) = OnWhitelist $sender, $userid, 0;
unless ($onlist) {
- ($onlist, $rule) = OnBlacklist $sender, 0;
+ ($onlist, $rule, $hit_count) = OnBlacklist $sender, 0;
unless ($onlist) {
- ($onlist, $rule) = OnNulllist $sender, 0;
+ ($onlist, $rule, $hit_count) = OnNulllist $sender, 0;
} # unless
} # unless
if ($rule =~ /(\w+):(\d+)/) {
my $list = $1;
my $sequence = $2 - 1;
- my $link = "<a href=\"/maps/php/list.php?type=$list&next=$sequence\">$list:$2</a>";
+ my $link = "<a href=\"/maps/php/list.php?type=$list&next=$sequence\">$list:$2</a>/$hit_count";
$rule =~ s/\w+:\d+/$link/;
} # if