altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Commented out a lot of what I believe to be dead code.

Browse source 
- Legacy-Id: 9418
This commit is contained in:
Henrik Levkowetz 2015-04-06 07:48:01 +00:00
parent ea28212d31
commit e8f2d27de3
2 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/ietfauth/urls.py
View file

@ -18,5 +18,5 @@ urlpatterns = patterns('ietf.ietfauth.views',
url(r'^reset/$', 'password_reset_view', name='password_reset'), url(r'^reset/$', 'password_reset_view', name='password_reset'),
url(r'^reset/confirm/(?P<username>[\w.@+-]+)/(?P<date>[\d]+)/(?P<realm>[\w]+)/(?P<hash>[a-f0-9]+)/$', 'confirm_password_reset', name='confirm_password_reset'), url(r'^reset/confirm/(?P<username>[\w.@+-]+)/(?P<date>[\d]+)/(?P<realm>[\w]+)/(?P<hash>[a-f0-9]+)/$', 'confirm_password_reset', name='confirm_password_reset'),
url(r'^add_email/confirm/(?P<username>[\w.@+-]+)/(?P<date>[\d]+)/(?P<email>[\w.@+-]+)/(?P<hash>[a-f0-9]+)/$', 'confirm_new_email', name='confirm_new_email'), url(r'^add_email/confirm/(?P<username>[\w.@+-]+)/(?P<date>[\d]+)/(?P<email>[\w.@+-]+)/(?P<hash>[a-f0-9]+)/$', 'confirm_new_email', name='confirm_new_email'),
url(r'^ajax/check_username/$', 'ajax_check_username', name='ajax_check_username'), # url(r'^ajax/check_username/$', 'ajax_check_username', name='ajax_check_username'),
) )

72
ietf/ietfauth/views.py
View file

@ -34,17 +34,17 @@
import datetime import datetime
import hashlib import hashlib
import json #import json
from django.conf import settings from django.conf import settings
from django.template import RequestContext from django.template import RequestContext
from django.http import HttpResponse, Http404, HttpResponseRedirect from django.http import Http404 #, HttpResponse, HttpResponseRedirect
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login #from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User #from django.contrib.auth.models import User
from django.utils.http import urlquote #from django.utils.http import urlquote
from django.utils.translation import ugettext as _ #from django.utils.translation import ugettext as _
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from ietf.group.models import Role from ietf.group.models import Role
@ -54,32 +54,32 @@ from ietf.person.models import Person, Email
def index(request): def index(request):
return render_to_response('registration/index.html', context_instance=RequestContext(request)) return render_to_response('registration/index.html', context_instance=RequestContext(request))
def url_login(request, user, passwd): # def url_login(request, user, passwd):
user = authenticate(username=user, password=passwd) # user = authenticate(username=user, password=passwd)
redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '') # redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '')
if user is not None: # if user is not None:
if user.is_active: # if user.is_active:
login(request, user) # login(request, user)
return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to))) # return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to)))
return HttpResponse("Not authenticated?", status=500) # return HttpResponse("Not authenticated?", status=500)
@login_required # @login_required
def ietf_login(request): # def ietf_login(request):
if not request.user.is_authenticated(): # if not request.user.is_authenticated():
return HttpResponse("Not authenticated?", status=500) # return HttpResponse("Not authenticated?", status=500)
#
# redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '')
# request.session.set_test_cookie()
# return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to)))
redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '') # def ietf_loggedin(request):
request.session.set_test_cookie() # if not request.session.test_cookie_worked():
return HttpResponseRedirect('/accounts/loggedin/?%s=%s' % (REDIRECT_FIELD_NAME, urlquote(redirect_to))) # return HttpResponse("You need to enable cookies")
# request.session.delete_test_cookie()
def ietf_loggedin(request): # redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '')
if not request.session.test_cookie_worked(): # if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
return HttpResponse("You need to enable cookies") # redirect_to = settings.LOGIN_REDIRECT_URL
request.session.delete_test_cookie() # return HttpResponseRedirect(redirect_to)
redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '')
if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
redirect_to = settings.LOGIN_REDIRECT_URL
return HttpResponseRedirect(redirect_to)
@login_required @login_required
def profile(request): def profile(request):
@ -222,12 +222,12 @@ def confirm_password_reset(request, username, date, realm, hash):
'username': username}, 'username': username},
context_instance=RequestContext(request)) context_instance=RequestContext(request))
def ajax_check_username(request): # def ajax_check_username(request):
username = request.GET.get('username', '') # username = request.GET.get('username', '')
error = False # error = False
if User.objects.filter(username=username).count(): # if User.objects.filter(username=username).count():
error = _('This email address is already registered') # error = _('This email address is already registered')
return HttpResponse(json.dumps({'error': error}), content_type='text/plain') # return HttpResponse(json.dumps({'error': error}), content_type='text/plain')
def test_email(request): def test_email(request):
"""Set email address to which email generated in the system will be sent.""" """Set email address to which email generated in the system will be sent."""