[CMF-checkins] CVS: CMF - register.dtml:1.2
tseaver@digicool.com
tseaver@digicool.com
Tue, 27 Mar 2001 15:45:53 -0500 (EST)
Update of /cvs-repository/CMF/CMFDefault/skins/control
In directory korak:/tmp/cvs-serv18203/CMFDefault/skins/control
Modified Files:
register.dtml
Log Message:
* Move actual mail sending into CMFDefault.RegistrationTool, to
avoid having to give proxy roles to the skin methods involved
(Tracker issue #160).
--- Updated File register.dtml in package CMF --
--- register.dtml 2001/02/23 14:24:09 1.1
+++ register.dtml 2001/03/27 20:45:52 1.2
@@ -1,5 +1,6 @@
<dtml-if expr="not portal_properties.validate_email">
- <dtml-let failMessage="portal_registration.testPasswordValidity(password, confirm)">
+ <dtml-let failMessage="portal_registration.testPasswordValidity( password
+ , confirm)">
<dtml-if failMessage>
<dtml-return expr="join_form(_.None, _, error=failMessage)">
</dtml-if>
@@ -9,10 +10,16 @@
<dtml-if failMessage>
<dtml-return expr="join_form(_.None, _, error=failMessage)">
<dtml-else>
- <dtml-let password="REQUEST.has_key('password') and REQUEST['password'] or portal_registration.generatePassword()">
- <dtml-call expr="portal_registration.addMember(REQUEST['username'], password, properties=REQUEST)">
- <dtml-if expr="portal_properties.validate_email or REQUEST.get('mail_me', 0)">
- <dtml-call expr="registered_notify(_.None, _, password=password)">
+ <dtml-let password="REQUEST.has_key('password')
+ and REQUEST['password']
+ or portal_registration.generatePassword()">
+ <dtml-call expr="portal_registration.addMember( REQUEST['username']
+ , password
+ , properties=REQUEST)">
+ <dtml-if expr="portal_properties.validate_email
+ or REQUEST.get('mail_me', 0)">
+ <dtml-call expr="portal_registration.registeredNotify(
+ REQUEST['username'] )">
</dtml-if>
<dtml-return registered>
</dtml-let>