Aide + localisation.

[photoprint.git] / skins / customer_join_form.py

diff --git a/skins/customer_join_form.py b/skins/customer_join_form.py
index 4df2848..3f5beac 100755 (executable)
--- a/skins/customer_join_form.py
+++ b/skins/customer_join_form.py
@@ -1,6 +1,6 @@
 ##parameters=add=''
 from Products.CMFCore.utils import getToolByName
 ##parameters=add=''
 from Products.CMFCore.utils import getToolByName

-from Products.realis.utils import translate
+from Products.Plinn.utils import translate

 from ZTUtils import make_query as mq
 _ = lambda msg : translate(msg, context)
 ptool = getToolByName(script, 'portal_properties')
 from ZTUtils import make_query as mq
 _ = lambda msg : translate(msg, context)
 ptool = getToolByName(script, 'portal_properties')


@@ -17,7 +17,8 @@ fg = lambda name : form.get(name,'').strip()
 
 if add and \
        context.validatePassword(**form) and \
 
 if add and \
        context.validatePassword(**form) and \

-       context.customer_add_control(**form) :
+       context.customer_add_control(**form) and \
+       context.validatePrivateAccess(**form) :

        came_from = fg('came_from')
        if came_from :
                return context.setRedirect(     atool, 'user/logged_in'
        came_from = fg('came_from')
        if came_from :
                return context.setRedirect(     atool, 'user/logged_in'


@@ -38,13 +39,14 @@ continuationFields = [
        , 'member_id'
        , 'password'
        , 'confirm'
        , 'member_id'
        , 'password'
        , 'confirm'

-       , 'send_password'
+       , 'collection_id'
+       , 'collection_password'
+       , 'collection_password_confirm'

        , 'billing_address'
        , 'billing_city'
        , 'billing_zipcode'
        , 'country'
        , 'billing_address'
        , 'billing_city'
        , 'billing_zipcode'
        , 'country'

-       , 'phone'
-       , 'accept_gcs']
+       , 'phone']

 
 
 for name in continuationFields :
 
 
 for name in continuationFields :