merge changes from dla source tree

diff --combined scripts/process.in
index 86efc053355414060c1e72c8d0c47940ef8797e1,8fe313ddf49f1d84ac0eacbb0a7946012a08987c..dcd845a025edd01651e82289e63b01d23dbac46c
--- 1/scripts/process.in
--- 2/scripts/process.in
+++ b/scripts/process.in
@@@ -14,6 -14,8 +14,8 @@@ use Debbugs::User qw(read_usertags writ
  
  use Debbugs::CGI qw(html_escape);
  
+ use Debbugs::Log qw(:misc);
+ 
  # TODO DLA; needs config reworking and errorlib reworking
  # use warnings;
  # use strict;
@@@ -672,7 -674,7 +674,7 @@@ EN
                        $user_tags{$tag} = [keys %bugs_with_tag];
                   }
              }
 -            write_usertags(\%usertags,$user);
 +            write_usertags(\%user_tags,$user);
         }
         else {
              $brokenness .=<<END;
@@@ -1069,7 -1071,7 +1071,7 @@@ sub appendlog 
          print DEBUG "failed open log err $!<\n";
          &quit("opening db-h/$hash/$ref.log (li): $!");
      }
-     print(AP "\7\n",@{escapelog(@log)},"\n\3\n") || &quit("writing db-h/$hash/$ref.log (li): $!");
+     print(AP "\7\n",escape_log(@log),"\n\3\n") || &quit("writing db-h/$hash/$ref.log (li): $!");
      close(AP) || &quit("closing db-h/$hash/$ref.log (li): $!");
  }
  
@@@ -1153,7 -1155,7 +1155,7 @@@ sub sendmessage 
      #save email to the log
      open(AP,">>db-h/$hash/$ref.log") || &quit("opening db-h/$hash/$ref.log (lo): $!");
      print(AP "\2\n",join("\4",@$recips),"\n\5\n",
-           @{escapelog(stripbccs($msg))},"\n\3\n") ||
+           escape_log(stripbccs($msg)),"\n\3\n") ||
          &quit("writing db-h/$hash/$ref.log (lo): $!");
      close(AP) || &quit("closing db-h/$hash/$ref.log (lo): $!");