rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gen] SMTP and LDAP configuration updated. Module appy.gen.mail can now be used independently of a gen-application.

Browse source
This commit is contained in:
Gaetan Delannay 2014-09-18 11:08:29 +02:00
parent 4947e2956c
commit ecc3f07a09
8 changed files with 155 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gen/mixins/ToolMixin.py
View file

@ -8,11 +8,10 @@ from appy.gen import utils as gutils
from appy.gen.mixins import BaseMixin
from appy.gen.wrappers import AbstractWrapper
from appy.gen.descriptors import ClassDescriptor
from appy.gen.mail import sendMail
from appy.shared import mimeTypes
from appy.shared import utils as sutils
from appy.shared.data import languages
from appy.shared.ldap_connector import LdapConnector
from appy.shared.ldap import LdapConnector
try:
from AccessControl.ZopeSecurityPolicy import _noroles
except ImportError:
@ -1334,7 +1333,7 @@ class ToolMixin(BaseMixin):
subject = self.translate('reinit_password')
map = {'url':initUrl, 'siteUrl':self.getSiteUrl()}
body= self.translate('reinit_password_body', mapping=map, format='text')
sendMail(appyTool, email, subject, body)
appyTool.sendMail(email, subject, body)
return self.goto(backUrl, msg)
def doPasswordReinit(self):
@ -1363,7 +1362,7 @@ class ToolMixin(BaseMixin):
map = {'password': newPassword, 'siteUrl': siteUrl}
body = self.translate('new_password_body', mapping=map,
format='text')
sendMail(appyTool, email, subject, body)
appyTool.sendMail(email, subject, body)
os.remove(tokenFile)
res = self.goto(siteUrl, self.translate('new_password_sent'))
if not res: