old login system restored, merge done

2 files changed, 8 insertions, 8 deletions

diff --git a/forum/views/auth.py b/forum/views/auth.py
index 72b0af29..648bda80 100644
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -80,7 +80,7 @@ def prepare_provider_signin(request, provider):
         except InvalidAuthentication, e:
             request.session['auth_error'] = e.message
 
-        return HttpResponseRedirect(reverse('auth_signin'))    
+        return HttpResponseRedirect(reverse('user_signin'))    
 
 
 def process_provider_signin(request, provider):
@@ -91,7 +91,7 @@ def process_provider_signin(request, provider):
             assoc_key = provider_class.process_authentication_request(request)
         except InvalidAuthentication, e:
             request.session['auth_error'] = e.message
-            return HttpResponseRedirect(reverse('auth_signin'))
+            return HttpResponseRedirect(reverse('user_signin'))
 
         if request.user.is_authenticated():
             if isinstance(assoc_key, (type, User)):
@@ -112,7 +112,7 @@ def process_provider_signin(request, provider):
                     request.user.message_set.create(message=_('The new credentials are now associated with your account'))
                     return HttpResponseRedirect(reverse('user_authsettings'))
 
-            return HttpResponseRedirect(reverse('auth_signin'))
+            return HttpResponseRedirect(reverse('user_signin'))
         else:
             if isinstance(assoc_key, (type, User)):
                 return login_and_forward(request, assoc_key) 
@@ -126,7 +126,7 @@ def process_provider_signin(request, provider):
             request.session['auth_provider'] = provider
             return HttpResponseRedirect(reverse('auth_external_register'))
 
-    return HttpResponseRedirect(reverse('auth_signin'))
+    return HttpResponseRedirect(reverse('user_signin'))
 
 def external_register(request):
     if request.method == 'POST' and 'bnewaccount' in request.POST:
@@ -148,7 +148,7 @@ def external_register(request):
                 auth_provider = request.session['auth_provider']
             except:
                 request.session['auth_error'] = _("Oops, something went wrong in the middle of this process. Please try again.")
-                return HttpResponseRedirect(request.session.get('on_signin_url', reverse('auth_signin'))) 
+                return HttpResponseRedirect(request.session.get('on_signin_url', reverse('user_signin'))) 
 
             uassoc = AuthKeyUserAssociation(user=user_, key=request.session['assoc_key'], provider=request.session['auth_provider'])
             uassoc.save()
@@ -356,4 +356,4 @@ def signout(request):
     """
 
     logout(request)
-    return HttpResponseRedirect(reverse('index'))
\ No newline at end of file
+    return HttpResponseRedirect(reverse('index'))
diff --git a/forum/views/writers.py b/forum/views/writers.py
index a9406fdc..b9b1aad5 100755
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -129,7 +129,7 @@ def ask(request):#view used to ask a new question
                     ip_addr = request.META['REMOTE_ADDR'],
                 )
                 question.save()
-                return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'}))
+                return HttpResponseRedirect(reverse('user_signin_new_question'))
     else:
         form = AskForm()
 
@@ -290,7 +290,7 @@ def answer(request, id):#process a new answer
                                        ip_addr=request.META['REMOTE_ADDR'],
                                        )
                 anon.save()
-                return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newanswer'}))
+                return HttpResponseRedirect(reverse('user_signin_new_answer'))
 
     return HttpResponseRedirect(question.get_absolute_url())