[whimsy] branch master updated: put requestor in the subject line where PMC would be for project-less requests

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 62b7652  put requestor in the subject line where PMC would be for project-less requests
62b7652 is described below

commit 62b76525f2f7699722417eca2baa925a390a0d06
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Feb 17 14:38:54 2018 -0500

    put requestor in the subject line where PMC would be for project-less requests
---
 www/officers/acreq.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/officers/acreq.cgi b/www/officers/acreq.cgi
index c7616a1..ac1bd69 100755
--- a/www/officers/acreq.cgi
+++ b/www/officers/acreq.cgi
@@ -291,12 +291,13 @@ _html do
                   # determine the requesting party and cc_list
                   if @project.empty?
                     cc_list = ["operations@apache.org"]
+                    requestor = user.untaint
                   else
                     pmc_list = ASF::Committee.find(@pmc).mail_list
                     cc_list = ["private@#{pmc_list}.apache.org".untaint]
+                    requestor = @pmc[/([\w.-]+)/, 1].untaint
                   end
 
-                  requestor = @pmc[/([\w.-]+)/, 1].untaint
                   if requestor == 'incubator' and not @podling.to_s.empty?
                     if File.read("#{APMAIL_BIN}/.archives").include? "incubator-#{@podling}-private"
                       cc_list << "#{@podling}-private@#{pmc_list}.apache.org".untaint

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.