Skip to content
Browse files

Merge branch 'master' of git@github.com:benadida/helios

  • Loading branch information...
2 parents 34f81b5 + 5b28107 commit 7c70284246b1ad38ab16ff7b1026af341ab3841f @benadida committed Apr 16, 2009
Showing with 3 additions and 3 deletions.
  1. +3 −3 controllers/election.py
View
6 controllers/election.py
@@ -137,7 +137,7 @@ def submit(self, voter, email, password, encrypted_vote):
The Helios Voting System
""" % (voter.name, election_obj.name, voter.get_vote_hash(), election_obj.hash)
- mail.simple_send([voter.name],[voter.email], "Helios", "system@heliosvoting.org", "your vote was recorded", mail_body)
+ mail.simple_send([voter.name],[voter.email], "Helios", "ben@adida.net", "your vote was recorded", mail_body)
return SUCCESS
@@ -718,7 +718,7 @@ def voters_email_2(self, election, introductory_message, voter_ids=None, after=N
if user:
sender_email = user.email_address
else:
- sender_email = "system@heliosvoting.org"
+ sender_email = "ben@adida.net"
for voter in voters:
logging.info("sending email to %s" % voter.email)
@@ -790,7 +790,7 @@ def email_trustees_2(self, election, body):
full_body = message % (body, election.name, config.webroot + ('/elections/%s/trustees/%s/home' % (election.election_id, utils.urlencode(trustee.email))), trustee.password)
# send out the emails for the shares
- mail.simple_send([trustee.email],[trustee.email],"Helios","system@heliosvoting.org", subject, full_body)
+ mail.simple_send([trustee.email],[trustee.email],"Helios","ben@adida.net", subject, full_body)
return "DONE"

0 comments on commit 7c70284

Please sign in to comment.
Something went wrong with that request. Please try again.