* Start using the templates for control and the fake control message

[debbugs.git] / scripts / service.in

diff --git a/scripts/service.in b/scripts/service.in
index 3bf7ae6a7d5361865466a4f7a9004242c4a5c385..b766ce0e9d51f34d7399312a128694c20d5fd30e 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -10,11 +10,15 @@ use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
 use Debbugs::Mail qw(send_mail_message);
 use Debbugs::User;
 use HTML::Entities qw(encode_entities);
+use Debbugs::Versions::Dpkg;
 
 use Debbugs::Config qw(:globals :config);
 use Debbugs::CGI qw(html_escape);
 use Debbugs::Control qw(:archive :log);
 use Debbugs::Log qw(:misc);
+use Debbugs::Text qw(:templates);
+
+use Mail::RFC822::Address;
 
 $lib_path = $gLibPath;
 require "$lib_path/errorlib";
@@ -149,8 +153,7 @@ my $quickabort = 0;
 
 my $fuckheads = "(" . join("|", @gExcludeFromControl) . ")";
 if (@gExcludeFromControl and $replyto =~ m/$fuckheads/) {
-       &transcript("You have been specifically excluded from using the\ncontrol interface.\n\n");
-       &transcript("Have a nice day\n\n.");
+       &transcript(fill_template('excluded_from_control'));
        $quickabort = 1;
 }
 
@@ -285,7 +288,7 @@ END
            next;
         }
        if (not $indicated_user and defined $user) {
-            &transcript("User is $user");
+            &transcript("User is $user\n");
             $indicated_user = 1;
        }
        while (++$procline <= $#bodylines) {
@@ -372,7 +375,7 @@ END
            $indicated_user = 1;
         } elsif (&setbug) {
            if (not $indicated_user and defined $user) {
-                &transcript("User is $user");
+                &transcript("User is $user\n");
                 $indicated_user = 1;
            }
            &nochangebug;
@@ -533,8 +536,8 @@ END
             }
         }
     } elsif (m{^found\s+\#?(-?\d+)
-              (?:\s+(?:$config{package_name_re}\/)?
-                   ($config{package_version_re}))?$}ix) {
+              (?:\s+((?:$config{package_name_re}\/)?
+                   $config{package_version_re}))?$}ix) {
         $ok++;
         $ref= $1;
         $version= $2;
@@ -554,17 +557,19 @@ END
                     # tracking, because a bug may be closed by multiple
                     # people in different branches. Until we have something
                     # more flexible, we set it every time a bug is fixed,
-                    # and clear it precisely when a found command is
-                    # received for the rightmost fixed-in version, which
-                    # equates to the most recent fixing of the bug, or when
-                    # a versionless found command is received.
-                    if (defined $version) {
-                        my $lastfixed = $data->{fixed_versions}[-1];
-                        # TODO: what if $data->{package} is a source package?
+                    # and clear it when a bug is found in a version greater
+                   # than any version in which the bug is fixed or when
+                   # a bug is found and there is no fixed version
+                   if (defined $version) {
+                       my ($version_only) = $version =~ m{([^/]+)$};
                         addfoundversions($data, $data->{package}, $version, 'binary');
-                        if (defined $lastfixed and not grep { $_ eq $lastfixed } @{$data->{fixed_versions}}) {
-                            $data->{done} = '';
-                        }
+                       my @fixed_order = sort {Debbugs::Versions::Dpkg::vercmp($a,$b);}
+                            map {s{.+/}{}; $_;} @{$data->{fixed_versions}};
+                       if (not @fixed_order or (Debbugs::Versions::Dpkg::vercmp($version_only,$fixed_order[-1]) >= 0)) {
+                            $action = "$gBug marked as found in version $version and reopened."
+                                 if length $data->{done};
+                            $data->{done} = '';
+                       }
                     } else {
                         # Versionless found; assume old-style "not fixed at
                         # all".
@@ -574,12 +579,14 @@ END
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^notfound\s+\#?(-?\d+)\s+(\d.*)$/i) {
+    } elsif (m[^notfound\s+\#?(-?\d+)
+              (?:\s+(?:$config{package_name_re}\/)?
+                   ($config{package_version_re}))$]ix) {
         $ok++;
         $ref= $1;
         $version= $2;
         if (&setbug) {
-            $action= "$gBug marked as not found in version $version.";
+            $action= "$gBug no longer marked as found in version $version.";
             if (length($data->{done})) {
                 $extramessage= "(By the way, this $gBug is currently marked as done.)\n";
             }
@@ -615,7 +622,7 @@ END
         if (&setbug) {
             $action=
                  defined($version) ?
-                      "$gBug marked as not fixed in version $version." :
+                      "$gBug no longer marked as fixed in version $version." :
                            "$gBug reopened.";
                 do {
                     &addmaintainers($data);
@@ -631,7 +638,11 @@ END
         if ($ref =~ m/^-\d+$/ && defined $clonebugs{$ref}) {
             $ref = $clonebugs{$ref};
         }
-        if (&getbug) {
+       if (not Mail::RFC822::Address::valid($newsubmitter)) {
+            transcript("$newsubmitter is not a valid e-mail address; not changing submitter\n");
+            $errors++;
+       }
+        elsif (&getbug) {
             if (&checkpkglimit) {
                 &foundbug;
                 &addmaintainers($data);
@@ -1342,6 +1353,45 @@ sub sendmailmessage {
     $midix++;
 }
 
+sub fill_template{
+     my ($template,$extra_var) = @_;
+     $extra_var ||={};
+     my $variables = {config => \%config,
+                     defined($ref)?(ref    => $ref):(),
+                     defined($data)?(data  => $data):(),
+                     %{$extra_var},
+                    };
+     my $hole_var = {'&bugurl' =>
+                    sub{"$_[0]: ".
+                             'http://'.$config{cgi_domain}.'/'.
+                                  Debbugs::CGI::bug_url($_[0]);
+                   }
+                   };
+     return fill_in_template(template => $template,
+                            variables => $variables,
+                            hole_var  => $hole_var,
+                           );
+}
+
+=head2 message_body_template
+
+     message_body_template('mail/ack',{ref=>'foo'});
+
+Creates a message body using a template
+
+=cut
+
+sub message_body_template{
+     my ($template,$extra_var) = @_;
+     $extra_var ||={};
+     my $body = fill_template($template,$extra_var);
+     return fill_template('mail/message_body',
+                         {%{$extra_var},
+                          body => $body,
+                         },
+                        );
+}
+
 sub sendhelp {
         &sendtxthelpraw("bug-log-mailserver.txt","instructions for request\@$gEmailDomain");
         &sendtxthelpraw("bug-maint-mailcontrol.txt","instructions for control\@$gEmailDomain")
@@ -1525,7 +1575,8 @@ sub endmerge {
 sub getbug {
     &dlen("getbug $ref");
     $lowstate eq 'idle' || die "$state ?";
-    if (($data = &lockreadbug($ref))) {
+    # Only use unmerged bugs here
+    if (($data = &lockreadbug($ref,'db-h'))) {
         $sref= $ref;
         $lowstate= "open";
         &dlex("getbug => 1");