From 03a483b3aeb114a27d435fb0035faf7b993e364d Mon Sep 17 00:00:00 2001
From: "justdave%syndicomm.com"
 <justdave%syndicomm.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 24 Jan 2003 00:27:28 +0000
Subject: [PATCH] Bug 106918: the "movers" param was not being interpreted
 correctly by move.pl or the show_bug template.  Also the exporter value was
 not properly fed into the xml template. r= myk, a= justdave

git-svn-id: svn://10.0.0.236/trunk@136914 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/Bug.pm          | 2 ++
 mozilla/webtools/bugzilla/Bugzilla/Bug.pm | 2 ++
 mozilla/webtools/bugzilla/move.pl         | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mozilla/webtools/bugzilla/Bug.pm b/mozilla/webtools/bugzilla/Bug.pm
index 35f8402ef84..dd91d6f3f21 100755
--- a/mozilla/webtools/bugzilla/Bug.pm
+++ b/mozilla/webtools/bugzilla/Bug.pm
@@ -362,6 +362,8 @@ sub user {
     $self->{'user'} = {};
 
     my $movers = Param("movers");
+    $movers =~ s/\s?,\s?/|/g;
+    $movers =~ s/@/\@/g;
     $self->{'user'}->{'canmove'} = Param("move-enabled") 
       && (defined $::COOKIE{"Bugzilla_login"}) 
         && ($::COOKIE{"Bugzilla_login"} =~ /$movers/);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
index 35f8402ef84..dd91d6f3f21 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
@@ -362,6 +362,8 @@ sub user {
     $self->{'user'} = {};
 
     my $movers = Param("movers");
+    $movers =~ s/\s?,\s?/|/g;
+    $movers =~ s/@/\@/g;
     $self->{'user'}->{'canmove'} = Param("move-enabled") 
       && (defined $::COOKIE{"Bugzilla_login"}) 
         && ($::COOKIE{"Bugzilla_login"} =~ /$movers/);
diff --git a/mozilla/webtools/bugzilla/move.pl b/mozilla/webtools/bugzilla/move.pl
index 4807bf6d97f..7d3d845530c 100755
--- a/mozilla/webtools/bugzilla/move.pl
+++ b/mozilla/webtools/bugzilla/move.pl
@@ -86,7 +86,7 @@ if ( !defined $::FORM{'buglist'} ) {
 
 my $exporter = $::COOKIE{"Bugzilla_login"};
 my $movers = Param("movers");
-$movers =~ s/\w?,\w?/|/g;
+$movers =~ s/\s?,\s?/|/g;
 $movers =~ s/@/\@/g;
 unless ($exporter =~ /($movers)/) {
   print "Content-type: text/html\n\n";
@@ -149,7 +149,7 @@ $from =~ s/@/\@/;
 $msg .= "From: Bugzilla <" . $from . ">\n";
 $msg .= "Subject: Moving bug(s) $buglist\n\n";
 
-$template->process("bug/show.xml.tmpl", { bugs => \@bugs }, \$msg)
+$template->process("bug/show.xml.tmpl", { user => { login => $exporter }, bugs => \@bugs }, \$msg)
   || ThrowTemplateError($template->error());
 
 $msg .= "\n";