dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed 1765:Verify email message seams to only accept username, key and link

Browse Source
This commit is contained in:
Massimo
2013-11-07 10:31:54 -06:00
parent e6f84c45b9
commit 73ab77ad8b
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.7.4-stable+timestamp.2013.11.07.10.23.59 Version 2.7.4-stable+timestamp.2013.11.07.10.31.18
gluon/tools.py
+10 -11
View File
@@ -2558,14 +2558,12 @@ class Auth(object):
if self.settings.registration_requires_verification: if self.settings.registration_requires_verification:
link = self.url( link = self.url(
self.settings.function, args=('verify_email', key), scheme=True) self.settings.function, args=('verify_email', key), scheme=True)
d = dict(request.vars)
if not self.settings.mailer or \ d.update(dict(key=key, link=link,username=form.vars[username]))
not self.settings.mailer.send( if not (self.settings.mailer and self.settings.mailer.send(
to=form.vars.email, to=form.vars.email,
subject=self.messages.verify_email_subject, subject=self.messages.verify_email_subject,
message=self.messages.verify_email message=self.messages.verify_email % d)):
% dict(key=key, link=link,
username=form.vars[username])):
self.db.rollback() self.db.rollback()
response.flash = self.messages.unable_send_email response.flash = self.messages.unable_send_email
return form return form
@@ -2945,11 +2943,12 @@ class Auth(object):
link = self.url(self.settings.function, link = self.url(self.settings.function,
args=('reset_password', reset_password_key), args=('reset_password', reset_password_key),
scheme=True) scheme=True)
if self.settings.mailer.send( d = dict(user)
d.update(dict(key=reset_password_key, link=link))
if self.settings.mailer and self.settings.mailer.send(
to=user.email, to=user.email,
subject=self.messages.reset_password_subject, subject=self.messages.reset_password_subject,
message=self.messages.reset_password % message=self.messages.reset_password % d):
dict(key=reset_password_key, link=link)):
user.update_record(reset_password_key=reset_password_key) user.update_record(reset_password_key=reset_password_key)
return True return True
return False return False