[whimsy] branch master updated: Link is for internal use only

[se...@apache.org]

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

sebb 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 9284c8f4 Link is for internal use only
9284c8f4 is described below

commit 9284c8f40f7c1652308189eece0319a196042cc8
Author: Sebb <se...@apache.org>
AuthorDate: Wed Nov 2 23:46:39 2022 +0000

    Link is for internal use only
---
 www/officers/acreq.cgi                      | 7 +++++--
 www/secretary/workbench/templates/acreq.erb | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/www/officers/acreq.cgi b/www/officers/acreq.cgi
index 2b2df878..d5b05f2c 100755
--- a/www/officers/acreq.cgi
+++ b/www/officers/acreq.cgi
@@ -310,21 +310,24 @@ _html do
 
                   mail.subject "[FORM] Account Request - #{requestor}: #{@name}"
 
-                  mail.body = <<-EOF.gsub(/^ {10}/, '').gsub(/(Vote reference:)?\n\s+\n/, "\n\n")
+                  # N.B. The second gsub below drops the Vote reference paragraph if there is no reference
+                  mail.body = <<-EOF.gsub(/^ {10}/, '').gsub(/(Vote reference:)?\n\s+\n\s+\(This link is.+\)\n/, "\n\n")
                     Prospective userid: #{@user}
                     Full name: #{@name}
                     Forwarding email address: #{@email}
 
                     Vote reference:
                       #{@votelink.to_s.gsub('mail-search.apache.org/pmc/', 'mail-search.apache.org/members/')}
+                      (This link is for internal use, and is not visible to applicants)
 
                     #{@comments}
 
-                    --
+                    --#{' '}
                     Submitted by https://#{ENV['HTTP_HOST']}#{ENV['REQUEST_URI'].split('?').first}
                     From #{`/usr/bin/host #{ENV['REMOTE_ADDR']}`.chomp}
                     Using #{ENV['HTTP_USER_AGENT']}
                   EOF
+                  # the suffix #{' '} above is used to add a trailing space that is visible in code
 
                   msg = "#{@user} account request by #{user.id} for #{requestor}"
                   rc = ASF::SVN.update(ASF::SVN.svnpath!('acreq', 'new-account-reqs.txt'), msg, env, _) do |_dir, input|
diff --git a/www/secretary/workbench/templates/acreq.erb b/www/secretary/workbench/templates/acreq.erb
index cf5ea023..1f7e99b5 100644
--- a/www/secretary/workbench/templates/acreq.erb
+++ b/www/secretary/workbench/templates/acreq.erb
@@ -7,6 +7,7 @@ Forwarding email address: <%= @email %>
 
 Vote reference:
   <%= @votelink.to_s.gsub('mail-search.apache.org/pmc/', %'mail-search.apache.org/members/') %>
+(This link is for internal use, and is not visible to applicants)
 
 Please note: it can take up to a week for the request to be processed.