Putting 4.2.0 on top of 4.0.17

[usit-rt.git] / share / html / Ticket / ShowEmailRecord.html

diff --git a/share/html/Ticket/ShowEmailRecord.html b/share/html/Ticket/ShowEmailRecord.html
index bb754db343f2801f7640881bb23b9a18012e1e30..2d4be7da92eeea9f0420ff424ea4b24f34a8f6a9 100644 (file)
--- a/share/html/Ticket/ShowEmailRecord.html
+++ b/share/html/Ticket/ShowEmailRecord.html
@@ -50,10 +50,16 @@ $Attachment => undef
 $Transaction => undef
 </%ARGS>
 <%INIT>
+my $plain_text_mono
+    = RT->Config->Get( 'PlainTextMono', $session{'CurrentUser'} );
+my $use_brs = !$plain_text_mono;
+
 my $show_content = sub {
     my $attach = shift;
     if ( $attach->ContentType =~ m{^(?:text|message)/}i ) {
-        $m->out( $m->interp->apply_escapes( $attach->Content, 'h' ) );
+        my $content = $m->interp->apply_escapes( $attach->Content, 'h' );
+        $content =~ s{(\r?\n)}{<br />}g if $use_brs;
+        $m->out( $content );
         return;
     }
     my $href = RT->Config->Get('WebPath') .'/Ticket/Attachment/'
@@ -65,9 +71,15 @@ my $show_content = sub {
 my $show;
 $show = sub {
     my $attach = shift;
-    $m->out( '<div id="body"><pre style="padding: 2em;">' );
-    $m->out( $m->interp->apply_escapes( $attach->Headers, 'h' ) );
-    $m->out( "\n\n" );
+    $m->out('<div id="body">');
+    $m->out('<div class="plain-text-white-space">') if $plain_text_mono;
+
+    my $headers = $m->interp->apply_escapes( $attach->Headers, 'h' );
+    $headers =~ s{(\r?\n)}{<br />}g if $use_brs;
+    $m->out( $headers );
+
+    $m->out( $use_brs ? "<br /><br />" : "\n\n" );
+
     if ( $attach->ContentType =~ m{^multipart/}i ) {
         my $children = $attach->Children;
         while ( my $child = $children->Next ) {
@@ -76,7 +88,8 @@ $show = sub {
     } else {
         $show_content->( $attach );
     }
-    $m->out( '</pre></div>' );
+    $m->out('</div>') if $plain_text_mono;
+    $m->out('</div>');
 };
 
 my $AttachmentObj = RT::Attachment->new($session{'CurrentUser'});