[TWiki-Dev] [SVN] PeterThoeny r27565 - twiki/branches/TWikiRelease06x00/MailInContrib/lib/TWiki/Contrib

[<de...@de...>]

Author: PeterThoeny
Date: 2014-05-27 19:42:05 -0500 (Tue, 27 May 2014)
New Revision: 27565
Trac url: http://develop.twiki.org/trac/changeset/27565

Modified:
   twiki/branches/TWikiRelease06x00/MailInContrib/lib/TWiki/Contrib/MailInContrib.pm
Log:
Item7490: Separate template for image attachments and regular attachments so that images can be embedded

Modified: twiki/branches/TWikiRelease06x00/MailInContrib/lib/TWiki/Contrib/MailInContrib.pm
===================================================================
--- twiki/branches/TWikiRelease06x00/MailInContrib/lib/TWiki/Contrib/MailInContrib.pm	2014-05-28 00:41:26 UTC (rev 27564)
+++ twiki/branches/TWikiRelease06x00/MailInContrib/lib/TWiki/Contrib/MailInContrib.pm	2014-05-28 00:42:05 UTC (rev 27565)
@@ -752,6 +752,10 @@
 
         my $attached = 0;
         my $atts     = '';
+        my $attTmpl  = TWiki::Func::expandTemplate( "MAILIN:$template:ATTACHMENT" )
+                    || '   * [[%ATTACHURL%/%A_FILE%][%A_FILE%]]';
+        my $imgTmpl  = TWiki::Func::expandTemplate( "MAILIN:$template:IMAGE" ) || $attTmpl;
+
         unless( $attFlags =~ /\bignore\b/ ) {
             foreach my $att (@$attachments) {
                 unless( $attFlags =~ /\bnosave\b/ ) {
@@ -767,13 +771,16 @@
                     }
                     $err .= $this->_saveAttachment( $aWeb, $aTopic, $att, $attFlags );
                 }
-                my $tmpl = TWiki::Func::expandTemplate( "MAILIN:$template:ATTACHMENT" )
-                    || '   * [[%ATTACHURL%/%A_FILE%][%A_FILE%]]';
+                my $fileName = _sanitizeAttachmentName( $att->{filename} );
+                my $tmpl = $attTmpl;
+                if( $fileName =~ /\.(jpg|jpeg|gif|png)$/i ) {
+                    $tmpl = $imgTmpl;
+                }
                 $tmpl =~ s/%MAILWEB%/$aWeb/g;
                 $tmpl =~ s/%MAILPREVWEB%/$pWeb/g;
                 $tmpl =~ s/%MAILTOPIC%/$aTopic/g;
                 $tmpl =~ s/%MAILPREVTOPIC%/$pTopic/g;
-                $tmpl =~ s/%A_FILE%/_sanitizeAttachmentName( $att->{filename} )/ge;
+                $tmpl =~ s/%A_FILE%/$fileName/g;
                 $atts .= $tmpl if( $attFlags =~ /\blink\b/ );
             }
         }