use Debbugs::Config qw(:globals :text);
use Debbugs::User;
use Debbugs::CGI qw(version_url);
+use Debbugs::Common qw(getparsedaddrs :date);
+use Debbugs::Bugs qw(get_bugs);
use vars qw($gPackagePages $gWebDomain %gSeverityDisplay @gSeverityList);
"normal" => [ qw(status severity classification) ],
);
-my ($pkg, $src, $maint, $maintenc, $submitter, $severity, $status, $tag, $usertag);
+my ($pkg, $src, $maint, $maintenc, $submitter, $severity, $status, $tag, $usertag,
+ $owner,
+ );
my %which = (
'pkg' => \$pkg,
'severity' => \$severity,
'tag' => \$tag,
'usertag' => \$usertag,
+ 'owner' => \$owner,
);
my @allowedEmpty = ( 'maint' );
my %bugusertags;
my %ut;
for my $user (split /[\s*,]+/, $users) {
- next unless ($user =~ m/..../);
+ next unless length($user) >= 4;
add_user($user);
}
set_option("show_list_header", $show_list_header);
set_option("show_list_footer", $show_list_footer);
+our %seen_users;
sub add_user {
my $ut = \%ut;
my $u = shift;
+ return if $seen_users{$u};
+ $seen_users{$u} = 1;
+
my $user = Debbugs::User::get_user($u);
my %vis = map { $_, 1 } @{$user->{"visible_cats"}};
set_option("bugusertags", \%bugusertags);
}
+my $pseudodesc = getpseudodesc();
+if (defined $pseudodesc and defined $pkg and exists $pseudodesc->{$pkg}) {
+ undef $dist;
+ set_option('dist',$dist)
+}
my $title;
my @bugs;
if (defined $pkg) {
$title = "package $pkg";
add_user("$pkg\@packages.debian.org");
+ # figure out the source package
+ my $pkgsrc = getpkgsrc();
+ add_user($pkgsrc->{$pkg}.'@packages.debian.org')
+ if defined $pkgsrc->{$pkg};
if (defined $version) {
$title .= " (version $version)";
} elsif (defined $dist) {
$title .= " ($verdesc)" if defined $verdesc;
}
my @pkgs = split /,/, $pkg;
- @bugs = @{getbugs(sub {my %d=@_;
- foreach my $try (splitpackages($d{"pkg"})) {
- return 1 if grep($try eq $_, @pkgs);
- }
- return 0;
- }, 'package', @pkgs)};
+ @bugs = get_bugs(package=>\@pkgs,
+ archive=>$archive
+ );
} elsif (defined $src) {
add_user("$src\@packages.debian.org");
$title = "source $src";
my $verdesc = getversiondesc($src);
$title .= " ($verdesc)" if defined $verdesc;
}
- my @pkgs = ();
- my @srcs = split /,/, $src;
- foreach my $try (@srcs) {
- push @pkgs, getsrcpkgs($try);
- push @pkgs, $try if ( !grep(/^\Q$try\E$/, @pkgs) );
- }
- @bugs = @{getbugs(sub {my %d=@_;
- foreach my $try (splitpackages($d{"pkg"})) {
- return 1 if grep($try eq $_, @pkgs);
- }
- return 0;
- }, 'package', @pkgs)};
+ @bugs = get_bugs(src=>[split /,/, $src],
+ archive=>$archive
+ );
} elsif (defined $maint) {
- my %maintainers = %{getmaintainers()};
add_user($maint);
$title = "maintainer $maint";
$title .= " in $dist" if defined $dist;
if ($maint eq "") {
- @bugs = @{getbugs(sub {my %d=@_;
- foreach my $try (splitpackages($d{"pkg"})) {
- return 1 if !getparsedaddrs($maintainers{$try});
- }
- return 0;
- })};
+ my %maintainers = %{getmaintainers()};
+ @bugs = @{getbugs(sub {my %d=@_;
+ foreach my $try (splitpackages($d{"pkg"})) {
+ return 1 if !getparsedaddrs($maintainers{$try});
+ }
+ return 0;
+ })};
} else {
- my @maints = split /,/, $maint;
- my @pkgs = ();
- foreach my $try (@maints) {
- foreach my $p (keys %maintainers) {
- my @me = getparsedaddrs($maintainers{$p});
- push @pkgs, $p if grep { $_->address eq $try } @me;
- }
- }
- @bugs = @{getbugs(sub {my %d=@_;
- foreach my $try (splitpackages($d{"pkg"})) {
- my @me = getparsedaddrs($maintainers{$try});
- return 1 if grep { $_->address eq $maint } @me;
- }
- return 0;
- }, 'package', @pkgs)};
+ @bugs = get_bugs(maint=>[map {lc ($_)} split /,/,$maint],
+ archive=>$archive
+ );
}
} elsif (defined $maintenc) {
my %maintainers = %{getmaintainers()};
add_user($submitter);
$title = "submitter $submitter";
$title .= " in $dist" if defined $dist;
- my @submitters = split /,/, $submitter;
- @bugs = @{getbugs(sub {my %d=@_;
- my @se = getparsedaddrs($d{"submitter"} || "");
- foreach my $try (@submitters) {
- return 1 if grep { $_->address eq $try } @se;
- }
- }, 'submitter-email', @submitters)};
+ my @submitters = map {lc ($_)} split /,/, $submitter;
+ @bugs = get_bugs(submitter => \@submitters,
+ archive=>$archive
+ );
} elsif (defined($severity) && defined($status)) {
$title = "$status $severity bugs";
$title .= " in $dist" if defined $dist;
return grep(exists $tags{$_}, @tags);
})};
}
+elsif (defined $owner) {
+ $title = "bugs owned by $owner";
+ $title .= " in $dist" if defined $dist;
+ my @owners = map {lc ($_)} split /,/, $owner;
+ my %bugs = ();
+ @bugs = get_bugs(owner=>\@owners,
+ archive=>$archive
+ );
+
+}
$title = htmlsanit($title);
my @names; my @prior; my @title; my @order;
print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
print "<HTML><HEAD>\n" .
- "<TITLE>$gProject$Archived $gBug report logs: $title</TITLE>\n" .
+ "<TITLE>$title -- $gProject$Archived $gBug report logs</TITLE>\n" .
qq(<link rel="stylesheet" href="$gWebHostBugDir/css/bugs.css" type="text/css">) .
"</HEAD>\n" .
'<BODY onload="pagemain();">' .
set_option("archive", !$archive);
printf "<p>See the <a href=\"%s\">%s reports</a></p>",
- urlsanit('pkgreport.cgi?'.join(';',
- (map {$_ eq 'archive'?():("$_=$param{$_}")
- } keys %param
- ),
- ('archive='.($archive?"no":"yes"))
- )
+ urlsanit(pkg_url((
+ map {
+ $_ eq 'archive'?():($_,$param{$_})
+ } keys %param
+ ),
+ ('archive',($archive?"no":"yes"))
+ )
), ($archive ? "active" : "archived");
set_option("archive", $archive);
}
print "<tr><td> </td></tr>\n";
-my $includetags = htmlsanit(join(" ", grep { !m/^subj:/i } split /[\s,]+/, $include));
-my $excludetags = htmlsanit(join(" ", grep { !m/^subj:/i } split /[\s,]+/, $exclude));
-my $includesubj = htmlsanit(join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } split /[\s,]+/, $include));
-my $excludesubj = htmlsanit(join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } split /[\s,]+/, $exclude));
+my $includetags = htmlsanit(join(" ", grep { !m/^subj:/i } map {split /[\s,]+/} ref($include)?@{$include}:$include));
+my $excludetags = htmlsanit(join(" ", grep { !m/^subj:/i } map {split /[\s,]+/} ref($exclude)?@{$exclude}:$exclude));
+my $includesubj = htmlsanit(join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } map {split /[\s,]+/} ref($include)?@{$include}:$include));
+my $excludesubj = htmlsanit(join(" ", map { s/^subj://i; $_ } grep { m/^subj:/i } map {split /[\s,]+/} ref($exclude)?@{$exclude}:$exclude));
my $vismindays = ($mindays == 0 ? "" : $mindays);
my $vismaxdays = ($maxdays == -1 ? "" : $maxdays);
status => \%status,
days_until => 1,
);
- if ($days >= 0) {
+ if ($days >= 0 and $status->{location} ne 'archive') {
$result .= ";\n<strong>Will be archived" . ( $days == 0 ? " today" : $days == 1 ? " in $days day" : " in $days days" ) . "</strong>";
}
}
split /[,\s]+/,$status{forwarded}
);
}
- my $daysold = int((time - $status{date}) / 86400); # seconds to days
- if ($daysold >= 7) {
+ # Check the age of the logfile
+ my ($days_last,$eng_last) = secs_to_english(time - $status{log_modified});
+ my ($days,$eng) = secs_to_english(time - $status{date});
+
+ if ($days >= 7) {
my $font = "";
my $efont = "";
- $font = "em" if ($daysold > 30);
- $font = "strong" if ($daysold > 60);
+ $font = "em" if ($days > 30);
+ $font = "strong" if ($days > 60);
$efont = "</$font>" if ($font);
$font = "<$font>" if ($font);
- my $yearsold = int($daysold / 365);
- $daysold -= $yearsold * 365;
-
- $result .= ";\n $font";
- my @age;
- push @age, "1 year" if ($yearsold == 1);
- push @age, "$yearsold years" if ($yearsold > 1);
- push @age, "1 day" if ($daysold == 1);
- push @age, "$daysold days" if ($daysold > 1);
- $result .= join(" and ", @age);
- $result .= " old$efont";
+ $result .= ";\n ${font}$eng old$efont";
}
+ if ($days_last > 7) {
+ my $font = "";
+ my $efont = "";
+ $font = "em" if ($days_last > 30);
+ $font = "strong" if ($days_last > 60);
+ $efont = "</$font>" if ($font);
+ $font = "<$font>" if ($font);
+
+ $result .= ";\n ${font}Modified $eng_last ago$efont";
+ }
}
$result .= ".";
}
sub myurl {
- return pkg_etc_url($pkg, "pkg", 0) if defined($pkg);
- return pkg_etc_url($src, "src", 0) if defined($src);
- return pkg_etc_url($maint, "maint", 0) if defined($maint);
- return pkg_etc_url($submitter, "submitter", 0) if defined($submitter);
- return pkg_etc_url($severity, "severity", 0) if defined($severity);
- return pkg_etc_url($tag, "tag", 0) if defined($tag);
+ return urlsanit(pkg_url(map {exists $param{$_}?($_,$param{$_}):()}
+ qw(archive repeatmerged mindays maxdays),
+ qw(version dist arch pkg src tag maint submitter)
+ )
+ );
}
sub make_order_list {
$h->{"nam"} = $param{"nam$i"}
if (defined $param{"nam$i"});
- $h->{"ord"} = [ split /,/, $param{"ord$i"} ]
+ $h->{"ord"} = [ split /\s*,\s*/, $param{"ord$i"} ]
if (defined $param{"ord$i"});
- $h->{"ttl"} = [ split /,/, $param{"ttl$i"} ]
+ $h->{"ttl"} = [ split /\s*,\s*/, $param{"ttl$i"} ]
if (defined $param{"ttl$i"});
push @c, $h;
$i = 0;
for my $c (@cats) {
- $i++;
+ $i++;
push @prior, $c->{"pri"};
push @names, ($c->{"nam"} || "Bug attribute #" . $i);
if (defined $c->{"ord"}) {
push @order, [ 0..$#{$prior[-1]} ];
}
my @t = @{ $c->{"ttl"} } if defined $c->{ttl};
- if (($#t+1) < $#{$prior[-1]}) {
- push @t, map { toenglish($prior[-1]->[$_]) } ($#t+1)..($#{$prior[-1]});
+ if (@t < $#{$prior[-1]}) {
+ push @t, map { toenglish($prior[-1][$_]) } @t..($#{$prior[-1]});
}
push @t, $c->{"def"} || "";
push @title, [@t];
projects / debbugs.git / blobdiff