be able to accept default page size parameter on UserListPaginatorContext

[osqa.git] / forum / views / auth.py

diff --git a/forum/views/auth.py b/forum/views/auth.py
index d11c20bb417cb62163987aa38d7f0d1bf33088ca..3b78eed56daf1d2d8025a3fea3d3d926e47d99e0 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -3,6 +3,7 @@
 import datetime
 import logging
 import urllib
 import datetime
 import logging
 import urllib

+from urlparse import urlparse

 
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext


@@ -156,7 +157,7 @@ def external_register(request):
         form1 = SimpleRegistrationForm(request.POST)
 
         if form1.is_valid():
         form1 = SimpleRegistrationForm(request.POST)
 
         if form1.is_valid():

-            user_ = User(username=form1.cleaned_data['username'], email=form1.cleaned_data['email'])
+            user_ = User(username=form1.cleaned_data['username'], email=form1.cleaned_data['email'], real_name=form1.cleaned_data['real_name'])

             user_.email_isvalid = request.session.get('auth_validated_email', '') == form1.cleaned_data['email']
             user_.set_unusable_password()
 
             user_.email_isvalid = request.session.get('auth_validated_email', '') == form1.cleaned_data['email']
             user_.set_unusable_password()
 


@@ -196,17 +197,18 @@ def external_register(request):
 
         provider_class = AUTH_PROVIDERS[auth_provider].consumer
 
 
         provider_class = AUTH_PROVIDERS[auth_provider].consumer
 

-        # Pass the cookies to the Facebook authentication class get_user_data method. We need them to take the access token.

         if provider_class.__class__.__name__ == 'FacebookAuthConsumer':
         if provider_class.__class__.__name__ == 'FacebookAuthConsumer':

-            user_data = provider_class.get_user_data(request.COOKIES)
+            user_data = provider_class.get_user_data(request.session['access_token'])

         else:
             user_data = provider_class.get_user_data(request.session['assoc_key'])
 
         else:
             user_data = provider_class.get_user_data(request.session['assoc_key'])
 

+

         if not user_data:
             user_data = request.session.get('auth_consumer_data', {})
 
         username = user_data.get('username', '')
         email = user_data.get('email', '')
         if not user_data:
             user_data = request.session.get('auth_consumer_data', {})
 
         username = user_data.get('username', '')
         email = user_data.get('email', '')

+        real_name = user_data.get('real_name', '')

 
         if email:
             request.session['auth_validated_email'] = email
 
         if email:
             request.session['auth_validated_email'] = email


@@ -215,6 +217,7 @@ def external_register(request):
         'next': '/',
         'username': username,
         'email': email,
         'next': '/',
         'username': username,
         'email': email,

+        'real_name': real_name,

         })
 
     provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context
         })
 
     provider_context = AUTH_PROVIDERS[request.session['auth_provider']].context


@@ -407,7 +410,16 @@ def login_and_forward(request, user, forward=None, message=None):
             return manage_pending_data(request, _('save'), forward)
 
     additional_get_params = urllib.urlencode(request.GET)
             return manage_pending_data(request, _('save'), forward)
 
     additional_get_params = urllib.urlencode(request.GET)

-    return HttpResponseRedirect(forward + "?%s" % additional_get_params)
+
+    parsed_forward = urlparse(forward)
+
+    # If there is already some parsed query in the URL then change the forward URL
+    if parsed_forward.query:
+        forward_url = forward + "&%s" % additional_get_params
+    else:
+        forward_url = forward + "?%s" % additional_get_params
+
+    return HttpResponseRedirect(forward_url)

 
 def forward_suspended_user(request, user, show_private_msg=True):
     message = _("Sorry, but this account is suspended")
 
 def forward_suspended_user(request, user, show_private_msg=True):
     message = _("Sorry, but this account is suspended")