X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fbin%2FMAPS.pm;h=babf46b2f819adeb6a844d9eb7101fdd91a7629e;hb=54fdcfd0cdc71457e3fae07fa28854546cf46e70;hp=bb0c368c3a23a11b12e05b4473721f86d4c4e06c;hpb=e80b69bc05be9f38b1e4b9af37f3232f5004f5e4;p=clearscm.git diff --git a/maps/bin/MAPS.pm b/maps/bin/MAPS.pm index bb0c368..babf46b 100644 --- a/maps/bin/MAPS.pm +++ b/maps/bin/MAPS.pm @@ -139,8 +139,8 @@ sub UserExists; sub Whitelist; BEGIN { - my $MAPS_username = "mapsadmin"; - my $MAPS_password = "mapsadmin"; + my $MAPS_username = "maps"; + my $MAPS_password = "spam"; OpenDB $MAPS_username, $MAPS_password; } # BEGIN @@ -242,12 +242,12 @@ sub AddEmail ($$$) { MAPSDB::AddEmail $sender, $subject, $data; } # AddEmail -sub AddList ($$$;$$) { - my ($listtype, $pattern, $sequence, $comment, $hit_count) = @_; +sub AddList ($$$;$$$) { + my ($listtype, $pattern, $sequence, $comment, $hit_count, $last_hit) = @_; $hit_count //= CountMsg $pattern; - MAPSDB::AddList $listtype, $pattern, $sequence, $comment, $hit_count; + MAPSDB::AddList $listtype, $pattern, $sequence, $comment, $hit_count, $last_hit; } # AddList sub AddUser ($$$$) { @@ -439,26 +439,26 @@ sub Nulllist ($;$$) { Logmsg "nulllist", $sender, "Discarded message"; } # Nulllist -sub OnBlacklist ($) { - my ($sender) = @_; +sub OnBlacklist ($;$) { + my ($sender, $update) = @_; - return CheckOnList "black", $sender; + return CheckOnList "black", $sender, $update; } # CheckOnBlacklist -sub OnNulllist ($) { - my ($sender) = @_; +sub OnNulllist ($;$) { + my ($sender, $update) = @_; - return CheckOnList "null", $sender; + return CheckOnList "null", $sender, $update; } # CheckOnNulllist -sub OnWhitelist { - my ($sender, $userid) = @_; +sub OnWhitelist ($;$$) { + my ($sender, $userid, $update) = @_; if (defined $userid) { MAPSDB::SetContext $userid; } # if - return CheckOnList "white", $sender; + return CheckOnList "white", $sender, $update; } # OnWhitelist sub OptimizeDB () {