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

diff --combined portal/views.py
index 902759e,7e79382..f72f6ce
--- 1/portal/views.py
--- 2/portal/views.py
+++ b/portal/views.py
@@@ -21,10 -21,10 +21,10 @@@
  # this program; see the file COPYING.  If not, write to the Free Software
  # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
 -from django.conf                 import settings
 -from django.contrib.sites.models import Site, RequestSite
 -from django.contrib              import messages
 -from django.views.generic        import View
 +import os.path, re
 +import json
 +
 +#from django.views.generic        import View
  from django.views.generic.base   import TemplateView
  from django.shortcuts            import render
  from django.template.loader      import render_to_string
@@@ -36,6 -36,7 +36,6 @@@ from plugins.lists.simplelist    impor
  from plugins.hazelnut            import Hazelnut
  from plugins.pres_view           import PresView
  from portal.event import Event
 -import json
  
  from portal                      import signals
  from portal.forms                import SliceRequestForm, ContactForm
@@@ -48,6 -49,9 +48,6 @@@ from unfold.page                 impor
  from myslice.viewutils           import topmenu_items, the_user
  from django.http                 import HttpResponseRedirect, HttpResponse
  
 -from M2Crypto                    import Rand, RSA, BIO
 -import os, re
 -
  #class for my_account
  class AccountView(TemplateView):
      template_name = "my_account.html"
@@@ -212,7 -216,7 +212,7 @@@ def register_4m_f4f(request)
          #get_email = PendingUser.objects.get(email)
          reg_fname = request.POST.get('firstname', '')
          reg_lname = request.POST.get('lastname', '')
-         reg_aff = request.POST.get('affiliation','')
+         #reg_aff = request.POST.get('affiliation','')
          reg_auth = request.POST.get('authority_hrn', '')
          reg_email = request.POST.get('email','').lower()
          
@@@ -225,8 -229,8 +225,8 @@@
              errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
              #return HttpResponse("Only Letters, Numbers, - and _ is allowed in Last name")
              #return render(request, 'register_4m_f4f.html')
-         if (re.search(r'^[\w+\s.@+-]+$', reg_aff) == None):
-             errors.append('Affiliation may contain only letters, numbers, spaces and @/./+/-/_ characters.')
+ #        if (re.search(r'^[\w+\s.@+-]+$', reg_aff) == None):
+ #            errors.append('Affiliation may contain only letters, numbers, spaces and @/./+/-/_ characters.')
              #return HttpResponse("Only Letters, Numbers and _ is allowed in Affiliation")
              #return render(request, 'register_4m_f4f.html')
          # XXX validate authority hrn !!
@@@ -269,7 -273,7 +269,7 @@@
              b = PendingUser(
                  first_name=reg_fname, 
                  last_name=reg_lname, 
-                 affiliation=reg_aff,
+                 #affiliation=reg_aff,
                  authority_hrn=reg_auth,
                  email=reg_email, 
                  password=request.POST['password'],
@@@ -281,7 -285,7 +281,7 @@@
              ctx = {
                  first_name   : reg_fname, 
                  last_name    : reg_lname, 
-                 affiliation  : reg_aff,
+                 #affiliation  : reg_aff,
                  authority_hrn: reg_auth,
                  email        : reg_email, 
                  keypair      : keypair,
@@@ -302,7 -306,7 +302,7 @@@
          'errors': errors,
          'firstname': request.POST.get('firstname', ''),
          'lastname': request.POST.get('lastname', ''),
-         'affiliation': request.POST.get('affiliation', ''),
+         #'affiliation': request.POST.get('affiliation', ''),
          'authority_hrn': request.POST.get('authority_hrn', ''),
          'email': request.POST.get('email', ''),
          'password': request.POST.get('password', ''),