From e9541380e80808abbdef871210fd50e9adc01255 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@volo>
Date: Sun, 22 Oct 2006 01:00:31 -0700
Subject: [PATCH]  * Make it obvious when commands to control have failed   
 (closes: #344184)  * Fix javascript error in pkgreport.cgi (closes: #346043)

---
 cgi/pkgreport.cgi  | 25 ++++++++++++++-----------
 debian/changelog   |  3 +++
 scripts/service.in | 34 +++++++++++++++++++++++++++++++---
 3 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index cce3fbd4..a6c8e8d3 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -644,12 +644,13 @@ sub pkg_htmlindexentrystatus {
     my $days = 0;
     if (length($status{done})) {
         $result .= "<br><strong>Done:</strong> " . htmlsanit($status{done});
-        $days = ceil($debbugs::gRemoveAge - -M buglog($status{id}));
-        if ($days >= 0) {
-            $result .= ";\n<strong>Will be archived" . ( $days == 0 ? " today" : $days == 1 ? " in $days day" : " in $days days" ) . "</strong>";
-        } else {
-            $result .= ";\n<strong>Archived</strong>";
-        }
+# Disabled until archiving actually works again
+#        $days = ceil($debbugs::gRemoveAge - -M buglog($status{id}));
+#         if ($days >= 0) {
+#             $result .= ";\n<strong>Will be archived" . ( $days == 0 ? " today" : $days == 1 ? " in $days day" : " in $days days" ) . "</strong>";
+#         } else {
+#             $result .= ";\n<strong>Archived</strong>";
+#         }
     }
 
     unless (length($status{done})) {
@@ -846,7 +847,7 @@ sub pkg_javascript {
 <!--
 function pagemain() {
 	toggle(1);
-	toggle(2);
+//	toggle(2);
 	enable(1);
 }
 
@@ -895,10 +896,12 @@ function save_cat_cookies() {
 
 function toggle(i) {
         var a = document.getElementById("a_" + i);
-        if (a.style.display == "none") {
-                a.style.display = "";
-        } else {
-                a.style.display = "none";
+        if (a) {
+             if (a.style.display == "none") {
+                     a.style.display = "";
+             } else {
+                     a.style.display = "none";
+             }
         }
 }
 
diff --git a/debian/changelog b/debian/changelog
index a6edc9c7..41ec5740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -132,6 +132,9 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Stop refering to developers on the index page (closes: #355786)
     - Change control@ stop regex and documentation to match eachother
       (closes: #366093)
+    - Make it obvious when commands to control have failed
+      (closes: #344184)
+    - Fix javascript error in pkgreport.cgi (closes: #346043)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
diff --git a/scripts/service.in b/scripts/service.in
index a37b5bac..db0331e7 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -121,6 +121,8 @@ if ( defined($header{'reply-to'}) && $header{'reply-to'} ne "" ) {
     $replyto = $header{'from'};
 }
 
+# This is an error counter which should be incremented every time there is an error.
+my $errors = 0;
 $controlrequestaddr= $control ? "control\@$gEmailDomain" : "request\@$gEmailDomain";
 $transcript='';
 &transcript("Processing commands for $controlrequestaddr:\n\n");
@@ -183,12 +185,15 @@ for ($procline=0; $procline<=$#bodylines; $procline++) {
 		     "detailed logs for $gBug#$ref");
     } elsif (m/^index(\s+full)?$/i) {
 	&transcript("This BTS function is currently disabled, sorry.\n\n");
+	$errors++;
 	$ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^index-summary\s+by-package$/i) {
 	&transcript("This BTS function is currently disabled, sorry.\n\n");
+	$errors++;
 	$ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^index-summary(\s+by-number)?$/i) {
 	&transcript("This BTS function is currently disabled, sorry.\n\n");
+	$errors++;
 	$ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^index(\s+|-)pack(age)?s?$/i) {
 	&sendlynxdoc("pkgindex.cgi?indexon=pkg",'index of packages');
@@ -206,12 +211,15 @@ for ($procline=0; $procline<=$#bodylines; $procline++) {
         $ok++;
     } elsif (m/^send-unmatched(\s+this|\s+-?0)?$/i) {
 	&transcript("This BTS function is currently disabled, sorry.\n\n");
+	$errors++;
 	$ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^send-unmatched\s+(last|-1)$/i) {
 	&transcript("This BTS function is currently disabled, sorry.\n\n");
+	$errors++;
 	$ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^send-unmatched\s+(old|-2)$/i) {
 	&transcript("This BTS function is currently disabled, sorry.\n\n");
+	$errors++;
 	$ok++; # well, it's not really ok, but it fixes #81224 :)
     } elsif (m/^getinfo\s+([\w-.]+)$/i) {
         # the following is basically a Debian-specific kludge, but who cares
@@ -252,6 +260,7 @@ END
 	    $user = $newuser;
 	} else {
 	    &transcript("Selected user id ($newuser) invalid, sorry\n");
+	    $errors++;
 	    $user = "";
 	}
     } elsif (m/^usercategory\s+(\S+)(\s+\[hidden\])?\s*$/i) {
@@ -273,6 +282,7 @@ END
             my ($o, $txt) = ($1, $2);
             if ($#cats == -1 && $o eq "+") {
                 &transcript("User defined category specification must start with a category name. Skipping.\n\n");
+		$errors++;
                 $bad = 1;
                 next;
             }
@@ -291,6 +301,7 @@ END
                     $desc = ""; $op = $1;
                 } else {
                     &transcript("Unrecognised syntax for category section. Skipping.\n\n");
+		    $errors++;
                     $bad = 1;
                     next;
                 }
@@ -334,6 +345,7 @@ END
 	$ref = $1; $addsubcode = $3 || "+"; $tags = $4;
 	if ($user eq "") {
 	    &transcript("No valid user selected\n");
+	    $errors++;
         } elsif (&setbug) {
 	    &nochangebug;
 	    my %ut;
@@ -349,6 +361,7 @@ END
 	    }
 	    if (@badtags) {
                 &transcript("Ignoring illegal tag/s: ".join(', ', @badtags).".\nPlease use only alphanumerics, at, dot, plus and dash.\n");
+		$errors++;
 	    }
             for my $t (keys %chtags) {
 	        $ut{$t} = [] unless defined $ut{$t};
@@ -378,6 +391,7 @@ Unknown command or malformed arguments to command.
 (Use control\@$gEmailDomain to manipulate reports.)
 
 END
+	$errors++;
         if (++$unknowns >= 3) {
             &transcript("Too many unknown commands, stopping here.\n\n");
             last;
@@ -497,6 +511,7 @@ END
         if (&setbug) {
             if (!length($data->{done}) and not defined($version)) {
                 &transcript("$gBug is already open, cannot reopen.\n\n");
+		$errors++;
                 &nochangebug;
             } else {
                 $action=
@@ -645,9 +660,11 @@ END
         if (!grep($_ eq $newseverity, @gSeverityList, "$gDefaultSeverity")) {
             &transcript("Severity level \`$newseverity' is not known.\n".
  			"Recognized are: $gShowSeverities.\n\n");
+	    $errors++;
         } elsif (exists $gObsoleteSeverities{$newseverity}) {
             &transcript("Severity level \`$newseverity' is obsolete. " .
-                        "$gObsoleteSeverities{$newseverity}\n\n");
+                        "Use $gObsoleteSeverities{$newseverity} instead.\n\n");
+	    	$errors++;
         } elsif (&setbug) {
             $printseverity= $data->{severity};
             $printseverity= "$gDefaultSeverity" if $printseverity eq '';
@@ -682,6 +699,7 @@ END
 	if (@badtags) {
             &transcript("Unknown tag/s: ".join(', ', @badtags).".\n".
  			"Recognized are: ".join(' ', @gTags).".\n\n");
+	    $errors++;
 	}
 	if (&setbug) {
 	    if ($data->{keywords} eq '') {
@@ -759,6 +777,7 @@ END
 	}
 	if (@badblockers) {
             &transcript("Unknown blocking bug/s: ".join(', ', @badblockers).".\n");
+	    $errors++;
 	}
 	
 	$ref=$bugnum;
@@ -897,6 +916,7 @@ END
 	    if (length($mismatch)) {
 	        &transcript("Mismatch - only $gBugs in same state can be merged:\n".
                             $mismatch."\n");
+		$errors++;
 		&cancelbug; @newmergelist=(); last;
 	    }
             push(@newmergelist,$ref);
@@ -952,6 +972,7 @@ END
 	    if ($data->{package} ne $master_bug_data->{package}) {
 		&transcript("Mismatch - only $gBugs in the same package can be forcibly merged:\n".
 			    "$gBug $ref is not in the same package as $master_bug\n");
+		$errors++;
 		&cancelbug; @newmergelist=(); last;
 	    }
 	    for my $t (split /\s+/,$data->{keywords}) {
@@ -993,7 +1014,8 @@ END
 	$bug_affected{$ref} = 1;
 	if (&setbug) {
 	    if (length($data->{mergedwith})) {
-		&transcript("$gBug is marked as being merged with others.\n\n");
+		&transcript("$gBug is marked as being merged with others. Use an existing clone.\n\n");
+		$errors++;
 		&nochangebug;
 	    } else {
         	&filelock("nextnumber.lock");
@@ -1095,6 +1117,7 @@ END
         }
     } else {
         &transcript("Unknown command or malformed arguments to command.\n\n");
+	$errors++;
         if (++$unknowns >= 5) {
             &transcript("Too many unknown commands, stopping here.\n\n");
             last;
@@ -1105,6 +1128,7 @@ if ($procline>$#bodylines) {
     &transcript(">\nEnd of message, stopping processing here.\n\n");
 }
 if (!$ok && !quickabort) {
+    $errors++;
     &transcript("No commands successfully parsed; sending the help text(s).\n");
     &sendhelp;
     &transcript("\n");
@@ -1145,10 +1169,13 @@ if (!defined $header{'subject'} || $header{'subject'} eq "") {
   $header{'subject'} = "your mail";
 }
 
+# Error text here advertises how many errors there were
+my $error_text = $errors > 0 ? " (with $errors errors)":'';
+
 $reply= <<END;
 From: $gMaintainerEmail ($gProject $gBug Tracking System)
 To: $replyto
-${maintccs}Subject: Processed: $header{'subject'}
+${maintccs}Subject: Processed${error_text}: $header{'subject'}
 In-Reply-To: $header{'message-id'}
 References: $header{'message-id'}
 Message-ID: <handler.s.$nn.transcript\@$gEmailDomain>
@@ -1222,6 +1249,7 @@ sub checkmatch {
 sub checkpkglimit {
     if (keys %limit_pkgs and not defined $limit_pkgs{$data->{package}}) {
         &transcript("$gBug number $ref belongs to package $data->{package}, skipping.\n\n");
+        $errors++;
         return 0;
     }
     return 1;
-- 
2.39.5