Bug 288170: importxml.pl and move.pl should not write to $datadir/maillog - Patch...

diff --git a/importxml.pl b/importxml.pl
index b8e0174128a9f7013125ab37754ca87ae647d278..0d9dcb8683782e1eadee2fa8745ef743f0b5a999 100755 (executable)
--- a/importxml.pl
+++ b/importxml.pl
@@ -71,7 +71,6 @@ use Bugzilla::User;
 
 require "CGI.pl";
 require "globals.pl";
-$::lockcount = 0;
 
 GetVersionTable();
 
@@ -117,40 +116,6 @@ sub MailMessage {
 
   my $sendmessage = $header . $message . "\n";
   Bugzilla::BugMail::MessageToMTA($sendmessage);
-
-  Log($subject . " sent to: $to");
-}
-
-
-sub Log {
-    my ($str) = (@_);
-    Lock();
-    open(FID, ">>$datadir/maillog") || die "Can't write to $datadir/maillog";
-    print FID time2str("%D %H:%M", time()) . ": $str\n";
-    close FID;
-    Unlock();
-}
-
-sub Lock {
-    if ($::lockcount <= 0) {
-        $::lockcount = 0;
-        open(LOCKFID, ">>$datadir/maillock") || die "Can't open $datadir/maillock: $!";
-        my $val = flock(LOCKFID,2);
-        if (!$val) { # '2' is magic 'exclusive lock' const.
-            print Bugzilla->cgi->header();
-            print "Lock failed: $val\n";
-        }
-        chmod 0666, "$datadir/maillock";
-    }
-    $::lockcount++;
-}
-
-sub Unlock {
-    $::lockcount--;
-    if ($::lockcount <= 0) {
-        flock(LOCKFID,8);       # '8' is magic 'unlock' const.
-        close LOCKFID;
-    }
 }
 
 

diff --git a/move.pl b/move.pl
index 7747baaed1481dec3c56501ef851b03dc2c7e8ed..4dbae4c547a6ee35cc108dc78e2a1aa3b2815442 100755 (executable)
--- a/move.pl
+++ b/move.pl
@@ -36,8 +36,6 @@ use Bugzilla::Bug;
 use Bugzilla::Config qw(:DEFAULT $datadir);
 use Bugzilla::BugMail;
 
-$::lockcount = 0;
-
 unless ( Param("move-enabled") ) {
   print "\n<P>Sorry. Bug moving is not enabled here. ";
   print "If you need to move a bug, contact " . Param("maintainer");
@@ -48,37 +46,6 @@ Bugzilla->login(LOGIN_REQUIRED);
 
 my $cgi = Bugzilla->cgi;
 
-sub Log {
-    my ($str) = (@_);
-    Lock();
-    open(FID, ">>$datadir/maillog") || die "Can't write to $datadir/maillog";
-    print FID time2str("%D %H:%M", time()) . ": $str\n";
-    close FID;
-    Unlock();
-}
-
-sub Lock {
-    if ($::lockcount <= 0) {
-        $::lockcount = 0;
-        open(LOCKFID, ">>$datadir/maillock") || die "Can't open $datadir/maillock: $!";
-        my $val = flock(LOCKFID,2);
-        if (!$val) { # '2' is magic 'exclusive lock' const.
-            print $cgi->header();
-            print "Lock failed: $val\n";
-        }
-        chmod 0666, "$datadir/maillock";
-    }
-    $::lockcount++;
-}
-
-sub Unlock {
-    $::lockcount--;
-    if ($::lockcount <= 0) {
-        flock(LOCKFID,8);       # '8' is magic 'unlock' const.
-        close LOCKFID;
-    }
-}
-
 if (!defined $cgi->param('buglist')) {
   print $cgi->header();
   PutHeader("Move Bugs");
@@ -171,6 +138,3 @@ $template->process("bug/show.xml.tmpl", { bugs => \@bugs,
 $msg .= "\n";
 
 Bugzilla::BugMail::MessageToMTA($msg);
-
-my $logstr = "XML: bugs $buglist sent to $to";
-Log($logstr);