From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 14 Jan 2014 14:52:09 +0000 (+0100)
Subject: Reg:Email body modified. added email cross_check with django auth_user table
X-Git-Tag: myslice-0.3-0~34^2~2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=d36bad9f19a0187f44568eace72630224f7162e6

Reg:Email body modified. added email cross_check with django auth_user table
---

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 5c48726d..08d67298 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -6,6 +6,7 @@ from django.contrib.auth.models import User
 from django.views.generic       import View
 from django.template.loader     import render_to_string
 from django.shortcuts           import render
+from django.contrib.auth        import get_user_model
 
 from unfold.page                import Page
 from unfold.loginrequired       import FreeAccessView
@@ -73,18 +74,22 @@ class RegistrationView (FreeAccessView):
             split_email = reg_email.split("@")[0] 
             split_email = split_email.replace(".", "_")
             user_hrn = reg_auth + '.' + split_email
+            
+            UserModel = get_user_model()
 
             #POST value validation  
             if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None):
                 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.')
-            # XXX validate authority hrn !!
+            # 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 UserModel._default_manager.filter(email__iexact=reg_email): 
+                errors.append('This email is not usable. Please contact the administrator or try with another email.')
             for user_detail in user_details:
                 if user_detail['email']==reg_email:
-                    errors.append('Email already exists in Manifold. Please provide a new email address.')
+                    errors.append('Email already registered in Manifold. Please provide a new email address.')
 
 # XXX TODO: Factorize with portal/accountview.py
             if 'generate' in request.POST['question']:
@@ -162,7 +167,7 @@ class RegistrationView (FreeAccessView):
                     'authority_hrn' : reg_auth,
                     'email'         : reg_email,
                     'user_hrn'      : user_hrn,
-                    'keypair'       : 'Public Key: ' + public_key,
+                    'public_key'    : public_key,
                     'cc_myself'     : True # form.cleaned_data['cc_myself']
                     }
                 recipients = authority_get_pi_emails(request,reg_auth)
@@ -171,7 +176,7 @@ class RegistrationView (FreeAccessView):
                     recipients.append(ctx['email'])
 
                 msg = render_to_string('user_request_email.txt', ctx)
-                send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients)
+                send_mail("Onelab New User request for %s submitted"%reg_email, msg, 'support@myslice.info', recipients)
                 return render(request, 'user_register_complete.html') 
 
         template_env = {
diff --git a/portal/templates/user_request_email.txt b/portal/templates/user_request_email.txt
index 3e18d0e9..ba37c38b 100644
--- a/portal/templates/user_request_email.txt
+++ b/portal/templates/user_request_email.txt
@@ -1,9 +1,8 @@
 NEW USER REQUEST
 
-first_name   : {{first_name}}
-last_name    : {{last_name}} 
-authority_hrn: {{authority_hrn}}
-keypair      : {{keypair}}
+First Name   : {{first_name}}
+Last Name    : {{last_name}} 
+Authority hrn: {{authority_hrn}}
+Public key   : {{public_key}}
 email        : {{email}}
-cc myself    : {{cc_myself}}