Bug 192513: importxml.pl and move.pl now use the new mail routines introduced in bug 124174 (they got broken when processmail was removed). Also fixes several comments referring to processmail (which no longer exists) in other files, and removes references to processmail from the .htaccess files and the executable file list in checksetup.pl.

r= jaypee, a= justdave
This commit is contained in:
justdave%syndicomm.com 2003-02-10 06:26:39 +00:00
parent 30aa6c7b60
commit fe2f0fd7a4
5 changed files with 11 additions and 9 deletions

View File

@ -821,7 +821,7 @@ if ($my_create_htaccess) {
open HTACCESS, ">.htaccess";
print HTACCESS <<'END';
# don't allow people to retrieve non-cgi executable files or our private data
<FilesMatch ^(.*\.pl|.*localconfig.*|processmail|runtests.sh)$>
<FilesMatch ^(.*\.pl|.*localconfig.*|runtests.sh)$>
deny from all
</FilesMatch>
<FilesMatch ^(localconfig.js|localconfig.rdf)$>
@ -1107,7 +1107,7 @@ WriteParams();
#
# These are the files which need to be marked executable
my @executable_files = ('processmail', 'whineatnews.pl', 'collectstats.pl',
my @executable_files = ('whineatnews.pl', 'collectstats.pl',
'checksetup.pl', 'importxml.pl', 'runtests.sh');
# tell me if a file is executable. All CGI files and those in @executable_files

View File

@ -62,6 +62,7 @@ use lib ($::path);
use XML::Parser;
use Data::Dumper;
$Data::Dumper::Useqq = 1;
use Bugzilla::BugMail;
require "CGI.pl";
require "globals.pl";
@ -648,7 +649,7 @@ for (my $k=1 ; $k <= $bugqty ; $k++) {
$log .= "\n\n\n";
}
system("./processmail", $id, $exporter);
Bugzilla::BugMail::Send($id, { 'changer' => $exporter });
}
my $subject = "$bugqty bug(s) successfully moved from $urlbase to "

View File

@ -30,6 +30,7 @@ require "CGI.pl";
use vars qw($template $userid %COOKIE);
use Bug;
use Bugzilla::BugMail;
$::lockcount = 0;
@ -132,7 +133,7 @@ foreach my $id (split(/:/, $::FORM{'buglist'})) {
"($id, $exporterid, now(), " . SqlQuote($comment) . ")");
print "<P>Bug $id moved to " . Param("move-to-url") . ".<BR>\n";
system("./processmail", $id, $exporter);
Bugzilla::BugMail::Send($id, { 'changer' => $exporter });
}
}
print "<P>\n";

View File

@ -205,7 +205,7 @@ my %ccids;
my @cc;
# Create the ccid hash for inserting into the db
# and the list for passing to processmail
# and the list for passing to Bugzilla::BugMail::Send
# use a hash rather than a list to avoid adding users twice
if (defined $::FORM{'cc'}) {
foreach my $person (split(/[ ,]/, $::FORM{'cc'})) {

View File

@ -1398,7 +1398,7 @@ foreach my $id (@idlist) {
@ccRemoved = @removed;
}
# We need to run processmail for dependson/blocked bugs if the dependencies
# We need to send mail for dependson/blocked bugs if the dependencies
# change or the status or resolution change. This var keeps track of that.
my $check_dep_bugs = 0;
@ -1586,7 +1586,7 @@ foreach my $id (@idlist) {
$newhash{$col} = $newvalues[$i];
$i++;
}
# for passing to processmail to ensure that when someone is removed
# for passing to Bugzilla::BugMail to ensure that when someone is removed
# from one of these fields, they get notified of that fact (if desired)
#
my $origOwner = "";
@ -1612,8 +1612,8 @@ foreach my $id (@idlist) {
$col = 'component';
}
# save off the old value for passing to processmail so the old
# owner can be notified
# save off the old value for passing to Bugzilla::BugMail so
# the old owner can be notified
#
if ($col eq 'assigned_to') {
$old = ($old) ? DBID_to_name($old) : "";