X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FCGI%2FBugreport.pm;h=a6063944a07b5edd1048639d17c6c8d1abecb085;hb=466f7faff129a5699c7674f59900a92aa256175d;hp=f02bf784a74ee79c9e3ba3ab3736579453eab2a6;hpb=5a48cbd1eac67eddcffbc57cecf950852183dc17;p=debbugs.git

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index f02bf78..a606394 100644
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -35,9 +35,9 @@ use IO::Scalar;
 use Params::Validate qw(validate_with :types);
 use Digest::MD5 qw(md5_hex);
 use Debbugs::Mail qw(get_addresses :reply);
-use Debbugs::MIME qw(decode_rfc1522 create_mime_message);
+use Debbugs::MIME qw(decode_rfc1522 create_mime_message parse_to_mime_entity);
 use Debbugs::CGI qw(:url :html :util);
-use Debbugs::Common qw(globify_scalar english_join);
+use Debbugs::Common qw(globify_scalar english_join hash_slice);
 use Debbugs::UTF8;
 use Debbugs::Config qw(:config);
 use Debbugs::Log qw(:read);
@@ -226,9 +226,7 @@ sub display_entity {
                                output => $output,
                                attachments => $attachments,
                                terse => $param{terse},
-                               exists $param{msg}?(msg=>$param{msg}):(),
-                               exists $param{att}?(att=>$param{att}):(),
-                               exists $param{avatars}?(avatars=>$param{avatars}):(),
+                               hash_slice(%param,qw(msg att avatars)),
                               );
             if ($raw_output) {
                 return $raw_output;
@@ -249,9 +247,7 @@ sub display_entity {
 			   output => $output,
 			   attachments => $attachments,
 			   terse => $param{terse},
-			   exists $param{msg}?(msg=>$param{msg}):(),
-			   exists $param{att}?(att=>$param{att}):(),
-                           exists $param{avatars}?(avatars=>$param{avatars}):(),
+                           hash_slice(%param,qw(msg att avatars)),
 			  );
 	    # print {$output} "\n";
 	}
@@ -335,17 +331,7 @@ sub handle_email_message{
      my $entity;
      my $tempdir;
      if (not blessed $record) {
-         my $parser = MIME::Parser->new();
-         # this will be cleaned up once it goes out of scope
-         $tempdir = File::Temp->newdir();
-         $parser->output_under($tempdir->dirname());
-         if ($record->{inner_file}) {
-             $entity = $parser->parse($record->{fh}) or
-                 die "Unable to parse entity";
-         } else {
-             $entity = $parser->parse_data($record->{text}) or
-                 die "Unable to parse entity";
-         }
+	 $entity = parse_to_mime_entity($record);
      } else {
          $entity = $record;
      }
@@ -358,10 +344,8 @@ sub handle_email_message{
                         output => $output_fh,
                         attachments => \@attachments,
                         terse       => $param{terse},
-                        exists $param{msg}?(msg=>$param{msg}):(),
-                        exists $param{att}?(att=>$param{att}):(),
-                        exists $param{trim_headers}?(trim_headers=>$param{trim_headers}):(),
-                        exists $param{avatars}?(avatars=>$param{avatars}):(),
+                        hash_slice(%param,qw(msg att trim_headers avatars),
+                                  ),
                        );
      return $raw_output?$output:decode_utf8($output);
 }