[commits] r67 - selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme

[tim at mail.se.linux.org]

Author: tim
Date: 2007-07-20 13:20:26 +0200 (Fri, 20 Jul 2007)
New Revision: 67

Modified:
   selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/selinux_register.cpy
Log:
Reuse plone register code.


Modified: selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/selinux_register.cpy
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/selinux_register.cpy	2007-07-20 11:18:52 UTC (rev 66)
+++ selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/selinux_register.cpy	2007-07-20 11:20:26 UTC (rev 67)
@@ -1,4 +1,4 @@
-## Controller Python Script "register"
+## Controller Python Script "selinux_register"
 ##bind container=container
 ##bind context=context
 ##bind namespace=
@@ -9,64 +9,9 @@
 ##title=Register a User
 ##
 
-from Products.CMFPlone import PloneMessageFactory as _
-from ZODB.POSException import ConflictError
-
 REQUEST = context.REQUEST
 REQUEST.form['fullname'] = REQUEST['givenName'] + ' ' + REQUEST['surname']
 
-portal = context.portal_url.getPortalObject()
-portal_registration = context.portal_registration
-
-username = REQUEST['username']
-
-password=REQUEST.get('password') or portal_registration.generatePassword()
-
-# This is a temporary work-around for an issue with CMF not properly
-# reserving some existing ids (FSDV skin elements, for example). Until
-# this is fixed in the CMF we can at least fail nicely. See
-# http://dev.plone.org/plone/ticket/2982 and http://plone.org/collector/3028
-# for more info. (rohrer 2004-10-24)
-try:
-    portal_registration.addMember(username, password, properties=REQUEST, REQUEST=context.REQUEST)
-except AttributeError:
-    state.setError('username', _(u'The login name you selected is already in use or is not valid. Please choose another.'))
-    context.plone_utils.addPortalMessage(_(u'Please correct the indicated errors.'), 'error')
-    return state.set(status='failure')
-
-if portal.validate_email or REQUEST.get('mail_me', 0):
-    try:
-        portal_registration.registeredNotify(username)
-    except ConflictError:
-        raise
-    except Exception, err:
-
-        # TODO registerdNotify calls into various levels.  Lets catch all
-        # exceptions.  Should not fail.  They cant CHANGE their password ;-)
-        # We should notify them.
-        #
-        # (MSL 12/28/03) We also need to delete the just made member and return to the join_form.
-        state.set(came_from='login_success')
-        if portal.validate_email:
-            context.acl_users.userFolderDelUsers([username,], REQUEST=context.REQUEST)
-            msg = _(u'status_fatal_password_mail',
-                    default=u'Failed to create your account: we were unable to send your password to your email address: ${address}',
-                    mapping={u'address' : str(err)})
-            context.plone_utils.addPortalMessage(msg, 'error')
-            return state.set(status='failure')
-        else:
-            msg = _(u'status_nonfatal_password_mail',
-                    default=u'You account has been created, but we were unable to send your password to your email address: ${address}',
-                    mapping={u'address' : str(err)})
-            context.plone_utils.addPortalMessage(msg, 'error')
-
-state.set(came_from=REQUEST.get('came_from','login_success'))
-
-if came_from_prefs:
-    context.plone_utils.addPortalMessage(_(u'User added.'))
-    state.set(status='prefs')
-
-from Products.CMFPlone.utils import transaction_note
-transaction_note('%s registered' % username)
-
-return state
+return context.register(password=password,
+                        password_confirm=password_confirm
+                        came_from_prefs=came_from_prefs)