pmg config: fix avast scan executable path documentation

[pmg-api.git] / PMG / HTMLMail.pm

diff --git a/PMG/HTMLMail.pm b/PMG/HTMLMail.pm
index 3f2f7b00fe34df55ff1810f195fc2293729c7f76..e30ede126100791e94e7202d79cf5f60715338e3 100644 (file)
--- a/PMG/HTMLMail.pm
+++ b/PMG/HTMLMail.pm
@@ -65,20 +65,10 @@ sub getscrubber {
 
     # see http://web.archive.org/web/20110726052341/http://feedparser.org/docs/html-sanitization.html
 
-    my @allow = qw(a abbr acronym address area b big blockquote br button caption center cite code col colgroup dd del dfn dir div dl dt em fieldset font form h1 h2 h3 h4 h5 h6 hr i img input ins kbd label legend li map menu ol optgroup option p pre q s samp select small span strike strong sub sup title table tbody td textarea tfoot th thead tr tt u ul var html body);
+    my @allow = qw(a abbr acronym address area b big blockquote br button caption center cite code col colgroup dd del dfn dir div dl dt em fieldset font form h1 h2 h3 h4 h5 h6 head hr i img input ins kbd label legend li map menu ol optgroup option p pre q s samp select small span style strike strong sub sup title table tbody td textarea tfoot th thead tr tt u ul var html body);
+
+    my @rules = ( script => 0 );
 
-    my @rules = (
-       script => 0,
-       img => {
-           alt => 1,                 # alt attribute allowed
-           width => 1,
-           height => 1,
-           border => 1,
-           src => $viewimages ? qr{^(?!(?:java)?script)}i : 0,
-           '*' => 0, # deny all other attributes
-       },
-    );
-                                                                            #
     my @default = (
        0 =>  # default rule, deny all tags
        {
@@ -91,6 +81,7 @@ sub getscrubber {
            alt => 1,
            axis => 1,
            border => 1,
+           bgcolor => 1,
            cellpadding => 1,
            cellspacing => 1,
            char => 1,
@@ -141,7 +132,9 @@ sub getscrubber {
            shape => 1,
            size => 1,
            span => 1,
+           src => $viewimages ? qr{^(?!(?:java)?script)}i : 0,
            start => 1,
+           style => 1,
            summary => 1,
            tabindex => 1,
            target => 1,
@@ -160,11 +153,11 @@ sub getscrubber {
        rules   => \@rules,
        default => \@default,
        comment => 0,
-       script => 0,
-       style => 0,
        process => 0,
     );
 
+    $scrubber->style(1);
+
     return $scrubber;
 }
 
@@ -223,9 +216,7 @@ my $read_part = sub {
 };
 
 my $find_images = sub {
-    my ($entity) = @_;
-
-    my $res = {};
+    my ($cid_hash, $entity) = @_;
 
     foreach my $part ($entity->parts)  {
        if (my $rawcid = $part->head->get('Content-Id')) {
@@ -234,14 +225,12 @@ my $find_images = sub {
                my $ctype = $part->head->mime_attr('Content-type') // '';
                if ($ctype =~ m!^image/!) {
                    if (defined(my $raw = $read_part->($part))) {
-                       $res->{$cid} = "data:$ctype;base64," . encode_base64($raw, '');
+                       $cid_hash->{$cid} = "data:$ctype;base64," . encode_base64($raw, '');
                    }
                }
            }
        }
     }
-
-    return $res;
 };
 
 sub entity_to_html {
@@ -295,11 +284,11 @@ sub entity_to_html {
        }
 
        # get related/embedded images as data uris
-       my $cid_hash = $find_images->($entity);
+       $find_images->($cid_hash, $entity);
 
        my $alt = $multi_part || $html_part || $text_part;
 
-       return entity_to_html ($alt, $cid_hash, $viewimages, $allowhref) if $alt;
+       return entity_to_html($alt, $cid_hash, $viewimages, $allowhref) if $alt;
     }
 
     return undef;