X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/5f7755b09cb6a2fc49f46dc26b0990cd5ff6204b..278ef7b50e5fcbf8b896e12fcf3c03fd43971d49:/Products/Plinn/skins/custom_generic/join_form.py

diff --git a/Products/Plinn/skins/custom_generic/join_form.py b/Products/Plinn/skins/custom_generic/join_form.py
index 579a38f..d65c8ef 100644
--- a/Products/Plinn/skins/custom_generic/join_form.py
+++ b/Products/Plinn/skins/custom_generic/join_form.py
@@ -1,4 +1,4 @@
-##parameters=b_start=0, member_id='', given_name='', name='', member_email='', password='', confirm='', send_password='', add='', ajax=''
+##parameters=member_id='', given_name='', name='', member_email='', email_as_login='', password='', confirm='', add='', ajax=''
 ##
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.permissions import ManageUsers
@@ -20,29 +20,40 @@ is_usermanager = mtool.checkPermission(ManageUsers, mtool)
 
 
 form = context.REQUEST.form
-if add and \
-		context.validatePassword(**form) and \
-		context.members_add_control(**form) and \
-		context.setRedirect(atool, 'user/join', b_start=b_start, ajax=ajax):
-	return
 
+if add :
+    if validate_email :
+        password = confirm = rtool.generatePassword()
+        ok = True
+    else :
+        ok = context.validatePassword(**form)
+    if ok :
+        try :
+            if email_as_login :
+                member_id = member_email
+        	rtool.addMember(id=member_id, password=password,
+        					properties={'username': member_id,
+        								'given_name' : given_name,
+        								'name' : name,
+        								'email': member_email})
+            if validate_email :
+                rtool.requestPasswordReset(member_id, initial=True)
+            context.setStatus(True, _('Success!'))
+            is_newmember = True
+            is_anon = False
+        except ValueError, errmsg:
+        	context.setStatus(False, errmsg)
+    
 options = {}
-
-if context.REQUEST.get('portal_status_message', '') == 'Success!':
-	is_anon = False
-	is_newmember = True
-
 options['member_id'] = member_id
 options['given_name'] = given_name
 options['name'] = name
 options['member_email'] = member_email
 options['password'] = is_newmember and context.REQUEST.get('password', '') or ''
-options['send_password'] = send_password
 options['portal_url'] = portal_url
 options['isAnon'] = is_anon
-options['isAnonOrUserManager'] = is_anon or is_usermanager
 options['isNewMember'] = is_newmember
-options['isOrdinaryMember'] = not (is_anon or is_newmember or is_usermanager)
+options['isOrdinaryMember'] = not (mtool.isAnonymousUser() or is_newmember)
 options['validate_email'] = validate_email
 options['isAnonRegistration'] = rtool.getMode() == MODE_ANONYMOUS
 options['isReviewedRegistration'] = rtool.getMode() == MODE_REVIEWED