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

[tim at mail.se.linux.org]

Author: tim
Date: 2007-07-20 13:18:52 +0200 (Fri, 20 Jul 2007)
New Revision: 66

Added:
   selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/selinux_register.cpy
   selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/selinux_register.cpy.metadata
Removed:
   selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy
   selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy.metadata
Modified:
   selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/join_form.cpt.metadata
Log:
Let's reuse the plone register stuff again. There was another error that prevented the last attempt to work.


Modified: selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/join_form.cpt.metadata
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/join_form.cpt.metadata	2007-07-20 09:45:52 UTC (rev 65)
+++ selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/join_form.cpt.metadata	2007-07-20 11:18:52 UTC (rev 66)
@@ -6,5 +6,5 @@
 validators = validate_emailaddr,join_form_validate
 
 [actions]
-action.success = traverse_to:string:register
+action.success = traverse_to:string:selinux_register
 action.failure = traverse_to:string:join_form

Deleted: selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy	2007-07-20 09:45:52 UTC (rev 65)
+++ selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy	2007-07-20 11:18:52 UTC (rev 66)
@@ -1,72 +0,0 @@
-## Controller Python Script "register"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind state=state
-##bind subpath=traverse_subpath
-##parameters=password='password', password_confirm='password_confirm', came_from_prefs=None
-##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

Deleted: selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy.metadata
===================================================================
--- selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy.metadata	2007-07-20 09:45:52 UTC (rev 65)
+++ selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy.metadata	2007-07-20 11:18:52 UTC (rev 66)
@@ -1,11 +0,0 @@
-[default]
-title=Register a User
-proxy=Manager,Anonymous
-
-[validators]
-validators = join_form_validate
- 
-[actions]
-action.failure=traverse_to:string:join_form
-action.success=traverse_to:string:registered
-action.prefs=traverse_to:string:prefs_users_overview

Copied: selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/selinux_register.cpy (from rev 64, selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy)

Copied: selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/selinux_register.cpy.metadata (from rev 64, selinux-site/trunk/selinux.theme/selinux/theme/skins/selinuxtheme/register.cpy.metadata)