page = Page(request)
page.add_js_files ( [ "js/jquery.validate.js", "js/join.js" ] )
page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] )
- page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
+ page.add_css_files ( [ "https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
if method == 'POST':
# xxx tocheck - if authorities is empty, it's no use anyway
errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
if (re.search(r'^[\w+\s.@+-]+$', reg_lname) == None):
errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
- if (re.search(r'^\w+$', reg_site_authority) == None):
- errors.append('Site Authority may contain only letters or numbers.')
+ #if (re.search(r'^\w+$', reg_site_authority) == None):
+ # errors.append('Site Authority may contain only letters or numbers.')
# checking in django_db !!
if PendingUser.objects.filter(email__iexact=reg_email):
errors.append('Email is pending for validation. Please provide a new email address.')
- if PendingAuthority.objects.filter(site_authority__iexact=reg_auth):
- errors.append('This site is pending for validation.')
- if PendingAuthority.objects.filter(site_name__iexact=reg_site_name):
+ if PendingAuthority.objects.filter(site_abbreviated_name__iexact=reg_site_abbreviated_name):
errors.append('This site is pending for validation.')
+ #if PendingAuthority.objects.filter(site_name__iexact=reg_site_name):
+ # errors.append('This site is pending for validation.')
if UserModel._default_manager.filter(email__iexact=reg_email):
errors.append('This email is not usable. Please contact the administrator or try with another email.')
account_config = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}'
auth_type = 'managed'
public_key = public_key.replace('"', '');
+ private_key = private_key.replace('"', '');
if not errors:
reg_password = request.POST['pi_password']
a = PendingAuthority(
site_name = reg_site_name,
- site_authority = reg_root_authority_hrn + '.' + reg_site_authority,
+ site_authority = 'onelab.' + reg_site_abbreviated_name,
site_abbreviated_name = reg_site_abbreviated_name,
site_url = reg_site_url,
site_latitude = reg_site_latitude,
authority_hrn = reg_auth,
email = reg_email,
password = reg_password,
- keypair = account_config,
+ public_key = public_key,
+ private_key = private_key,
+ user_hrn = user_hrn,
pi = reg_auth,
+ email_hash = '',
+ status = 'True',
)
b.save()
user = User.objects.create_user(reg_email, reg_email, reg_password)
#creating user to manifold local:user
- user_config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
- user_params = {'email': reg_email, 'password': reg_password, 'config': user_config, 'status': 1}
- manifold_add_user(request,user_params)
+ #user_config = '{"first_name":"'+ reg_fname + '", "last_name":"'+ reg_lname + '", "authority_hrn":"'+ reg_auth + '"}'
+ #user_params = {'email': reg_email, 'password': reg_password, 'config': user_config, 'status': 1}
+ #manifold_add_user(request,user_params)
#creating local:account in manifold
- user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user
- account_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': account_config}
- manifold_add_account(request,account_params)
+ #user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user
+ #account_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': account_config}
+ #manifold_add_account(request,account_params)
# Send email
try:
sender = render_to_string(theme.template, ctx)
sender = sender.replace('\n', '')
- msg = EmailMultiAlternatives(subject, text_content, sender, [recipients])
+ msg = EmailMultiAlternatives(subject, text_content, sender, recipients)
msg.attach_alternative(html_content, "text/html")
msg.send()