Author: humbedooh
Date: Tue Mar 15 18:20:20 2016
New Revision: 1735155
URL: http://svn.apache.org/viewvc?rev=1735155&view=rev
Log:
fix proxy split
Modified:
steve/trunk/pysteve/www/cgi-bin/rest_voter.py
Modified: steve/trunk/pysteve/www/cgi-bin/rest_voter.py
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/www/cgi-bin/rest_voter.py?rev=1735155&r1=1735154&r2=1735155&view=diff
==============================================================================
--- steve/trunk/pysteve/www/cgi-bin/rest_voter.py (original)
+++ steve/trunk/pysteve/www/cgi-bin/rest_voter.py Tue Mar 15 18:20:20 2016
@@ -136,7 +136,7 @@ if pathinfo:
votehash = election.vote(electionID, issueID,
voterID, vote)
voteuid = hashlib.sha224(voterID).hexdigest()
# Catch proxy-emails
- m = re.match(r"^(.+@.*?[a-zA-Z])-.+$", email)
+ m = re.match(r"^(.+@.*?[a-zA-Z])-[^.]+$", email)
if m:
email = m.group(1)
voter.email(email, "Vote registered: %s (%s)" %
(issueID, issuedata['title']), "This is a receipt that your vote was registered
for issue #%s:\n\nElection: %s (%s)\nIssue: %s (%s)\nVote cryptohash: %s\nVote
UID: %s" % (issueID, basedata['title'], electionID, issuedata['title'],
issueID, votehash, voteuid))
