* Don't show time to archive for archived bugs

[debbugs.git] / cgi / pkgreport.cgi

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index 1d0e41374d2feb83a6c5f9c0d7e1eb9d6ff7647f..cca0aaf6c591d8bd1c2fef703598ff3347f7a1b7 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -10,7 +10,7 @@ require './common.pl';
 use Debbugs::Config qw(:globals :text);
 use Debbugs::User;
 use Debbugs::CGI qw(version_url);
-use Debbugs::Common qw(getparsedaddrs);
+use Debbugs::Common qw(getparsedaddrs :date);
 use Debbugs::Bugs qw(get_bugs);
 
 use vars qw($gPackagePages $gWebDomain %gSeverityDisplay @gSeverityList);
@@ -161,7 +161,7 @@ quitcgi("You have to choose something to select by") if (!$found);
 my %bugusertags;
 my %ut;
 for my $user (split /[\s*,]+/, $users) {
-    next unless ($user =~ m/..../);
+    next unless length($user) >= 4;
     add_user($user);
 }
 
@@ -206,10 +206,14 @@ set_option("use-bug-idx", defined($param{'use-bug-idx'}) ? $param{'use-bug-idx'}
 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"}};
@@ -243,6 +247,10 @@ 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) {
@@ -251,7 +259,9 @@ if (defined $pkg) {
     $title .= " ($verdesc)" if defined $verdesc;
   }
   my @pkgs = split /,/, $pkg;
-  @bugs = get_bugs(package=>\@pkgs);
+  @bugs = get_bugs(package=>\@pkgs,
+                  archive=>$archive
+                 );
 } elsif (defined $src) {
   add_user("$src\@packages.debian.org");
   $title = "source $src";
@@ -263,7 +273,9 @@ if (defined $pkg) {
     my $verdesc = getversiondesc($src);
     $title .= " ($verdesc)" if defined $verdesc;
   }
-  @bugs = get_bugs(src=>[split /,/, $src]);
+  @bugs = get_bugs(src=>[split /,/, $src],
+                  archive=>$archive
+                 );
 } elsif (defined $maint) {
   add_user($maint);
   $title = "maintainer $maint";
@@ -277,7 +289,9 @@ if (defined $pkg) {
                              return 0;
                         })};
   } else {
-       @bugs = get_bugs(maint=>[map {lc ($_)} split /,/,$maint]);
+       @bugs = get_bugs(maint=>[map {lc ($_)} split /,/,$maint],
+                       archive=>$archive
+                      );
   }
 } elsif (defined $maintenc) {
   my %maintainers = %{getmaintainers()};
@@ -297,7 +311,9 @@ if (defined $pkg) {
   $title = "submitter $submitter";
   $title .= " in $dist" if defined $dist;
   my @submitters = map {lc ($_)} split /,/, $submitter;
-  @bugs = get_bugs(submitter => \@submitters);
+  @bugs = get_bugs(submitter => \@submitters,
+                  archive=>$archive
+                 );
 } elsif (defined($severity) && defined($status)) {
   $title = "$status $severity bugs";
   $title .= " in $dist" if defined $dist;
@@ -335,7 +351,9 @@ elsif (defined $owner) {
      $title .= " in $dist" if defined $dist;
      my @owners = map {lc ($_)} split /,/, $owner;
      my %bugs = ();
-     @bugs = get_bugs(owner=>\@owners);
+     @bugs = get_bugs(owner=>\@owners,
+                     archive=>$archive
+                    );
 
 }
 $title = htmlsanit($title);
@@ -626,7 +644,7 @@ sub pkg_htmlindexentrystatus {
                                   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>";
         }
     }
@@ -639,27 +657,30 @@ sub pkg_htmlindexentrystatus {
                              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 .= ".";