merge dla source changes

[debbugs.git] / cgi / bugreport.cgi

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 24b51e49306cfba4071942a96027aba85c87e1f9..856a35be4e8c27c785a9ab0c55da7b433e9fa648 100755 (executable)
--- 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);
@@ -178,7 +178,7 @@ sub display_entity ($$$$\$\@) {
              $body = html_escape($body);
              # Attempt to deal with format=flowed
              if ($content_type =~ m/format\s*=\s*\"?flowed\"?/i) {
-                  $body =~ s{^\s}{}mgo;
+                  $body =~ s{^\ }{}mgo;
                   # we ignore the other things that you can do with
                   # flowed e-mails cause they don't really matter.
              }
@@ -326,7 +326,9 @@ if (length($status{done})) {
 }
 
 if (length($status{forwarded})) {
-    push @descstates, "<strong>Forwarded</strong> to ".maybelink($status{forwarded});
+    my $forward_link = $status{forwarded};
+    $forward_link =~ s,((ftp|http|https)://[\S~-]+?/?)((\&gt\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go;
+    push @descstates, "<strong>Forwarded</strong> to $forward_link";
 }
 
 
@@ -475,8 +477,10 @@ sub handle_record{
          }
          # Incomming Mail Message
          my ($received,$hostname) = $record->{text} =~ m/Received: \(at (\S+)\) by (\S+)\;/;
-         $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number">Message received</a> at |.
-              html_escape("$received\@$hostname") . q| (<a href="| . bug_url($ref, msg=>$msg_number) . '">full text</a>'.q|, <a href="| . bug_url($ref, msg=>$msg_number,mbox=>'yes') .'">mbox</a>)'.":</p>\n";
+         $output .= qq|<hr><p class="msgreceived"><a name="$msg_number"></a><a name="msg$msg_number"></a><a href="#$msg_number">Message</a> received at |.
+              html_escape("$received\@$hostname") .
+                   q| (<a href="| . bug_url($ref, msg=>$msg_number) . '">full text</a>'.
+                        q|, <a href="| . bug_url($ref, msg=>$msg_number,mbox=>'yes') .'">mbox</a>)'.":</p>\n";
          $output .= handle_email_message($record->{text},
                                    ref        => $bug_number,
                                    msg_number => $msg_number,
@@ -603,7 +607,8 @@ function toggle_infmessages()
         {
                 if (allDivs[i].className == "infmessage")
                 {
-                        allDivs[i].style.display=(allDivs[i].style.display == 'none') ? 'block' : 'none';
+                        allDivs[i].style.display=(allDivs[i].style.display == 'none' | allDivs[i].style.display == '') ? 'block' : 'none';
+                        break;
                 }
         }
 }