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 57380bba Safer in case (availid) is missing
57380bba is described below
commit 57380bba6c0179d2d9577491e6c52f25d0b827fe
Author: Sebb <[email protected]>
AuthorDate: Thu Feb 23 17:47:51 2023 +0000
Safer in case (availid) is missing
---
www/members/proxy.cgi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index 943ec291..a52f6d86 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -150,6 +150,7 @@ def emit_form(cur_mtg_dir, meeting, volunteers, disabled)
_ "IMPORTANT! Be sure to tell the person that you select as
proxy above that you've assigned them to mark your attendance! They simply need
to mark your proxy attendance when the meeting starts."
_a 'Read full procedures for Member Meeting', href:
'https://www.apache.org/foundation/governance/members.html#meetings'
end
+ _p 'Note that you cannot select a member who has provided a proxy'
_div.button_group.text_center do
if disabled
_button.btn.btn_primary 'Submit', :disabled
@@ -230,7 +231,8 @@ def emit_post(cur_mtg_dir, meeting, _)
proxy = form[/hereby authorize ([\S].*) to act/, 1].
gsub('_', ' ').strip
# Ensure availid is not included in proxy name here
- proxy = proxy[/([^(]+)/, 1].strip
+ proxy.sub!(%r{\([^)]+\)}, '')
+ proxy.strip!
name = form[/signature: ([\S].*)/, 1].gsub(/[\/_]/, ' ').strip
" #{proxy.ljust(24)} #{name} (#{id})"
