From: Yasin <root@lamia.ipv6.lip6.fr>
Date: Wed, 4 Jun 2014 16:20:14 +0000 (-0500)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~68^2~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a1f72f680d4745eb0352b499819ac4672deceb66;hp=-c;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

a1f72f680d4745eb0352b499819ac4672deceb66
diff --combined portal/registrationview.py
index 88bd5aef,04a0d10e..f7314473
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@@ -57,7 -57,9 +57,9 @@@ class RegistrationView (FreeAccessView
              current_site = current_site.domain
  
              post_email = wsgi_request.POST.get('email','').lower()
-             email_hash = md5(post_email).digest().encode('base64')[:-1]
+             salt = randint(1,100000)
+             email_hash = md5(str(salt)+post_email).hexdigest()
+             #email_hash = md5(post_email).digest().encode('base64')[:-1]
              user_request = {
                  'first_name'    : wsgi_request.POST.get('firstname',     ''),
                  'last_name'     : wsgi_request.POST.get('lastname',      ''),
@@@ -66,7 -68,7 +68,7 @@@
                  'password'      : wsgi_request.POST.get('password',      ''),
                  'current_site'  : current_site,
                  'email_hash'    : email_hash,
 -                'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash
 +                'validation_link': 'https://' + current_site + '/portal/email_activation/'+ email_hash
              }
  
              # Construct user_hrn from email (XXX Should use common code)