Add default rulename of 'unknown' to Actions

[pmg-api.git] / PMG / RuleDB / Block.pm

diff --git a/PMG/RuleDB/Block.pm b/PMG/RuleDB/Block.pm
index ffdef401f348f290b80f56929f83666a0a093e11..c758787e58aff0b3fac21e928435269123aefda6 100644 (file)
--- a/PMG/RuleDB/Block.pm
+++ b/PMG/RuleDB/Block.pm
@@ -2,9 +2,9 @@ package PMG::RuleDB::Block;
 
 use strict;
 use warnings;
-use Carp;
 use DBI;
 use Digest::SHA;
+use Encode;
 
 use PVE::SafeSyslog;
 
@@ -26,10 +26,6 @@ sub otype_text {
     return 'Block';
 }
 
-sub oicon {
-    return 'block.gif';
-}
-
 sub oisedit {
     return 0;   
 }
@@ -47,7 +43,7 @@ sub new {
     
     my $class = ref($type) || $type;
  
-    my $self = $class->SUPER::new (otype(), $ogroup);
+    my $self = $class->SUPER::new($class->otype(), $ogroup);
    
     return $self;
 }
@@ -93,6 +89,8 @@ sub execute {
     my ($self, $queue, $ruledb, $mod_group, $targets, 
        $msginfo, $vars, $marks) = @_;
 
+    my $rulename = $vars->{RULE} // 'unknown';
+
     if ($msginfo->{testmode}) {
        my $fh = $msginfo->{test_fh};
        print $fh "block from: $msginfo->{sender}\n";
@@ -100,7 +98,7 @@ sub execute {
     }
 
     foreach my $to (@$targets) {
-       syslog('info', "%s: block mail to <%s>", $queue->{logid}, $to);
+       syslog('info', "%s: block mail to <%s> (rule: %s)", $queue->{logid}, encode('UTF-8', $to), $rulename);
     }
 
     $queue->set_status($targets, 'blocked');