From: rafrombrc <svn...@pl...> - 2006-09-28 19:22:45
|
Author: rafrombrc Date: Thu Sep 28 19:22:35 2006 New Revision: 11011 Modified: CMFPlone/branches/2.5/RegistrationTool.py CMFPlone/branches/2.5/skins/plone_login/join_form.cpt CMFPlone/branches/2.5/skins/plone_login/registered.pt Log: * move some behaviour from CMFDefault RegistrationTool up into CMFPlone's so we can better interact w/ password reset tool at registration time * improve some UI text to indicate that we're not mailing a password, but are mailing a password reset token Modified: CMFPlone/branches/2.5/RegistrationTool.py ============================================================================== --- CMFPlone/branches/2.5/RegistrationTool.py (original) +++ CMFPlone/branches/2.5/RegistrationTool.py Thu Sep 28 19:22:35 2006 @@ -185,7 +185,29 @@ if not utils.validateSingleEmailAddress(member.getProperty('email')): raise ValueError, 'The email address did not validate' - return BaseTool.registeredNotify(self, new_member_id) + email = member.getProperty( 'email' ) + check, msg = _checkEmail(email) + if not check: + raise ValueError, msg + + pwrt = getToolByName(self, 'portal_password_reset') + reset = pwrt.requestReset(new_member_id) + + # Rather than have the template try to use the mailhost, we will + # render the message ourselves and send it from here (where we + # don't need to worry about 'UseMailHost' permissions). + mail_text = self.registered_notify_template( self + , self.REQUEST + , member=member + , reset=reset + , email=email + ) + + host = self.MailHost + host.send( mail_text ) + + return self.mail_password_response( self, self.REQUEST ) + RegistrationTool.__doc__ = BaseTool.__doc__ Modified: CMFPlone/branches/2.5/skins/plone_login/join_form.cpt ============================================================================== --- CMFPlone/branches/2.5/skins/plone_login/join_form.cpt (original) +++ CMFPlone/branches/2.5/skins/plone_login/join_form.cpt Thu Sep 28 19:22:35 2006 @@ -205,8 +205,9 @@ tal:condition="allowEnterPassword"> <div class="formHelp" i18n:translate="label_password_will_be_mailed"> - A password will be generated and - e-mailed to you to complete the registration process. + A URL will be generated and e-mailed to you; follow the link + to reach a page where you can change your password and + complete the registration process. </div> </div> Modified: CMFPlone/branches/2.5/skins/plone_login/registered.pt ============================================================================== --- CMFPlone/branches/2.5/skins/plone_login/registered.pt (original) +++ CMFPlone/branches/2.5/skins/plone_login/registered.pt Thu Sep 28 19:22:35 2006 @@ -18,16 +18,16 @@ <p i18n:translate="description_you_are_registered">You have been registered.</p> -<p tal:condition="ve" i18n:translate="description_you_will_get_password"> - You will receive an e-mail shortly containing your password. When you - receive your password, you can - <span i18n:name="log_in_here"> - <a href="#" - tal:attributes="href string:$portal_url/login_form" - i18n:translate="label_log_in_here"> - log in here - </a> - </span>. +<p tal:condition="ve" + tal:define="expire_length portal/portal_password_reset/getExpirationTimeout" + i18n:translate="description_you_will_get_password"> + You will receive an e-mail shortly containing a URL that will + allow you to set your password. When you receive this e-mail, + please follow the link to complete your registration process. + NOTE: The password reset URL will expire in + <span tal:replace="expire_length" /> hours. If your password + reset request expires, you may use the "Forgot your password" link + to generate another password reset request. </p> <tal:block condition="python:not(ve)"> |