X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fbugreport.cgi;h=64547d40a1eceaeb51daa521002b93113c3f1223;hb=ab40da4e4348502384d787bb9deb78da52361d64;hp=83e9b12a2573cc0928b8019793c80ddd7cae76d4;hpb=c7252853ca2b076f3c42d4a73753f9cd47a3c4f4;p=debbugs.git

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 83e9b12..64547d4 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -11,7 +11,7 @@ use IO::File;
 use Debbugs::Config qw(:globals :text);
 
 # for read_log_records
-use Debbugs::Log;
+use Debbugs::Log qw(read_log_records);
 use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message);
 use Debbugs::CGI qw(:url :html :util);
 use Debbugs::Common qw(buglog getmaintainers);
@@ -125,7 +125,7 @@ sub display_entity ($$$$\$\@) {
 	$$this .= '<pre class="mime">[<a href="' . bug_url(@dlargs) . qq{">$printname</a> } .
 		  "($type, $disposition)]</pre>\n";
 
-	if ($msg and defined($att) and $att eq $#$attachments) {
+	if ($msg and defined($att) and $att == $#$attachments) {
 	    my $head = $entity->head;
 	    chomp(my $type = $entity->effective_type);
 	    my $body = $entity->stringify_body;
@@ -176,6 +176,12 @@ sub display_entity ($$$$\$\@) {
 	      my $body = $entity->bodyhandle->as_string;
 	      $body = convert_to_utf8($body,$charset) if defined $charset;
 	      $body = html_escape($body);
+	      # Attempt to deal with format=flowed
+	      if ($content_type =~ m/format\s*=\s*\"?flowed\"?/i) {
+		   $body =~ s{^\ }{}mgo;
+		   # we ignore the other things that you can do with
+		   # flowed e-mails cause they don't really matter.
+	      }
 	      # Add links to URLs
 	      $body =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go;
 	      # Add links to bug closures
@@ -235,7 +241,7 @@ if (@{$status{found_versions}} or @{$status{fixed_versions}}) {
 		      $status{found_versions},
 		      $status{fixed_versions},
 		     ).
-	  q("><img src=").
+	  q("><img alt="version graph" src=").
 	  version_url($status{package},
 		      $status{found_versions},
 		      $status{fixed_versions},
@@ -416,6 +422,7 @@ sub handle_record{
      my $output = '';
      local $_ = $record->{type};
      if (/html/) {
+	  my ($time) = $record->{text} =~ /<!--\s+time:(\d+)\s+-->/;
 	  my $class = $record->{text} =~ /^<strong>(?:Acknowledgement|Reply|Information|Report|Notification)/ ? 'infmessage':'msgreceived';
 	  $output .= decode_rfc1522($record->{text});
 	  # Link to forwarded http:// urls in the midst of the report
@@ -430,8 +437,11 @@ sub handle_record{
 		      {(defined $2?$1.bug_links($2):'').$3.
 			    join(' ',map {bug_links($_)} (split /\,?\s+/, $4))}eo;
 	  # Add links to reassigned packages
-	  $output =~ s{(Bug reassigned from package \`)([^\']+)(' to \`)([^\']+)(')}
+	  $output =~ s{(Bug reassigned from package \`)([^']+)((?:'|\&\#39;) to \`)([^']+)((?:'|\&\#39;))}
 	  {$1.q(<a href=").pkg_url(pkg=>$2).qq(">$2</a>).$3.q(<a href=").pkg_url(pkg=>$4).qq(">$4</a>).$5}eo;
+	  if (defined $time) {
+	       $output .= ' ('.strftime('%a, %d %b %Y %T GMT',gmtime($time)).') ';
+	  }
 	  $output .= '<a href="' . bug_url($ref, msg => ($msg_number+1)) . '">Full text</a> and <a href="' .
 	       bug_url($ref, msg => ($msg_number+1), mbox => 'yes') . '">rfc822 format</a> available.';
 
@@ -604,17 +614,22 @@ function toggle_infmessages()
 END
 print "<H1>" . "$gProject $gBug report logs - <A HREF=\"mailto:$ref\@$gEmailDomain\">$short</A>" .
       "<BR>" . $title . "</H1>\n";
-
 print "$descriptivehead\n";
-print qq(<p><a href="mailto:$ref\@$gEmailDomain">Reply</a> ),
-     qq(or <a href="mailto:$ref-subscribe\@$gEmailDomain">subscribe</a> ),
-     qq(to this bug.</p>\n);
-print qq(<p><a href="javascript:toggle_infmessages();">Toggle useless messages</a></p>);
-printf qq(<div class="msgreceived"><p>View this report as an <a href="%s">mbox folder</a>, ).
-     qq(<a href="%s">status mbox</a>, <a href="%s">maintainer mbox</a></p></div>\n),
-     html_escape(bug_url($ref, mbox=>'yes')),
-     html_escape(bug_url($ref, mbox=>'yes',mboxstatus=>'yes')),
-     html_escape(bug_url($ref, mbox=>'yes',mboxmaint=>'yes'));
+
+if (looks_like_number($msg)) {
+     printf qq(<p><a href="%s">Full log</a></p>),html_escape(bug_url($ref));
+}
+else {
+     print qq(<p><a href="mailto:$ref\@$gEmailDomain">Reply</a> ),
+	  qq(or <a href="mailto:$ref-subscribe\@$gEmailDomain">subscribe</a> ),
+	       qq(to this bug.</p>\n);
+     print qq(<p><a href="javascript:toggle_infmessages();">Toggle useless messages</a></p>);
+     printf qq(<div class="msgreceived"><p>View this report as an <a href="%s">mbox folder</a>, ).
+	  qq(<a href="%s">status mbox</a>, <a href="%s">maintainer mbox</a></p></div>\n),
+	       html_escape(bug_url($ref, mbox=>'yes')),
+		    html_escape(bug_url($ref, mbox=>'yes',mboxstatus=>'yes')),
+			 html_escape(bug_url($ref, mbox=>'yes',mboxmaint=>'yes'));
+}
 print "$log";
 print "<HR>";
 print "<p class=\"msgreceived\">Send a report that <a href=\"/cgi-bin/bugspam.cgi?bug=$ref\">this bug log contains spam</a>.</p>\n<HR>\n";