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);
+use Debbugs::Common qw(buglog getmaintainers);
use Debbugs::Packages qw(getpkgsrc);
-use Debbugs::Status qw(get_bug_status isstrongseverity);
+use Debbugs::Status qw(splitpackages get_bug_status isstrongseverity);
use Scalar::Util qw(looks_like_number);
use CGI::Simple;
mboxstat => 'no',
mboxmaint => 'no',
archive => 'no',
+ repeatmerged => 'yes',
},
);
# This is craptacular.
push @dlargs, (filename=>$filename) if $filename ne '';
my $printname = $filename;
$printname = 'Message part ' . ($#$attachments + 1) if $filename eq '';
- $$this .= '<pre class="mime">[<a href="' . bug_url(@dlargs) . qq{">$printname</a> } .
+ $$this .= '<pre class="mime">[<a href="' . html_escape(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;
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~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),<a href=\"$1\">$1</a>$3,go;
# Add links to bug closures
$body =~ s[(closes:\s*(?:bug)?\#?\s?\d+(?:,?\s*(?:bug)?\#?\s?\d+)*)
- ][my $temp = $1; $temp =~ s{(\d+)}{qq(<a href=").bug_url($1).qq(">$1</a>)}ge; $temp;]gxie;
+ ][my $temp = $1; $temp =~ s{(\d+)}{qq(<a href=").html_escape(bug_url($1)).qq(">$1</a>)}ge; $temp;]gxie;
$$this .= qq(<pre class="message">$body</pre>\n);
}
}
$showseverity = "Severity: $status{severity};\n";
}
+if (@{$status{found_versions}} or @{$status{fixed_versions}}) {
+ $indexentry.= q(<div style="float:right"><a href=").
+ html_escape(version_url($status{package},
+ $status{found_versions},
+ $status{fixed_versions},
+ )).
+ q("><img alt="version graph" src=").
+ html_escape(version_url($status{package},
+ $status{found_versions},
+ $status{fixed_versions},
+ 2,
+ 2,
+ )).qq{"></a></div>};
+}
+
+
$indexentry .= "<div class=\"msgreceived\">\n";
$indexentry .= htmlize_packagelinks($status{package}, 0) . ";\n";
: "Maintainers for $pkg are\n" },
$tmaint);
$indexentry .= ";\nSource for $pkg is\n".
- '<a href="'.pkg_url(src=>$tsrc)."\">$tsrc</a>" if ($tsrc ne "(unknown)");
+ '<a href="'.html_escape(pkg_url(src=>$tsrc))."\">$tsrc</a>" if ($tsrc ne "(unknown)");
$indexentry .= ".\n";
}
my $descmerged = 'Merged with ';
my $mseparator = '';
for my $m (@merged) {
- $descmerged .= $mseparator."<a href=\"" . bug_url($m) . "\">#$m</a>";
+ $descmerged .= $mseparator."<a href=\"" . html_escape(bug_url($m)) . "\">#$m</a>";
$mseparator= ",\n";
}
push @descstates, $descmerged;
$foundtext .= join ', ', map html_escape($_), @{$status{found_versions}};
push @descstates, $foundtext;
}
-
if (@{$status{fixed_versions}}) {
my $fixedtext = '<strong>Fixed</strong> in ';
$fixedtext .= (@{$status{fixed_versions}} == 1) ? 'version ' : 'versions ';
$fixedtext .= ' by ' . html_escape(decode_rfc1522($status{done}));
}
push @descstates, $fixedtext;
- push @descstates, '<a href="'.
- version_url($status{package},
- $status{found_versions},
- $status{fixed_versions},
- ).qq{">Version Graph</a>};
+}
-} elsif (length($status{done})) {
+if (@{$status{found_versions}} or @{$status{fixed_versions}}) {
+ push @descstates, '<a href="'.
+ html_escape(version_url($status{package},
+ $status{found_versions},
+ $status{fixed_versions},
+ )).qq{">Version Graph</a>};
+}
+
+if (length($status{done})) {
push @descstates, "<strong>Done:</strong> ".html_escape(decode_rfc1522($status{done}));
-} elsif (length($status{forwarded})) {
- push @descstates, "<strong>Forwarded</strong> to ".maybelink($status{forwarded});
+}
+
+if (length($status{forwarded})) {
+ my $forward_link = html_escape($status{forwarded});
+ $forward_link =~ s,((ftp|http|https)://[\S~-]+?/?)((\>\;)?[)]?[']?[:.\,]?(\s|$)),<a href="$1">$1</a>$3,go;
+ push @descstates, "<strong>Forwarded</strong> to $forward_link";
}
my @blockedby= split(/ /, $status{blockedby});
if (@blockedby && $status{"pending"} ne 'fixed' && ! length($status{done})) {
for my $b (@blockedby) {
- my %s = %{getbugstatus($b)};
+ my %s = %{get_bug_status($b)};
next if $s{"pending"} eq 'fixed' || length $s{done};
- push @descstates, "Fix blocked by <a href=\"" . bug_url($b) . "\">#$b</a>: ".html_escape($s{subject});
+ push @descstates, "Fix blocked by <a href=\"" . html_escape(bug_url($b)) . "\">#$b</a>: ".html_escape($s{subject});
}
}
my @blocks= split(/ /, $status{blocks});
if (@blocks && $status{"pending"} ne 'fixed' && ! length($status{done})) {
for my $b (@blocks) {
- my %s = %{getbugstatus($b)};
+ my %s = %{get_bug_status($b)};
next if $s{"pending"} eq 'fixed' || length $s{done};
- push @descstates, "Blocking fix for <a href=\"" . bug_url($b) . "\">#$b</a>: ".html_escape($s{subject});
+ push @descstates, "Blocking fix for <a href=\"" . html_escape(bug_url($b)) . "\">#$b</a>: ".html_escape($s{subject});
}
}
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
# Add links to merged bugs
$output =~ s{(?<=Merged )([\d\s]+)(?=\.)}{join(' ',map {bug_links($_)} (split /\s+/, $1))}eo;
# Add links to blocked bugs
- $output =~ s{(?<=Blocking bugs)(?:(of )(\d+))?( (?:added|set to|removed):\s+)([\d\s\,]+)}
+ $output =~ s{(?<=Blocking bugs)(?:( of )(\d+))?( (?:added|set to|removed):\s+)([\d\s\,]+)}
{(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 \`)([^\']+)(')}
- {$1.q(<a href=").pkg_url(pkg=>$2).qq(">$2</a>).$3.q(<a href=").pkg_url(pkg=>$4).qq(">$4</a>).$5}eo;
- $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.';
+ $output =~ s{(Bug reassigned from package \`)([^']+?)((?:'|\&\#39;) to \`)([^']+?)((?:'|\&\#39;))}
+ {$1.q(<a href=").html_escape(pkg_url(pkg=>$2)).qq(">$2</a>).$3.q(<a href=").html_escape(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="' . html_escape(bug_url($ref, msg => ($msg_number+1))) . '">Full text</a> and <a href="' .
+ html_escape(bug_url($ref, msg => ($msg_number+1), mbox => 'yes')) . '">rfc822 format</a> available.';
$output = qq(<div class="$class"><hr>\n<a name="$msg_number"></a>\n) . $output . "</div>\n";
}
elsif (defined $msg_id) {
$$seen_msg_ids{$msg_id} = 1;
}
- $output .= qq(<hr><a name="$msg_number"></a>\n);
- $output .= 'View this message in <a href="' . bug_url($ref, "msg=$msg_number", "mbox") . '">rfc822 format</a>';
+ $output .= qq(<hr><p class="msgreceived"><a name="$msg_number"></a>\n);
+ $output .= 'View this message in <a href="' . html_escape(bug_url($ref, msg=>$msg_number, mbox=>'yes')) . '">rfc822 format</a></p>';
$output .= handle_email_message($record->{text},
ref => $bug_number,
msg_number => $msg_number,
}
# 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 #$msg_number</a> received at |.
+ html_escape("$received\@$hostname") .
+ q| (<a href="| . html_escape(bug_url($ref, msg=>$msg_number)) . '">full text</a>'.
+ q|, <a href="| . html_escape(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,
my $record_wanted_anyway = 0;
my ($msg_id) = $record->{text} =~ /^Message-Id:\s+<(.+)>/im;
next if exists $seen_message_ids{$msg_id};
- $seen_message_ids{$msg_id} = 1;
- next if $msg_id =~/handler\..+\.ack(?:info)?\@/;
+ next if $msg_id =~/handler\..+\.ack(?:info|done)?\@/;
$record_wanted_anyway = 1 if $record->{text} =~ /^Received: \(at control\)/;
- next if not $boring and $record->{type} ne $wanted_type and not $record_wanted_anyway and @records > 1;
+ next if not $boring and not $record->{type} eq $wanted_type and not $record_wanted_anyway and @records > 1;
+ $seen_message_ids{$msg_id} = 1;
my @lines = split( "\n", $record->{text}, -1 );
if ( $lines[ 1 ] =~ m/^From / ) {
my $tmp = $lines[ 0 ];
$log = join("\n",@log);
-print "Content-Type: text/html; charset=utf-8\n\n";
+print "Content-Type: text/html; charset=utf-8\n";
+
+my @stat = stat $buglog;
+if (@stat) {
+ my $mtime = strftime '%a, %d %b %Y %T GMT', gmtime($stat[9]);
+ print "Last-Modified: $mtime\n";
+}
+
+print "\n";
my $title = html_escape($status{subject});
{
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;
}
}
}
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";
projects / debbugs.git / blobdiff