This is an automated email from the ASF dual-hosted git repository.
curcuru 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 ba3a52b7 Cleanup emails; bcc notifications@whimsical
ba3a52b7 is described below
commit ba3a52b763c840a5ceeee48e73fee8b459ffddf6
Author: Shane Curcuru <[email protected]>
AuthorDate: Fri Jan 24 23:10:11 2025 -0500
Cleanup emails; bcc notifications@whimsical
---
www/members/board-nominate.cgi | 12 +++++++-----
www/members/member_nominations.cgi | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/www/members/board-nominate.cgi b/www/members/board-nominate.cgi
index 25c59f0e..819154b1 100755
--- a/www/members/board-nominate.cgi
+++ b/www/members/board-nominate.cgi
@@ -70,6 +70,7 @@ end
# Return status string if we think mail was sent
def send_nomination_mail(formdata: {})
uid = formdata['availid']
+ nomby = formdata['nomby']
public_name = ASF::Person.new(uid).public_name
secby = formdata.fetch('secby', nil)
secby.nil? ? nomseconds = '' : nomseconds = "Nomination seconded by:
#{secby}" unless secby.nil?
@@ -82,22 +83,23 @@ Nominee has been added:
#{nomseconds}
--
-- #{ASF::Person[$USER].public_name}
- Sent by Whimsy; data in Meetings/current/#{NOMINATION_FILE}
+- #{ASF::Person[nomby].public_name}
+ Email generated by Whimsy (#{File.basename(__FILE__)})
MAILBODY
ASF::Mail.configure
mail = Mail.new do
to MAILING_LIST
- from $USER
+ bcc '[email protected]'
+ from "#{ASF::Person[nomby].public_name} <#{nomby}@apache.org>"
subject "[BOARD NOMINATION] #{ASF::Person.new(uid).public_name} (#{uid})"
text_part do
body mail_body
end
end
mail.deliver!
- return "The following email was just sent on your behalf:\n\n#{mail_body}"
+ return "The following email was sent to #{MAILING_LIST}:\n\n#{mail_body}"
end
# Produce HTML
@@ -118,7 +120,7 @@ _html do
ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
- _h3 'BETA - please report any errors at private@whimsical!'
+ _h3 'TESTING - please report any errors at private@whimsical!'
_b "For: #{timelines['meeting_type']} Meeting on:
#{timelines['meeting_iso']}"
_p %Q{
This form can be used to nominate candidates for the ASF Board of
Director election if they are already Members.
diff --git a/www/members/member_nominations.cgi
b/www/members/member_nominations.cgi
index befcd671..06cc7974 100755
--- a/www/members/member_nominations.cgi
+++ b/www/members/member_nominations.cgi
@@ -71,6 +71,7 @@ end
# Return status string if we think mail was sent
def send_nomination_mail(formdata: {})
uid = formdata['availid']
+ nomby = formdata['nomby']
public_name = ASF::Person.new(uid).public_name
secby = formdata.fetch('secby', nil)
secby.nil? ? nomseconds = '' : nomseconds = "Nomination seconded by:
#{secby}" unless secby.nil?
@@ -83,22 +84,23 @@ Candidate has been added:
#{nomseconds}
--
-- #{ASF::Person[$USER].public_name}
- Sent by Whimsy; data in Meetings/current/#{NOMINATION_FILE}
+- #{ASF::Person[nomby].public_name}
+ Email generated by Whimsy (#{File.basename(__FILE__)})
MAILBODY
ASF::Mail.configure
mail = Mail.new do
to MAILING_LIST
- from $USER
+ bcc '[email protected]'
+ from "#{ASF::Person[nomby].public_name} <#{nomby}@apache.org>"
subject "[MEMBER NOMINATION] #{ASF::Person.new(uid).public_name} (#{uid})"
text_part do
body mail_body
end
end
mail.deliver!
- return "The following email was just sent on your behalf:\n\n#{mail_body}"
+ return "The following email was sent to #{MAILING_LIST}:\n\n#{mail_body}"
end
# Produce HTML
@@ -121,7 +123,7 @@ _html do
ASF::SVN.svnpath!('Meetings') => 'Official Meeting Agenda Directory'
},
helpblock: -> {
- _h3 'BETA - please report any errors at private@whimsical!'
+ _h3 'TESTING - please report any errors at private@whimsical!'
_b "For: #{timelines['meeting_type']} Meeting on:
#{timelines['meeting_iso']}"
_p %Q{
This form can be used to nominate new candidates for ASF Membership
if they are already committers.
