From c18bda49f13afb4e2eaaf9ccb35098ee174e3afc Mon Sep 17 00:00:00 2001
From: hrcerqueira <hrcerqueira@gmail.com>
Date: Thu, 21 Jan 2010 13:07:11 +0000
Subject: Added the basic html and javascript of fb connect, and a setting in
 settings_local.py.dist for the fb api key.

---
 django_authopenid/urls.py        |   64 +-
 django_authopenid/views.py       | 2141 +++++++++++++++++++-------------------
 settings_local.py.dist           |  179 ++--
 templates/authopenid/signin.html |  351 ++++---
 templates/base.html              |  190 ++--
 templates/xd_receiver.html       |    1 +
 6 files changed, 1469 insertions(+), 1457 deletions(-)
 mode change 100644 => 100755 django_authopenid/urls.py
 mode change 100644 => 100755 django_authopenid/views.py
 mode change 100644 => 100755 templates/authopenid/signin.html
 mode change 100644 => 100755 templates/base.html
 create mode 100755 templates/xd_receiver.html

diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py
old mode 100644
new mode 100755
index 112cbbe1..6a4e9b0f
--- a/django_authopenid/urls.py
+++ b/django_authopenid/urls.py
@@ -1,31 +1,33 @@
-# -*- coding: utf-8 -*-
-from django.conf.urls.defaults import patterns, url
-from django.utils.translation import ugettext as _
-
-urlpatterns = patterns('django_authopenid.views',
-    # yadis rdf
-    url(r'^yadis.xrdf$', 'xrdf', name='yadis_xrdf'),
-     # manage account registration
-    url(r'^%s$' % _('signin/'), 'signin', name='user_signin'),
-    url(r'^%s%s$' % (_('signin/'),_('newquestion/')), 'signin', kwargs = {'newquestion':True}, name='user_signin_new_question'),
-    url(r'^%s%s$' % (_('signin/'),_('newanswer/')), 'signin', kwargs = {'newanswer':True}, name='user_signin_new_answer'),
-    url(r'^%s$' % _('signout/'), 'signout', name='user_signout'),
-    url(r'^%s%s$' % (_('signin/'), _('complete/')), 'complete_signin', 
-        name='user_complete_signin'),
-    url('^%s$' % _('external-login/'),'external_legacy_login_info', name='user_external_legacy_login_issues'),
-    url(r'^%s$' % _('register/'), 'register', name='user_register'),
-    url(r'^%s$' % _('signup/'), 'signup', name='user_signup'),
-    #disable current sendpw function
-    url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'),
-    url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', name='user_confirmchangepw'),
-
-    # manage account settings
-    url(r'^$', _('account_settings'), name='user_account_settings'),
-    url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'),
-    url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_validateemail',kwargs = {'action':'validate'}),
-    url(r'^%s%s$' % (_('email/'), _('change/')), 'changeemail', name='user_changeemail'),
-    url(r'^%s%s$' % (_('email/'), _('sendkey/')), 'send_email_key', name='send_email_key'),
-    url(r'^%s%s(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$' % (_('email/'), _('verify/')), 'verifyemail', name='user_verifyemail'),
-    url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
-    url(r'^%s$' % _('delete/'), 'delete', name='user_delete'),
-)
+# -*- coding: utf-8 -*-
+from django.conf.urls.defaults import patterns, url
+from django.utils.translation import ugettext as _
+from django.views.generic.simple import direct_to_template
+
+urlpatterns = patterns('django_authopenid.views',
+    # yadis rdf
+    url(r'^yadis.xrdf$', 'xrdf', name='yadis_xrdf'),
+     # manage account registration
+    url(r'^%s$' % _('signin/'), 'signin', name='user_signin'),
+    url(r'^xd_receiver$',  direct_to_template,  {'template': 'xd_receiver.html'},  name='xd_receiver'), 
+    url(r'^%s%s$' % (_('signin/'),_('newquestion/')), 'signin', kwargs = {'newquestion':True}, name='user_signin_new_question'),
+    url(r'^%s%s$' % (_('signin/'),_('newanswer/')), 'signin', kwargs = {'newanswer':True}, name='user_signin_new_answer'),
+    url(r'^%s$' % _('signout/'), 'signout', name='user_signout'),
+    url(r'^%s%s$' % (_('signin/'), _('complete/')), 'complete_signin', 
+        name='user_complete_signin'),
+    url('^%s$' % _('external-login/'),'external_legacy_login_info', name='user_external_legacy_login_issues'),
+    url(r'^%s$' % _('register/'), 'register', name='user_register'),
+    url(r'^%s$' % _('signup/'), 'signup', name='user_signup'),
+    #disable current sendpw function
+    url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'),
+    url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', name='user_confirmchangepw'),
+
+    # manage account settings
+    url(r'^$', _('account_settings'), name='user_account_settings'),
+    url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'),
+    url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_validateemail',kwargs = {'action':'validate'}),
+    url(r'^%s%s$' % (_('email/'), _('change/')), 'changeemail', name='user_changeemail'),
+    url(r'^%s%s$' % (_('email/'), _('sendkey/')), 'send_email_key', name='send_email_key'),
+    url(r'^%s%s(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$' % (_('email/'), _('verify/')), 'verifyemail', name='user_verifyemail'),
+    url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
+    url(r'^%s$' % _('delete/'), 'delete', name='user_delete'),
+)
diff --git a/django_authopenid/views.py b/django_authopenid/views.py
old mode 100644
new mode 100755
index feb6b58f..36f08018
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -1,1070 +1,1071 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2007, 2008, Benoît Chesneau
-# Copyright (c) 2007 Simon Willison, original work on django-openid
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# 
-#      * Redistributions of source code must retain the above copyright
-#      * notice, this list of conditions and the following disclaimer.
-#      * Redistributions in binary form must reproduce the above copyright
-#      * notice, this list of conditions and the following disclaimer in the
-#      * documentation and/or other materials provided with the
-#      * distribution.  Neither the name of the <ORGANIZATION> nor the names
-#      * of its contributors may be used to endorse or promote products
-#      * derived from this software without specific prior written
-#      * permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from django.http import HttpResponseRedirect, get_host, Http404, \
-                         HttpResponseServerError
-from django.shortcuts import render_to_response as render
-from django.template import RequestContext, loader, Context
-from django.conf import settings
-from django.contrib.auth.models import User
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth import authenticate
-from django.core.urlresolvers import reverse
-from django.utils.encoding import smart_unicode
-from django.utils.html import escape
-from django.utils.translation import ugettext as _
-from django.utils.http import urlquote_plus
-from django.utils.safestring import mark_safe
-from django.core.mail import send_mail
-from django.views.defaults import server_error
-
-from openid.consumer.consumer import Consumer, \
-    SUCCESS, CANCEL, FAILURE, SETUP_NEEDED
-from openid.consumer.discover import DiscoveryFailure
-from openid.extensions import sreg
-# needed for some linux distributions like debian
-try:
-    from openid.yadis import xri
-except ImportError:
-    from yadis import xri
-
-import re
-import urllib
-
-
-from forum.forms import EditUserEmailFeedsForm
-from django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response, get_next_url 
-from django_authopenid.models import UserAssociation, UserPasswordQueue, ExternalLoginData
-from django_authopenid.forms import OpenidSigninForm, ClassicLoginForm, OpenidRegisterForm, \
-        OpenidVerifyForm, ClassicRegisterForm, ChangePasswordForm, ChangeEmailForm, \
-        ChangeopenidForm, DeleteForm, EmailPasswordForm
-import external_login
-import logging
-
-def login(request,user):
-    from django.contrib.auth import login as _login
-    from forum.models import user_logged_in #custom signal
-
-    print 'in login call'
-
-    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-        external_login.login(request,user)
-
-    #1) get old session key
-    session_key = request.session.session_key
-    #2) login and get new session key
-    _login(request,user)
-    #3) send signal with old session key as argument
-    user_logged_in.send(user=user,session_key=session_key,sender=None)
-
-def logout(request):
-    from django.contrib.auth import logout as _logout#for login I've added wrapper below - called login
-    _logout(request)
-    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-        external_login.logout(request)
-
-def get_url_host(request):
-    if request.is_secure():
-        protocol = 'https'
-    else:
-        protocol = 'http'
-    host = escape(get_host(request))
-    return '%s://%s' % (protocol, host)
-
-def get_full_url(request):
-    return get_url_host(request) + request.get_full_path()
-
-def ask_openid(request, openid_url, redirect_to, on_failure=None,
-        sreg_request=None):
-    """ basic function to ask openid and return response """
-    request.encoding = 'UTF-8'
-    on_failure = on_failure or signin_failure
-    
-    trust_root = getattr(
-        settings, 'OPENID_TRUST_ROOT', get_url_host(request) + '/'
-    )
-    if xri.identifierScheme(openid_url) == 'XRI' and getattr(
-            settings, 'OPENID_DISALLOW_INAMES', False
-    ):
-        msg = _("i-names are not supported")
-        return on_failure(request, msg)
-    consumer = Consumer(request.session, DjangoOpenIDStore())
-    try:
-        auth_request = consumer.begin(openid_url)
-    except DiscoveryFailure:
-        msg = _(u"OpenID %(openid_url)s is invalid" % {'openid_url':openid_url})
-        return on_failure(request, msg)
-
-    if sreg_request:
-        auth_request.addExtension(sreg_request)
-    redirect_url = auth_request.redirectURL(trust_root, redirect_to)
-    return HttpResponseRedirect(redirect_url)
-
-def complete(request, on_success=None, on_failure=None, return_to=None):
-    """ complete openid signin """
-    on_success = on_success or default_on_success
-    on_failure = on_failure or default_on_failure
-    
-    consumer = Consumer(request.session, DjangoOpenIDStore())
-    # make sure params are encoded in utf8
-    params = dict((k,smart_unicode(v)) for k, v in request.GET.items())
-    openid_response = consumer.complete(params, return_to)
-    
-    if openid_response.status == SUCCESS:
-        return on_success(request, openid_response.identity_url,
-                openid_response)
-    elif openid_response.status == CANCEL:
-        return on_failure(request, 'The request was canceled')
-    elif openid_response.status == FAILURE:
-        return on_failure(request, openid_response.message)
-    elif openid_response.status == SETUP_NEEDED:
-        return on_failure(request, 'Setup needed')
-    else:
-        assert False, "Bad openid status: %s" % openid_response.status
-
-def default_on_success(request, identity_url, openid_response):
-    """ default action on openid signin success """
-    request.session['openid'] = from_openid_response(openid_response)
-    return HttpResponseRedirect(get_next_url(request))
-
-def default_on_failure(request, message):
-    """ default failure action on signin """
-    return render('openid_failure.html', {
-        'message': message
-    })
-
-
-def not_authenticated(func):
-    """ decorator that redirect user to next page if
-    he is already logged."""
-    def decorated(request, *args, **kwargs):
-        if request.user.is_authenticated():
-            return HttpResponseRedirect(get_next_url(request))
-        return func(request, *args, **kwargs)
-    return decorated
-
-@not_authenticated
-def signin(request,newquestion=False,newanswer=False):
-    """
-    signin page. It manages the legacy authentification (user/password) 
-    and openid authentification
-
-    url: /signin/
-    
-    template : authopenid/signin.htm
-    """
-    request.encoding = 'UTF-8'
-    on_failure = signin_failure
-    email_feeds_form = EditUserEmailFeedsForm()
-    next = get_next_url(request)
-    form_signin = OpenidSigninForm(initial={'next':next})
-    form_auth = ClassicLoginForm(initial={'next':next})
-    
-    if request.POST:   
-        #'blogin' - password login
-        if 'blogin' in request.POST.keys():
-            form_auth = ClassicLoginForm(request.POST)
-            if form_auth.is_valid():
-                #have login and password and need to login through external website
-                if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-                    username = form_auth.cleaned_data['username']
-                    password = form_auth.cleaned_data['password']
-                    next = form_auth.cleaned_data['next']
-                    if form_auth.get_user() == None:
-                        #need to create internal user
-
-                        #1) save login and password temporarily in session
-                        request.session['external_username'] = username
-                        request.session['external_password'] = password
-
-                        #2) see if username clashes with some existing user
-                        #if so, we have to prompt the user to pick a different name
-                        username_taken = User.is_username_taken(username)
-                        #try:
-                        #    User.objects.get(username=username)
-                        #    username_taken = True
-                        #except User.DoesNotExist:
-                        #    username_taken = False
-
-                        #3) try to extract user email from external service
-                        email = external_login.get_email(username,password)
-
-                        email_feeds_form = EditUserEmailFeedsForm()
-                        form_data = {'username':username,'email':email,'next':next}
-                        form = OpenidRegisterForm(initial=form_data)
-                        template_data = {'form1':form,'username':username,\
-                                        'email_feeds_form':email_feeds_form,\
-                                        'provider':mark_safe(settings.EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME),\
-                                        'login_type':'legacy',\
-                                        'gravatar_faq_url':reverse('faq') + '#gravatar',\
-                                        'external_login_name_is_taken':username_taken}
-                        return render('authopenid/complete.html',template_data,\
-                                context_instance=RequestContext(request))
-                    else:
-                        #user existed, external password is ok
-                        user = form_auth.get_user()
-                        login(request,user)
-                        response = HttpResponseRedirect(get_next_url(request))
-                        external_login.set_login_cookies(response,user)
-                        return response
-                else:
-                    #regular password authentication
-                    user = form_auth.get_user()
-                    login(request, user)
-                    return HttpResponseRedirect(get_next_url(request))
-
-        elif 'bnewaccount' in request.POST.keys():
-            #register externally logged in password user with a new local account
-            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-                form = OpenidRegisterForm(request.POST) 
-                email_feeds_form = EditUserEmailFeedsForm(request.POST)
-                form1_is_valid = form.is_valid()
-                form2_is_valid = email_feeds_form.is_valid()
-                if form1_is_valid and form2_is_valid:
-                    #create the user
-                    username = form.cleaned_data['username']
-                    password = request.session.get('external_password',None)
-                    email = form.cleaned_data['email']
-                    print 'got email addr %s' % email
-                    if password and username:
-                        User.objects.create_user(username,email,password)
-                        user = authenticate(username=username,password=password)
-                        external_username = request.session['external_username']
-                        eld = ExternalLoginData.objects.get(external_username=external_username)
-                        eld.user = user
-                        eld.save()
-                        login(request,user)
-                        email_feeds_form.save(user)
-                        del request.session['external_username']
-                        del request.session['external_password']
-                        return HttpResponseRedirect(reverse('index'))
-                    else:
-                        if password:
-                            del request.session['external_username']
-                        if username:
-                            del request.session['external_password']
-                        return HttpResponseServerError()
-                else:
-                    username = request.POST.get('username',None)
-                    provider = mark_safe(settings.EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME)
-                    username_taken = User.is_username_taken(username)
-                    data = {'login_type':'legacy','form1':form,'username':username,\
-                        'email_feeds_form':email_feeds_form,'provider':provider,\
-                        'gravatar_faq_url':reverse('faq') + '#gravatar',\
-                        'external_login_name_is_taken':username_taken}
-                    return render('authopenid/complete.html',data,
-                            context_instance=RequestContext(request))
-            else:
-                raise Http404
-
-        elif 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys():
-            form_signin = OpenidSigninForm(request.POST)
-            if form_signin.is_valid():
-                next = form_signin.cleaned_data['next']
-                sreg_req = sreg.SRegRequest(optional=['nickname', 'email'])
-                redirect_to = "%s%s?%s" % (
-                        get_url_host(request),
-                        reverse('user_complete_signin'), 
-                        urllib.urlencode({'next':next})
-                )
-                return ask_openid(request, 
-                        form_signin.cleaned_data['openid_url'], 
-                        redirect_to, 
-                        on_failure=signin_failure, 
-                        sreg_request=sreg_req)
-
-
-    #if request is GET
-    question = None
-    if newquestion == True:
-        from forum.models import AnonymousQuestion as AQ
-        session_key = request.session.session_key
-        qlist = AQ.objects.filter(session_key=session_key).order_by('-added_at')
-        if len(qlist) > 0:
-            question = qlist[0]
-    answer = None
-    if newanswer == True:
-        from forum.models import AnonymousAnswer as AA
-        session_key = request.session.session_key
-        alist = AA.objects.filter(session_key=session_key).order_by('-added_at')
-        if len(alist) > 0:
-            answer = alist[0]
-
-    return render('authopenid/signin.html', {
-        'question':question,
-        'answer':answer,
-        'form1': form_auth,
-        'form2': form_signin,
-        'msg':  request.GET.get('msg',''),
-        'sendpw_url': reverse('user_sendpw'),
-    }, context_instance=RequestContext(request))
-
-def complete_signin(request):
-    """ in case of complete signin with openid """
-    return complete(request, signin_success, signin_failure,
-            get_url_host(request) + reverse('user_complete_signin'))
-
-def signin_success(request, identity_url, openid_response):
-    """
-    openid signin success.
-
-    If the openid is already registered, the user is redirected to 
-    url set par next or in settings with OPENID_REDIRECT_NEXT variable.
-    If none of these urls are set user is redirectd to /.
-
-    if openid isn't registered user is redirected to register page.
-    """
-
-    openid_ = from_openid_response(openid_response) #create janrain OpenID object
-    request.session['openid'] = openid_
-    try:
-        rel = UserAssociation.objects.get(openid_url__exact = str(openid_))
-    except:
-        # try to register this new user
-        return register(request)
-    user_ = rel.user
-    if user_.is_active:
-        user_.backend = "django.contrib.auth.backends.ModelBackend"
-        login(request, user_)
-        
-    return HttpResponseRedirect(get_next_url(request))
-
-def is_association_exist(openid_url):
-    """ test if an openid is already in database """
-    is_exist = True
-    try:
-        uassoc = UserAssociation.objects.get(openid_url__exact = openid_url)
-    except:
-        is_exist = False
-    return is_exist
-
-@not_authenticated
-def register(request):
-    """
-    register an openid.
-
-    If user is already a member he can associate its openid with 
-    its account.
-
-    A new account could also be created and automaticaly associated
-    to the openid.
-
-    url : /complete/
-
-    template : authopenid/complete.html
-    """
-
-    openid_ = request.session.get('openid', None)
-    next = get_next_url(request)
-    if not openid_:
-        return HttpResponseRedirect(reverse('user_signin') + '?next=%s' % next)
-
-    nickname = openid_.sreg.get('nickname', '')
-    email = openid_.sreg.get('email', '')
-    form1 = OpenidRegisterForm(initial={
-        'next': next,
-        'username': nickname,
-        'email': email,
-    }) 
-    form2 = OpenidVerifyForm(initial={
-        'next': next,
-        'username': nickname,
-    })
-    email_feeds_form = EditUserEmailFeedsForm()
-
-    user_ = None
-    is_redirect = False
-    if request.POST:
-        if 'bnewaccount' in request.POST.keys():
-            form1 = OpenidRegisterForm(request.POST)
-            email_feeds_form = EditUserEmailFeedsForm(request.POST)
-            if form1.is_valid() and email_feeds_form.is_valid():
-                next = form1.cleaned_data['next']
-                is_redirect = True
-                tmp_pwd = User.objects.make_random_password()
-                user_ = User.objects.create_user(form1.cleaned_data['username'],
-                         form1.cleaned_data['email'], tmp_pwd)
-
-                user_.set_unusable_password()
-                # make association with openid
-                uassoc = UserAssociation(openid_url=str(openid_),
-                        user_id=user_.id)
-                uassoc.save()
-                    
-                # login 
-                user_.backend = "django.contrib.auth.backends.ModelBackend"
-                login(request, user_)
-                email_feeds_form.save(user_)
-        elif 'bverify' in request.POST.keys():
-            form2 = OpenidVerifyForm(request.POST)
-            if form2.is_valid():
-                is_redirect = True
-                next = form2.cleaned_data['next']
-                user_ = form2.get_user()
-
-                uassoc = UserAssociation(openid_url=str(openid_),
-                        user_id=user_.id)
-                uassoc.save()
-                login(request, user_)
-
-        #check if we need to post a question that was added anonymously
-        #this needs to be a function call becase this is also done
-        #if user just logged in and did not need to create the new account
-        
-        if user_ != None:
-            if settings.EMAIL_VALIDATION == 'on':
-                send_new_email_key(user_,nomessage=True)
-                output = validation_email_sent(request)
-                set_email_validation_message(user_) #message set after generating view
-                return output
-            if user_.is_authenticated():
-                return HttpResponseRedirect(reverse('index'))
-            else:
-                raise Exception('openid login failed')#should not ever get here
-    
-    openid_str = str(openid_)
-    bits = openid_str.split('/')
-    base_url = bits[2] #assume this is base url
-    url_bits = base_url.split('.')
-    provider_name = url_bits[-2].lower()
-
-    providers = {'yahoo':'<font color="purple">Yahoo!</font>',
-                'flickr':'<font color="#0063dc">flick</font><font color="#ff0084">r</font>&trade;',
-                'google':'Google&trade;',
-                'aol':'<font color="#31658e">AOL</font>',
-                'myopenid':'MyOpenID',
-                }
-    if provider_name not in providers:
-        provider_logo = provider_name
-    else:
-        provider_logo = providers[provider_name]
-
-    return render('authopenid/complete.html', {
-        'form1': form1,
-        'form2': form2,
-        'email_feeds_form': email_feeds_form,
-        'provider':mark_safe(provider_logo),
-        'username': nickname,
-        'email': email,
-        'login_type':'openid',
-        'gravatar_faq_url':reverse('faq') + '#gravatar',
-    }, context_instance=RequestContext(request))
-
-def signin_failure(request, message):
-    """
-    falure with openid signin. Go back to signin page.
-
-    template : "authopenid/signin.html"
-    """
-    next = get_next_url(request)
-    form_signin = OpenidSigninForm(initial={'next': next})
-    form_auth = ClassicLoginForm(initial={'next': next})
-
-    return render('authopenid/signin.html', {
-        'msg': message,
-        'form1': form_auth,
-        'form2': form_signin,
-    }, context_instance=RequestContext(request))
-
-@not_authenticated
-def signup(request):
-    """
-    signup page. Create a legacy account
-
-    url : /signup/"
-
-    templates: authopenid/signup.html, authopenid/confirm_email.txt
-    """
-    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-        return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
-    next = get_next_url(request)
-    if request.POST:
-        form = ClassicRegisterForm(request.POST)
-        email_feeds_form = EditUserEmailFeedsForm(request.POST)
-
-        #validation outside if to remember form values
-        form1_is_valid = form.is_valid()
-        form2_is_valid = email_feeds_form.is_valid()
-        if form1_is_valid and form2_is_valid:
-            next = form.cleaned_data['next']
-            username = form.cleaned_data['username']
-            password = form.cleaned_data['password1']
-            email = form.cleaned_data['email']
-
-            user_ = User.objects.create_user( username,email,password )
-            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-                external_login.create_user(username,email,password)
-           
-            user_.backend = "django.contrib.auth.backends.ModelBackend"
-            login(request, user_)
-            email_feeds_form.save(user_)
-            
-            # send email
-            subject = _("Welcome email subject line")
-            message_template = loader.get_template(
-                    'authopenid/confirm_email.txt'
-            )
-            message_context = Context({ 
-                'signup_url': settings.APP_URL + reverse('user_signin'),
-                'username': username,
-                'password': password,
-            })
-            message = message_template.render(message_context)
-            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, 
-                    [user_.email])
-            return HttpResponseRedirect(next)
-    else:
-        form = ClassicRegisterForm(initial={'next':next})
-        email_feeds_form = EditUserEmailFeedsForm()
-    return render('authopenid/signup.html', {
-        'form': form, 
-        'email_feeds_form': email_feeds_form 
-        }, context_instance=RequestContext(request))
-    #what if request is not posted?
-
-@login_required
-def signout(request):
-    """
-    signout from the website. Remove openid from session and kill it.
-
-    url : /signout/"
-    """
-    try:
-        del request.session['openid']
-    except KeyError:
-        pass
-    logout(request)
-    return HttpResponseRedirect(get_next_url(request))
-    
-def xrdf(request):
-    url_host = get_url_host(request)
-    return_to = [
-        "%s%s" % (url_host, reverse('user_complete_signin'))
-    ]
-    return render('authopenid/yadis.xrdf', { 
-        'return_to': return_to 
-        }, context_instance=RequestContext(request))
-
-@login_required
-def account_settings(request):
-    """
-    index pages to changes some basic account settings :
-     - change password
-     - change email
-     - associate a new openid
-     - delete account
-
-    url : /
-
-    template : authopenid/settings.html
-    """
-    msg = request.GET.get('msg', '')
-    is_openid = True
-
-    try:
-        uassoc = UserAssociation.objects.get(
-                user__username__exact=request.user.username
-        )
-    except:
-        is_openid = False
-
-
-    return render('authopenid/settings.html', {
-        'msg': msg,
-        'is_openid': is_openid
-        }, context_instance=RequestContext(request))
-
-@login_required
-def changepw(request):
-    """
-    change password view.
-
-    url : /changepw/
-    template: authopenid/changepw.html
-    """
-    user_ = request.user
-
-    if user_.has_usable_password():
-        if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-            return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
-    else:
-        raise Http404
-    
-    if request.POST:
-        form = ChangePasswordForm(request.POST, user=user_)
-        if form.is_valid():
-            user_.set_password(form.cleaned_data['password1'])
-            user_.save()
-            msg = _("Password changed.") 
-            redirect = "%s?msg=%s" % (
-                    reverse('user_account_settings'),
-                    urlquote_plus(msg))
-            return HttpResponseRedirect(redirect)
-    else:
-        form = ChangePasswordForm(user=user_)
-
-    return render('authopenid/changepw.html', {'form': form },
-                                context_instance=RequestContext(request))
-
-def find_email_validation_messages(user):
-    msg_text = _('your email needs to be validated see %(details_url)s') \
-        % {'details_url':reverse('faq') + '#validate'}
-    return user.message_set.filter(message__exact=msg_text)
-
-def set_email_validation_message(user):
-    messages = find_email_validation_messages(user)
-    msg_text = _('your email needs to be validated see %(details_url)s') \
-        % {'details_url':reverse('faq') + '#validate'}
-    if len(messages) == 0:
-        user.message_set.create(message=msg_text)
-
-def clear_email_validation_message(user):
-    messages = find_email_validation_messages(user)
-    messages.delete()
-
-def set_new_email(user, new_email, nomessage=False):
-    if new_email != user.email:
-        user.email = new_email
-        user.email_isvalid = False
-        user.save()
-        if settings.EMAIL_VALIDATION == 'on':
-            send_new_email_key(user,nomessage=nomessage)
-
-def _send_email_key(user):
-    """private function. sends email containing validation key
-    to user's email address
-    """
-    subject = _("Email verification subject line")
-    message_template = loader.get_template('authopenid/email_validation.txt')
-    import settings
-    message_context = Context({
-    'validation_link': settings.APP_URL + reverse('user_verifyemail', kwargs={'id':user.id,'key':user.email_key})
-    })
-    message = message_template.render(message_context)
-    send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email])
-
-def send_new_email_key(user,nomessage=False):
-    import random
-    random.seed()
-    user.email_key = '%032x' % random.getrandbits(128) 
-    user.save()
-    _send_email_key(user)
-    if nomessage==False:
-        set_email_validation_message(user)
-
-@login_required
-def send_email_key(request):
-    """
-    url = /email/sendkey/
-
-    view that is shown right after sending email key
-    email sending is called internally
-
-    raises 404 if email validation is off
-    if current email is valid shows 'key_not_sent' view of 
-    authopenid/changeemail.html template
-    """
-
-    if settings.EMAIL_VALIDATION != 'off':
-        if request.user.email_isvalid:
-            return render('authopenid/changeemail.html',
-                            { 'email': request.user.email, 
-                              'action_type': 'key_not_sent', 
-                              'change_link': reverse('user_changeemail')},
-                              context_instance=RequestContext(request)
-                              )
-        else:
-            send_new_email_key(request.user)
-            return validation_email_sent(request)
-    else:
-        raise Http404
-   
-
-#internal server view used as return value by other views
-def validation_email_sent(request):
-    return render('authopenid/changeemail.html',
-                    { 'email': request.user.email, 
-                    'change_email_url': reverse('user_changeemail'),
-                    'action_type': 'validate', }, 
-                     context_instance=RequestContext(request))
-
-def verifyemail(request,id=None,key=None):
-    """
-    view that is shown when user clicks email validation link
-    url = /email/verify/{{user.id}}/{{user.email_key}}/
-    """
-    if settings.EMAIL_VALIDATION != 'off':
-        user = User.objects.get(id=id)
-        if user:
-            if user.email_key == key:
-                user.email_isvalid = True
-                clear_email_validation_message(user)
-                user.save()
-                return render('authopenid/changeemail.html', {
-                    'action_type': 'validation_complete',
-                    }, context_instance=RequestContext(request))
-    raise Http404
-
-@login_required
-def changeemail(request, action='change'):
-    """ 
-    changeemail view. requires openid with request type GET
-
-    url: /email/*
-
-    template : authopenid/changeemail.html
-    """
-    msg = request.GET.get('msg', None)
-    extension_args = {}
-    user_ = request.user
-
-    if request.POST:
-        if 'cancel' in request.POST:
-            msg = _('your email was not changed')
-            request.user.message_set.create(message=msg)
-            return HttpResponseRedirect(get_next_url(request))
-        form = ChangeEmailForm(request.POST, user=user_)
-        if form.is_valid():
-            new_email = form.cleaned_data['email']
-            if new_email != user_.email:
-                if settings.EMAIL_VALIDATION == 'on':
-                    action = 'validate'
-                else:
-                    action = 'done_novalidate'
-                set_new_email(user_, new_email,nomessage=True)
-            else:
-                action = 'keep'
-
-    elif not request.POST and 'openid.mode' in request.GET:
-        redirect_to = get_url_host(request) + reverse('user_changeemail')
-        return complete(request, emailopenid_success, 
-                emailopenid_failure, redirect_to) 
-    else:
-        form = ChangeEmailForm(initial={'email': user_.email},
-                user=user_)
-    
-    output = render('authopenid/changeemail.html', {
-        'form': form,
-        'email': user_.email,
-        'action_type': action,
-        'gravatar_faq_url': reverse('faq') + '#gravatar',
-        'change_email_url': reverse('user_changeemail'),
-        'msg': msg 
-        }, context_instance=RequestContext(request))
-
-    if action == 'validate':
-        set_email_validation_message(user_)
-
-    return output
-
-def emailopenid_success(request, identity_url, openid_response):
-    openid_ = from_openid_response(openid_response)
-
-    user_ = request.user
-    try:
-        uassoc = UserAssociation.objects.get(
-                openid_url__exact=identity_url
-        )
-    except:
-        return emailopenid_failure(request, 
-                _("No OpenID %s found associated in our database" % identity_url))
-
-    if uassoc.user.username != request.user.username:
-        return emailopenid_failure(request, 
-                _("The OpenID %s isn't associated to current user logged in" % 
-                    identity_url))
-    
-    new_email = request.session.get('new_email', '')
-    if new_email:
-        user_.email = new_email
-        user_.save()
-        del request.session['new_email']
-    msg = _("Email Changed.")
-
-    redirect = "%s?msg=%s" % (reverse('user_account_settings'),
-            urlquote_plus(msg))
-    return HttpResponseRedirect(redirect)
-    
-
-def emailopenid_failure(request, message):
-    redirect_to = "%s?msg=%s" % (
-            reverse('user_changeemail'), urlquote_plus(message))
-    return HttpResponseRedirect(redirect_to)
- 
-@login_required
-def changeopenid(request):
-    """
-    change openid view. Allow user to change openid 
-    associated to its username.
-
-    url : /changeopenid/
-
-    template: authopenid/changeopenid.html
-    """
-
-    extension_args = {}
-    openid_url = ''
-    has_openid = True
-    msg = request.GET.get('msg', '')
-        
-    user_ = request.user
-
-    try:
-        uopenid = UserAssociation.objects.get(user=user_)
-        openid_url = uopenid.openid_url
-    except:
-        has_openid = False
-    
-    redirect_to = get_url_host(request) + reverse('user_changeopenid')
-    if request.POST and has_openid:
-        form = ChangeopenidForm(request.POST, user=user_)
-        if form.is_valid():
-            return ask_openid(request, form.cleaned_data['openid_url'],
-                    redirect_to, on_failure=changeopenid_failure)
-    elif not request.POST and has_openid:
-        if 'openid.mode' in request.GET:
-            return complete(request, changeopenid_success,
-                    changeopenid_failure, redirect_to)    
-
-    form = ChangeopenidForm(initial={'openid_url': openid_url }, user=user_)
-    return render('authopenid/changeopenid.html', {
-        'form': form,
-        'has_openid': has_openid, 
-        'msg': msg 
-        }, context_instance=RequestContext(request))
-
-def changeopenid_success(request, identity_url, openid_response):
-    openid_ = from_openid_response(openid_response)
-    is_exist = True
-    try:
-        uassoc = UserAssociation.objects.get(openid_url__exact=identity_url)
-    except:
-        is_exist = False
-        
-    if not is_exist:
-        try:
-            uassoc = UserAssociation.objects.get(
-                    user__username__exact=request.user.username
-            )
-            uassoc.openid_url = identity_url
-            uassoc.save()
-        except:
-            uassoc = UserAssociation(user=request.user, 
-                    openid_url=identity_url)
-            uassoc.save()
-    elif uassoc.user.username != request.user.username:
-        return changeopenid_failure(request, 
-                _('This OpenID is already associated with another account.'))
-
-    request.session['openids'] = []
-    request.session['openids'].append(openid_)
-
-    msg = _("OpenID %s is now associated with your account." % identity_url) 
-    redirect = "%s?msg=%s" % (
-            reverse('user_account_settings'), 
-            urlquote_plus(msg))
-    return HttpResponseRedirect(redirect)
-    
-
-def changeopenid_failure(request, message):
-    redirect_to = "%s?msg=%s" % (
-            reverse('user_changeopenid'), 
-            urlquote_plus(message))
-    return HttpResponseRedirect(redirect_to)
-  
-@login_required
-def delete(request):
-    """
-    delete view. Allow user to delete its account. Password/openid are required to 
-    confirm it. He should also check the confirm checkbox.
-
-    url : /delete
-
-    template : authopenid/delete.html
-    """
-
-    extension_args = {}
-    
-    user_ = request.user
-
-    redirect_to = get_url_host(request) + reverse('user_delete') 
-    if request.POST:
-        form = DeleteForm(request.POST, user=user_)
-        if form.is_valid():
-            if not form.test_openid:
-                user_.delete() 
-                return signout(request)
-            else:
-                return ask_openid(request, form.cleaned_data['password'],
-                        redirect_to, on_failure=deleteopenid_failure)
-    elif not request.POST and 'openid.mode' in request.GET:
-        return complete(request, deleteopenid_success, deleteopenid_failure,
-                redirect_to) 
-    
-    form = DeleteForm(user=user_)
-
-    msg = request.GET.get('msg','')
-    return render('authopenid/delete.html', {
-        'form': form, 
-        'msg': msg, 
-        }, context_instance=RequestContext(request))
-
-def deleteopenid_success(request, identity_url, openid_response):
-    openid_ = from_openid_response(openid_response)
-
-    user_ = request.user
-    try:
-        uassoc = UserAssociation.objects.get(
-                openid_url__exact=identity_url
-        )
-    except:
-        return deleteopenid_failure(request,
-                _("No OpenID %s found associated in our database" % identity_url))
-
-    if uassoc.user.username == user_.username:
-        user_.delete()
-        return signout(request)
-    else:
-        return deleteopenid_failure(request,
-                _("The OpenID %s isn't associated to current user logged in" % 
-                    identity_url))
-    
-    msg = _("Account deleted.") 
-    redirect = reverse('index') + u"/?msg=%s" % (urlquote_plus(msg))
-    return HttpResponseRedirect(redirect)
-    
-
-def deleteopenid_failure(request, message):
-    redirect_to = "%s?msg=%s" % (reverse('user_delete'), urlquote_plus(message))
-    return HttpResponseRedirect(redirect_to)
-
-def external_legacy_login_info(request):
-    return render('authopenid/external_legacy_login_info.html', context_instance=RequestContext(request))
-
-def sendpw(request):
-    """
-    send a new password to the user. It return a mail with 
-    a new pasword and a confirm link in. To activate the 
-    new password, the user should click on confirm link.
-
-    url : /sendpw/
-
-    templates :  authopenid/sendpw_email.txt, authopenid/sendpw.html
-    """
-    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-        return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
-
-    msg = request.GET.get('msg','')
-    if request.POST:
-        form = EmailPasswordForm(request.POST)
-        if form.is_valid():
-            new_pw = User.objects.make_random_password()
-            confirm_key = UserPasswordQueue.objects.get_new_confirm_key()
-            try:
-                uqueue = UserPasswordQueue.objects.get(
-                        user=form.user_cache
-                )
-            except:
-                uqueue = UserPasswordQueue(
-                        user=form.user_cache
-                )
-            uqueue.new_password = new_pw
-            uqueue.confirm_key = confirm_key
-            uqueue.save()
-            # send email 
-            subject = _("Request for new password")
-            message_template = loader.get_template(
-                    'authopenid/sendpw_email.txt')
-            key_link = settings.APP_URL + reverse('user_confirmchangepw') + '?key=' + confirm_key
-            message_context = Context({ 
-                'site_url': settings.APP_URL + reverse('index'),
-                'key_link': key_link,
-                'username': form.user_cache.username,
-                'password': new_pw,
-            })
-            message = message_template.render(message_context)
-            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, 
-                    [form.user_cache.email])
-            msg = _("A new password and the activation link were sent to your email address.")
-    else:
-        form = EmailPasswordForm()
-        
-    return render('authopenid/sendpw.html', {
-        'form': form,
-        'msg': msg 
-        }, context_instance=RequestContext(request))
-
-
-def confirmchangepw(request):
-    """
-    view to set new password when the user click on confirm link
-    in its mail. Basically it check if the confirm key exist, then
-    replace old password with new password and remove confirm
-    ley from the queue. Then it redirect the user to signin
-    page.
-
-    url : /sendpw/confirm/?key
-
-    """
-    confirm_key = request.GET.get('key', '')
-    if not confirm_key:
-        return HttpResponseRedirect(reverse('index'))
-
-    try:
-        uqueue = UserPasswordQueue.objects.get(
-                confirm_key__exact=confirm_key
-        )
-    except:
-        msg = _("Could not change password. Confirmation key '%s'\
-                is not registered." % confirm_key) 
-        redirect = "%s?msg=%s" % (
-                reverse('user_sendpw'), urlquote_plus(msg))
-        return HttpResponseRedirect(redirect)
-
-    try:
-        user_ = User.objects.get(id=uqueue.user.id)
-    except:
-        msg = _("Can not change password. User don't exist anymore \
-                in our database.") 
-        redirect = "%s?msg=%s" % (reverse('user_sendpw'), 
-                urlquote_plus(msg))
-        return HttpResponseRedirect(redirect)
-
-    user_.set_password(uqueue.new_password)
-    user_.save()
-    uqueue.delete()
-    msg = _("Password changed for %s. You may now sign in." % 
-            user_.username) 
-    redirect = "%s?msg=%s" % (reverse('user_signin'), 
-                                        urlquote_plus(msg))
-
-    return HttpResponseRedirect(redirect)
+# -*- coding: utf-8 -*-
+# Copyright (c) 2007, 2008, Benoît Chesneau
+# Copyright (c) 2007 Simon Willison, original work on django-openid
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+#      * Redistributions of source code must retain the above copyright
+#      * notice, this list of conditions and the following disclaimer.
+#      * Redistributions in binary form must reproduce the above copyright
+#      * notice, this list of conditions and the following disclaimer in the
+#      * documentation and/or other materials provided with the
+#      * distribution.  Neither the name of the <ORGANIZATION> nor the names
+#      * of its contributors may be used to endorse or promote products
+#      * derived from this software without specific prior written
+#      * permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from django.http import HttpResponseRedirect, get_host, Http404, \
+                         HttpResponseServerError
+from django.shortcuts import render_to_response as render
+from django.template import RequestContext, loader, Context
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth import authenticate
+from django.core.urlresolvers import reverse
+from django.utils.encoding import smart_unicode
+from django.utils.html import escape
+from django.utils.translation import ugettext as _
+from django.utils.http import urlquote_plus
+from django.utils.safestring import mark_safe
+from django.core.mail import send_mail
+from django.views.defaults import server_error
+
+from openid.consumer.consumer import Consumer, \
+    SUCCESS, CANCEL, FAILURE, SETUP_NEEDED
+from openid.consumer.discover import DiscoveryFailure
+from openid.extensions import sreg
+# needed for some linux distributions like debian
+try:
+    from openid.yadis import xri
+except ImportError:
+    from yadis import xri
+
+import re
+import urllib
+
+
+from forum.forms import EditUserEmailFeedsForm
+from django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response, get_next_url 
+from django_authopenid.models import UserAssociation, UserPasswordQueue, ExternalLoginData
+from django_authopenid.forms import OpenidSigninForm, ClassicLoginForm, OpenidRegisterForm, \
+        OpenidVerifyForm, ClassicRegisterForm, ChangePasswordForm, ChangeEmailForm, \
+        ChangeopenidForm, DeleteForm, EmailPasswordForm
+import external_login
+import logging
+
+def login(request,user):
+    from django.contrib.auth import login as _login
+    from forum.models import user_logged_in #custom signal
+
+    print 'in login call'
+
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        external_login.login(request,user)
+
+    #1) get old session key
+    session_key = request.session.session_key
+    #2) login and get new session key
+    _login(request,user)
+    #3) send signal with old session key as argument
+    user_logged_in.send(user=user,session_key=session_key,sender=None)
+
+def logout(request):
+    from django.contrib.auth import logout as _logout#for login I've added wrapper below - called login
+    _logout(request)
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        external_login.logout(request)
+
+def get_url_host(request):
+    if request.is_secure():
+        protocol = 'https'
+    else:
+        protocol = 'http'
+    host = escape(get_host(request))
+    return '%s://%s' % (protocol, host)
+
+def get_full_url(request):
+    return get_url_host(request) + request.get_full_path()
+
+def ask_openid(request, openid_url, redirect_to, on_failure=None,
+        sreg_request=None):
+    """ basic function to ask openid and return response """
+    request.encoding = 'UTF-8'
+    on_failure = on_failure or signin_failure
+    
+    trust_root = getattr(
+        settings, 'OPENID_TRUST_ROOT', get_url_host(request) + '/'
+    )
+    if xri.identifierScheme(openid_url) == 'XRI' and getattr(
+            settings, 'OPENID_DISALLOW_INAMES', False
+    ):
+        msg = _("i-names are not supported")
+        return on_failure(request, msg)
+    consumer = Consumer(request.session, DjangoOpenIDStore())
+    try:
+        auth_request = consumer.begin(openid_url)
+    except DiscoveryFailure:
+        msg = _(u"OpenID %(openid_url)s is invalid" % {'openid_url':openid_url})
+        return on_failure(request, msg)
+
+    if sreg_request:
+        auth_request.addExtension(sreg_request)
+    redirect_url = auth_request.redirectURL(trust_root, redirect_to)
+    return HttpResponseRedirect(redirect_url)
+
+def complete(request, on_success=None, on_failure=None, return_to=None):
+    """ complete openid signin """
+    on_success = on_success or default_on_success
+    on_failure = on_failure or default_on_failure
+    
+    consumer = Consumer(request.session, DjangoOpenIDStore())
+    # make sure params are encoded in utf8
+    params = dict((k,smart_unicode(v)) for k, v in request.GET.items())
+    openid_response = consumer.complete(params, return_to)
+    
+    if openid_response.status == SUCCESS:
+        return on_success(request, openid_response.identity_url,
+                openid_response)
+    elif openid_response.status == CANCEL:
+        return on_failure(request, 'The request was canceled')
+    elif openid_response.status == FAILURE:
+        return on_failure(request, openid_response.message)
+    elif openid_response.status == SETUP_NEEDED:
+        return on_failure(request, 'Setup needed')
+    else:
+        assert False, "Bad openid status: %s" % openid_response.status
+
+def default_on_success(request, identity_url, openid_response):
+    """ default action on openid signin success """
+    request.session['openid'] = from_openid_response(openid_response)
+    return HttpResponseRedirect(get_next_url(request))
+
+def default_on_failure(request, message):
+    """ default failure action on signin """
+    return render('openid_failure.html', {
+        'message': message
+    })
+
+
+def not_authenticated(func):
+    """ decorator that redirect user to next page if
+    he is already logged."""
+    def decorated(request, *args, **kwargs):
+        if request.user.is_authenticated():
+            return HttpResponseRedirect(get_next_url(request))
+        return func(request, *args, **kwargs)
+    return decorated
+
+@not_authenticated
+def signin(request,newquestion=False,newanswer=False):
+    """
+    signin page. It manages the legacy authentification (user/password) 
+    and openid authentification
+
+    url: /signin/
+    
+    template : authopenid/signin.htm
+    """
+    request.encoding = 'UTF-8'
+    on_failure = signin_failure
+    email_feeds_form = EditUserEmailFeedsForm()
+    next = get_next_url(request)
+    form_signin = OpenidSigninForm(initial={'next':next})
+    form_auth = ClassicLoginForm(initial={'next':next})
+    
+    if request.POST:   
+        #'blogin' - password login
+        if 'blogin' in request.POST.keys():
+            form_auth = ClassicLoginForm(request.POST)
+            if form_auth.is_valid():
+                #have login and password and need to login through external website
+                if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                    username = form_auth.cleaned_data['username']
+                    password = form_auth.cleaned_data['password']
+                    next = form_auth.cleaned_data['next']
+                    if form_auth.get_user() == None:
+                        #need to create internal user
+
+                        #1) save login and password temporarily in session
+                        request.session['external_username'] = username
+                        request.session['external_password'] = password
+
+                        #2) see if username clashes with some existing user
+                        #if so, we have to prompt the user to pick a different name
+                        username_taken = User.is_username_taken(username)
+                        #try:
+                        #    User.objects.get(username=username)
+                        #    username_taken = True
+                        #except User.DoesNotExist:
+                        #    username_taken = False
+
+                        #3) try to extract user email from external service
+                        email = external_login.get_email(username,password)
+
+                        email_feeds_form = EditUserEmailFeedsForm()
+                        form_data = {'username':username,'email':email,'next':next}
+                        form = OpenidRegisterForm(initial=form_data)
+                        template_data = {'form1':form,'username':username,\
+                                        'email_feeds_form':email_feeds_form,\
+                                        'provider':mark_safe(settings.EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME),\
+                                        'login_type':'legacy',\
+                                        'gravatar_faq_url':reverse('faq') + '#gravatar',\
+                                        'external_login_name_is_taken':username_taken}
+                        return render('authopenid/complete.html',template_data,\
+                                context_instance=RequestContext(request))
+                    else:
+                        #user existed, external password is ok
+                        user = form_auth.get_user()
+                        login(request,user)
+                        response = HttpResponseRedirect(get_next_url(request))
+                        external_login.set_login_cookies(response,user)
+                        return response
+                else:
+                    #regular password authentication
+                    user = form_auth.get_user()
+                    login(request, user)
+                    return HttpResponseRedirect(get_next_url(request))
+
+        elif 'bnewaccount' in request.POST.keys():
+            #register externally logged in password user with a new local account
+            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                form = OpenidRegisterForm(request.POST) 
+                email_feeds_form = EditUserEmailFeedsForm(request.POST)
+                form1_is_valid = form.is_valid()
+                form2_is_valid = email_feeds_form.is_valid()
+                if form1_is_valid and form2_is_valid:
+                    #create the user
+                    username = form.cleaned_data['username']
+                    password = request.session.get('external_password',None)
+                    email = form.cleaned_data['email']
+                    print 'got email addr %s' % email
+                    if password and username:
+                        User.objects.create_user(username,email,password)
+                        user = authenticate(username=username,password=password)
+                        external_username = request.session['external_username']
+                        eld = ExternalLoginData.objects.get(external_username=external_username)
+                        eld.user = user
+                        eld.save()
+                        login(request,user)
+                        email_feeds_form.save(user)
+                        del request.session['external_username']
+                        del request.session['external_password']
+                        return HttpResponseRedirect(reverse('index'))
+                    else:
+                        if password:
+                            del request.session['external_username']
+                        if username:
+                            del request.session['external_password']
+                        return HttpResponseServerError()
+                else:
+                    username = request.POST.get('username',None)
+                    provider = mark_safe(settings.EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME)
+                    username_taken = User.is_username_taken(username)
+                    data = {'login_type':'legacy','form1':form,'username':username,\
+                        'email_feeds_form':email_feeds_form,'provider':provider,\
+                        'gravatar_faq_url':reverse('faq') + '#gravatar',\
+                        'external_login_name_is_taken':username_taken}
+                    return render('authopenid/complete.html',data,
+                            context_instance=RequestContext(request))
+            else:
+                raise Http404
+
+        elif 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys():
+            form_signin = OpenidSigninForm(request.POST)
+            if form_signin.is_valid():
+                next = form_signin.cleaned_data['next']
+                sreg_req = sreg.SRegRequest(optional=['nickname', 'email'])
+                redirect_to = "%s%s?%s" % (
+                        get_url_host(request),
+                        reverse('user_complete_signin'), 
+                        urllib.urlencode({'next':next})
+                )
+                return ask_openid(request, 
+                        form_signin.cleaned_data['openid_url'], 
+                        redirect_to, 
+                        on_failure=signin_failure, 
+                        sreg_request=sreg_req)
+
+
+    #if request is GET
+    question = None
+    if newquestion == True:
+        from forum.models import AnonymousQuestion as AQ
+        session_key = request.session.session_key
+        qlist = AQ.objects.filter(session_key=session_key).order_by('-added_at')
+        if len(qlist) > 0:
+            question = qlist[0]
+    answer = None
+    if newanswer == True:
+        from forum.models import AnonymousAnswer as AA
+        session_key = request.session.session_key
+        alist = AA.objects.filter(session_key=session_key).order_by('-added_at')
+        if len(alist) > 0:
+            answer = alist[0]
+
+    return render('authopenid/signin.html', {
+        'question':question,
+        'answer':answer,
+        'form1': form_auth,
+        'form2': form_signin,
+        'msg':  request.GET.get('msg',''),
+        'sendpw_url': reverse('user_sendpw'),
+        'fb_api_key': settings.FB_API_KEY, 
+    }, context_instance=RequestContext(request))
+
+def complete_signin(request):
+    """ in case of complete signin with openid """
+    return complete(request, signin_success, signin_failure,
+            get_url_host(request) + reverse('user_complete_signin'))
+
+def signin_success(request, identity_url, openid_response):
+    """
+    openid signin success.
+
+    If the openid is already registered, the user is redirected to 
+    url set par next or in settings with OPENID_REDIRECT_NEXT variable.
+    If none of these urls are set user is redirectd to /.
+
+    if openid isn't registered user is redirected to register page.
+    """
+
+    openid_ = from_openid_response(openid_response) #create janrain OpenID object
+    request.session['openid'] = openid_
+    try:
+        rel = UserAssociation.objects.get(openid_url__exact = str(openid_))
+    except:
+        # try to register this new user
+        return register(request)
+    user_ = rel.user
+    if user_.is_active:
+        user_.backend = "django.contrib.auth.backends.ModelBackend"
+        login(request, user_)
+        
+    return HttpResponseRedirect(get_next_url(request))
+
+def is_association_exist(openid_url):
+    """ test if an openid is already in database """
+    is_exist = True
+    try:
+        uassoc = UserAssociation.objects.get(openid_url__exact = openid_url)
+    except:
+        is_exist = False
+    return is_exist
+
+@not_authenticated
+def register(request):
+    """
+    register an openid.
+
+    If user is already a member he can associate its openid with 
+    its account.
+
+    A new account could also be created and automaticaly associated
+    to the openid.
+
+    url : /complete/
+
+    template : authopenid/complete.html
+    """
+
+    openid_ = request.session.get('openid', None)
+    next = get_next_url(request)
+    if not openid_:
+        return HttpResponseRedirect(reverse('user_signin') + '?next=%s' % next)
+
+    nickname = openid_.sreg.get('nickname', '')
+    email = openid_.sreg.get('email', '')
+    form1 = OpenidRegisterForm(initial={
+        'next': next,
+        'username': nickname,
+        'email': email,
+    }) 
+    form2 = OpenidVerifyForm(initial={
+        'next': next,
+        'username': nickname,
+    })
+    email_feeds_form = EditUserEmailFeedsForm()
+
+    user_ = None
+    is_redirect = False
+    if request.POST:
+        if 'bnewaccount' in request.POST.keys():
+            form1 = OpenidRegisterForm(request.POST)
+            email_feeds_form = EditUserEmailFeedsForm(request.POST)
+            if form1.is_valid() and email_feeds_form.is_valid():
+                next = form1.cleaned_data['next']
+                is_redirect = True
+                tmp_pwd = User.objects.make_random_password()
+                user_ = User.objects.create_user(form1.cleaned_data['username'],
+                         form1.cleaned_data['email'], tmp_pwd)
+
+                user_.set_unusable_password()
+                # make association with openid
+                uassoc = UserAssociation(openid_url=str(openid_),
+                        user_id=user_.id)
+                uassoc.save()
+                    
+                # login 
+                user_.backend = "django.contrib.auth.backends.ModelBackend"
+                login(request, user_)
+                email_feeds_form.save(user_)
+        elif 'bverify' in request.POST.keys():
+            form2 = OpenidVerifyForm(request.POST)
+            if form2.is_valid():
+                is_redirect = True
+                next = form2.cleaned_data['next']
+                user_ = form2.get_user()
+
+                uassoc = UserAssociation(openid_url=str(openid_),
+                        user_id=user_.id)
+                uassoc.save()
+                login(request, user_)
+
+        #check if we need to post a question that was added anonymously
+        #this needs to be a function call becase this is also done
+        #if user just logged in and did not need to create the new account
+        
+        if user_ != None:
+            if settings.EMAIL_VALIDATION == 'on':
+                send_new_email_key(user_,nomessage=True)
+                output = validation_email_sent(request)
+                set_email_validation_message(user_) #message set after generating view
+                return output
+            if user_.is_authenticated():
+                return HttpResponseRedirect(reverse('index'))
+            else:
+                raise Exception('openid login failed')#should not ever get here
+    
+    openid_str = str(openid_)
+    bits = openid_str.split('/')
+    base_url = bits[2] #assume this is base url
+    url_bits = base_url.split('.')
+    provider_name = url_bits[-2].lower()
+
+    providers = {'yahoo':'<font color="purple">Yahoo!</font>',
+                'flickr':'<font color="#0063dc">flick</font><font color="#ff0084">r</font>&trade;',
+                'google':'Google&trade;',
+                'aol':'<font color="#31658e">AOL</font>',
+                'myopenid':'MyOpenID',
+                }
+    if provider_name not in providers:
+        provider_logo = provider_name
+    else:
+        provider_logo = providers[provider_name]
+
+    return render('authopenid/complete.html', {
+        'form1': form1,
+        'form2': form2,
+        'email_feeds_form': email_feeds_form,
+        'provider':mark_safe(provider_logo),
+        'username': nickname,
+        'email': email,
+        'login_type':'openid',
+        'gravatar_faq_url':reverse('faq') + '#gravatar',
+    }, context_instance=RequestContext(request))
+
+def signin_failure(request, message):
+    """
+    falure with openid signin. Go back to signin page.
+
+    template : "authopenid/signin.html"
+    """
+    next = get_next_url(request)
+    form_signin = OpenidSigninForm(initial={'next': next})
+    form_auth = ClassicLoginForm(initial={'next': next})
+
+    return render('authopenid/signin.html', {
+        'msg': message,
+        'form1': form_auth,
+        'form2': form_signin,
+    }, context_instance=RequestContext(request))
+
+@not_authenticated
+def signup(request):
+    """
+    signup page. Create a legacy account
+
+    url : /signup/"
+
+    templates: authopenid/signup.html, authopenid/confirm_email.txt
+    """
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
+    next = get_next_url(request)
+    if request.POST:
+        form = ClassicRegisterForm(request.POST)
+        email_feeds_form = EditUserEmailFeedsForm(request.POST)
+
+        #validation outside if to remember form values
+        form1_is_valid = form.is_valid()
+        form2_is_valid = email_feeds_form.is_valid()
+        if form1_is_valid and form2_is_valid:
+            next = form.cleaned_data['next']
+            username = form.cleaned_data['username']
+            password = form.cleaned_data['password1']
+            email = form.cleaned_data['email']
+
+            user_ = User.objects.create_user( username,email,password )
+            if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+                external_login.create_user(username,email,password)
+           
+            user_.backend = "django.contrib.auth.backends.ModelBackend"
+            login(request, user_)
+            email_feeds_form.save(user_)
+            
+            # send email
+            subject = _("Welcome email subject line")
+            message_template = loader.get_template(
+                    'authopenid/confirm_email.txt'
+            )
+            message_context = Context({ 
+                'signup_url': settings.APP_URL + reverse('user_signin'),
+                'username': username,
+                'password': password,
+            })
+            message = message_template.render(message_context)
+            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, 
+                    [user_.email])
+            return HttpResponseRedirect(next)
+    else:
+        form = ClassicRegisterForm(initial={'next':next})
+        email_feeds_form = EditUserEmailFeedsForm()
+    return render('authopenid/signup.html', {
+        'form': form, 
+        'email_feeds_form': email_feeds_form 
+        }, context_instance=RequestContext(request))
+    #what if request is not posted?
+
+@login_required
+def signout(request):
+    """
+    signout from the website. Remove openid from session and kill it.
+
+    url : /signout/"
+    """
+    try:
+        del request.session['openid']
+    except KeyError:
+        pass
+    logout(request)
+    return HttpResponseRedirect(get_next_url(request))
+    
+def xrdf(request):
+    url_host = get_url_host(request)
+    return_to = [
+        "%s%s" % (url_host, reverse('user_complete_signin'))
+    ]
+    return render('authopenid/yadis.xrdf', { 
+        'return_to': return_to 
+        }, context_instance=RequestContext(request))
+
+@login_required
+def account_settings(request):
+    """
+    index pages to changes some basic account settings :
+     - change password
+     - change email
+     - associate a new openid
+     - delete account
+
+    url : /
+
+    template : authopenid/settings.html
+    """
+    msg = request.GET.get('msg', '')
+    is_openid = True
+
+    try:
+        uassoc = UserAssociation.objects.get(
+                user__username__exact=request.user.username
+        )
+    except:
+        is_openid = False
+
+
+    return render('authopenid/settings.html', {
+        'msg': msg,
+        'is_openid': is_openid
+        }, context_instance=RequestContext(request))
+
+@login_required
+def changepw(request):
+    """
+    change password view.
+
+    url : /changepw/
+    template: authopenid/changepw.html
+    """
+    user_ = request.user
+
+    if user_.has_usable_password():
+        if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+            return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
+    else:
+        raise Http404
+    
+    if request.POST:
+        form = ChangePasswordForm(request.POST, user=user_)
+        if form.is_valid():
+            user_.set_password(form.cleaned_data['password1'])
+            user_.save()
+            msg = _("Password changed.") 
+            redirect = "%s?msg=%s" % (
+                    reverse('user_account_settings'),
+                    urlquote_plus(msg))
+            return HttpResponseRedirect(redirect)
+    else:
+        form = ChangePasswordForm(user=user_)
+
+    return render('authopenid/changepw.html', {'form': form },
+                                context_instance=RequestContext(request))
+
+def find_email_validation_messages(user):
+    msg_text = _('your email needs to be validated see %(details_url)s') \
+        % {'details_url':reverse('faq') + '#validate'}
+    return user.message_set.filter(message__exact=msg_text)
+
+def set_email_validation_message(user):
+    messages = find_email_validation_messages(user)
+    msg_text = _('your email needs to be validated see %(details_url)s') \
+        % {'details_url':reverse('faq') + '#validate'}
+    if len(messages) == 0:
+        user.message_set.create(message=msg_text)
+
+def clear_email_validation_message(user):
+    messages = find_email_validation_messages(user)
+    messages.delete()
+
+def set_new_email(user, new_email, nomessage=False):
+    if new_email != user.email:
+        user.email = new_email
+        user.email_isvalid = False
+        user.save()
+        if settings.EMAIL_VALIDATION == 'on':
+            send_new_email_key(user,nomessage=nomessage)
+
+def _send_email_key(user):
+    """private function. sends email containing validation key
+    to user's email address
+    """
+    subject = _("Email verification subject line")
+    message_template = loader.get_template('authopenid/email_validation.txt')
+    import settings
+    message_context = Context({
+    'validation_link': settings.APP_URL + reverse('user_verifyemail', kwargs={'id':user.id,'key':user.email_key})
+    })
+    message = message_template.render(message_context)
+    send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [user.email])
+
+def send_new_email_key(user,nomessage=False):
+    import random
+    random.seed()
+    user.email_key = '%032x' % random.getrandbits(128) 
+    user.save()
+    _send_email_key(user)
+    if nomessage==False:
+        set_email_validation_message(user)
+
+@login_required
+def send_email_key(request):
+    """
+    url = /email/sendkey/
+
+    view that is shown right after sending email key
+    email sending is called internally
+
+    raises 404 if email validation is off
+    if current email is valid shows 'key_not_sent' view of 
+    authopenid/changeemail.html template
+    """
+
+    if settings.EMAIL_VALIDATION != 'off':
+        if request.user.email_isvalid:
+            return render('authopenid/changeemail.html',
+                            { 'email': request.user.email, 
+                              'action_type': 'key_not_sent', 
+                              'change_link': reverse('user_changeemail')},
+                              context_instance=RequestContext(request)
+                              )
+        else:
+            send_new_email_key(request.user)
+            return validation_email_sent(request)
+    else:
+        raise Http404
+   
+
+#internal server view used as return value by other views
+def validation_email_sent(request):
+    return render('authopenid/changeemail.html',
+                    { 'email': request.user.email, 
+                    'change_email_url': reverse('user_changeemail'),
+                    'action_type': 'validate', }, 
+                     context_instance=RequestContext(request))
+
+def verifyemail(request,id=None,key=None):
+    """
+    view that is shown when user clicks email validation link
+    url = /email/verify/{{user.id}}/{{user.email_key}}/
+    """
+    if settings.EMAIL_VALIDATION != 'off':
+        user = User.objects.get(id=id)
+        if user:
+            if user.email_key == key:
+                user.email_isvalid = True
+                clear_email_validation_message(user)
+                user.save()
+                return render('authopenid/changeemail.html', {
+                    'action_type': 'validation_complete',
+                    }, context_instance=RequestContext(request))
+    raise Http404
+
+@login_required
+def changeemail(request, action='change'):
+    """ 
+    changeemail view. requires openid with request type GET
+
+    url: /email/*
+
+    template : authopenid/changeemail.html
+    """
+    msg = request.GET.get('msg', None)
+    extension_args = {}
+    user_ = request.user
+
+    if request.POST:
+        if 'cancel' in request.POST:
+            msg = _('your email was not changed')
+            request.user.message_set.create(message=msg)
+            return HttpResponseRedirect(get_next_url(request))
+        form = ChangeEmailForm(request.POST, user=user_)
+        if form.is_valid():
+            new_email = form.cleaned_data['email']
+            if new_email != user_.email:
+                if settings.EMAIL_VALIDATION == 'on':
+                    action = 'validate'
+                else:
+                    action = 'done_novalidate'
+                set_new_email(user_, new_email,nomessage=True)
+            else:
+                action = 'keep'
+
+    elif not request.POST and 'openid.mode' in request.GET:
+        redirect_to = get_url_host(request) + reverse('user_changeemail')
+        return complete(request, emailopenid_success, 
+                emailopenid_failure, redirect_to) 
+    else:
+        form = ChangeEmailForm(initial={'email': user_.email},
+                user=user_)
+    
+    output = render('authopenid/changeemail.html', {
+        'form': form,
+        'email': user_.email,
+        'action_type': action,
+        'gravatar_faq_url': reverse('faq') + '#gravatar',
+        'change_email_url': reverse('user_changeemail'),
+        'msg': msg 
+        }, context_instance=RequestContext(request))
+
+    if action == 'validate':
+        set_email_validation_message(user_)
+
+    return output
+
+def emailopenid_success(request, identity_url, openid_response):
+    openid_ = from_openid_response(openid_response)
+
+    user_ = request.user
+    try:
+        uassoc = UserAssociation.objects.get(
+                openid_url__exact=identity_url
+        )
+    except:
+        return emailopenid_failure(request, 
+                _("No OpenID %s found associated in our database" % identity_url))
+
+    if uassoc.user.username != request.user.username:
+        return emailopenid_failure(request, 
+                _("The OpenID %s isn't associated to current user logged in" % 
+                    identity_url))
+    
+    new_email = request.session.get('new_email', '')
+    if new_email:
+        user_.email = new_email
+        user_.save()
+        del request.session['new_email']
+    msg = _("Email Changed.")
+
+    redirect = "%s?msg=%s" % (reverse('user_account_settings'),
+            urlquote_plus(msg))
+    return HttpResponseRedirect(redirect)
+    
+
+def emailopenid_failure(request, message):
+    redirect_to = "%s?msg=%s" % (
+            reverse('user_changeemail'), urlquote_plus(message))
+    return HttpResponseRedirect(redirect_to)
+ 
+@login_required
+def changeopenid(request):
+    """
+    change openid view. Allow user to change openid 
+    associated to its username.
+
+    url : /changeopenid/
+
+    template: authopenid/changeopenid.html
+    """
+
+    extension_args = {}
+    openid_url = ''
+    has_openid = True
+    msg = request.GET.get('msg', '')
+        
+    user_ = request.user
+
+    try:
+        uopenid = UserAssociation.objects.get(user=user_)
+        openid_url = uopenid.openid_url
+    except:
+        has_openid = False
+    
+    redirect_to = get_url_host(request) + reverse('user_changeopenid')
+    if request.POST and has_openid:
+        form = ChangeopenidForm(request.POST, user=user_)
+        if form.is_valid():
+            return ask_openid(request, form.cleaned_data['openid_url'],
+                    redirect_to, on_failure=changeopenid_failure)
+    elif not request.POST and has_openid:
+        if 'openid.mode' in request.GET:
+            return complete(request, changeopenid_success,
+                    changeopenid_failure, redirect_to)    
+
+    form = ChangeopenidForm(initial={'openid_url': openid_url }, user=user_)
+    return render('authopenid/changeopenid.html', {
+        'form': form,
+        'has_openid': has_openid, 
+        'msg': msg 
+        }, context_instance=RequestContext(request))
+
+def changeopenid_success(request, identity_url, openid_response):
+    openid_ = from_openid_response(openid_response)
+    is_exist = True
+    try:
+        uassoc = UserAssociation.objects.get(openid_url__exact=identity_url)
+    except:
+        is_exist = False
+        
+    if not is_exist:
+        try:
+            uassoc = UserAssociation.objects.get(
+                    user__username__exact=request.user.username
+            )
+            uassoc.openid_url = identity_url
+            uassoc.save()
+        except:
+            uassoc = UserAssociation(user=request.user, 
+                    openid_url=identity_url)
+            uassoc.save()
+    elif uassoc.user.username != request.user.username:
+        return changeopenid_failure(request, 
+                _('This OpenID is already associated with another account.'))
+
+    request.session['openids'] = []
+    request.session['openids'].append(openid_)
+
+    msg = _("OpenID %s is now associated with your account." % identity_url) 
+    redirect = "%s?msg=%s" % (
+            reverse('user_account_settings'), 
+            urlquote_plus(msg))
+    return HttpResponseRedirect(redirect)
+    
+
+def changeopenid_failure(request, message):
+    redirect_to = "%s?msg=%s" % (
+            reverse('user_changeopenid'), 
+            urlquote_plus(message))
+    return HttpResponseRedirect(redirect_to)
+  
+@login_required
+def delete(request):
+    """
+    delete view. Allow user to delete its account. Password/openid are required to 
+    confirm it. He should also check the confirm checkbox.
+
+    url : /delete
+
+    template : authopenid/delete.html
+    """
+
+    extension_args = {}
+    
+    user_ = request.user
+
+    redirect_to = get_url_host(request) + reverse('user_delete') 
+    if request.POST:
+        form = DeleteForm(request.POST, user=user_)
+        if form.is_valid():
+            if not form.test_openid:
+                user_.delete() 
+                return signout(request)
+            else:
+                return ask_openid(request, form.cleaned_data['password'],
+                        redirect_to, on_failure=deleteopenid_failure)
+    elif not request.POST and 'openid.mode' in request.GET:
+        return complete(request, deleteopenid_success, deleteopenid_failure,
+                redirect_to) 
+    
+    form = DeleteForm(user=user_)
+
+    msg = request.GET.get('msg','')
+    return render('authopenid/delete.html', {
+        'form': form, 
+        'msg': msg, 
+        }, context_instance=RequestContext(request))
+
+def deleteopenid_success(request, identity_url, openid_response):
+    openid_ = from_openid_response(openid_response)
+
+    user_ = request.user
+    try:
+        uassoc = UserAssociation.objects.get(
+                openid_url__exact=identity_url
+        )
+    except:
+        return deleteopenid_failure(request,
+                _("No OpenID %s found associated in our database" % identity_url))
+
+    if uassoc.user.username == user_.username:
+        user_.delete()
+        return signout(request)
+    else:
+        return deleteopenid_failure(request,
+                _("The OpenID %s isn't associated to current user logged in" % 
+                    identity_url))
+    
+    msg = _("Account deleted.") 
+    redirect = reverse('index') + u"/?msg=%s" % (urlquote_plus(msg))
+    return HttpResponseRedirect(redirect)
+    
+
+def deleteopenid_failure(request, message):
+    redirect_to = "%s?msg=%s" % (reverse('user_delete'), urlquote_plus(message))
+    return HttpResponseRedirect(redirect_to)
+
+def external_legacy_login_info(request):
+    return render('authopenid/external_legacy_login_info.html', context_instance=RequestContext(request))
+
+def sendpw(request):
+    """
+    send a new password to the user. It return a mail with 
+    a new pasword and a confirm link in. To activate the 
+    new password, the user should click on confirm link.
+
+    url : /sendpw/
+
+    templates :  authopenid/sendpw_email.txt, authopenid/sendpw.html
+    """
+    if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
+        return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
+
+    msg = request.GET.get('msg','')
+    if request.POST:
+        form = EmailPasswordForm(request.POST)
+        if form.is_valid():
+            new_pw = User.objects.make_random_password()
+            confirm_key = UserPasswordQueue.objects.get_new_confirm_key()
+            try:
+                uqueue = UserPasswordQueue.objects.get(
+                        user=form.user_cache
+                )
+            except:
+                uqueue = UserPasswordQueue(
+                        user=form.user_cache
+                )
+            uqueue.new_password = new_pw
+            uqueue.confirm_key = confirm_key
+            uqueue.save()
+            # send email 
+            subject = _("Request for new password")
+            message_template = loader.get_template(
+                    'authopenid/sendpw_email.txt')
+            key_link = settings.APP_URL + reverse('user_confirmchangepw') + '?key=' + confirm_key
+            message_context = Context({ 
+                'site_url': settings.APP_URL + reverse('index'),
+                'key_link': key_link,
+                'username': form.user_cache.username,
+                'password': new_pw,
+            })
+            message = message_template.render(message_context)
+            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, 
+                    [form.user_cache.email])
+            msg = _("A new password and the activation link were sent to your email address.")
+    else:
+        form = EmailPasswordForm()
+        
+    return render('authopenid/sendpw.html', {
+        'form': form,
+        'msg': msg 
+        }, context_instance=RequestContext(request))
+
+
+def confirmchangepw(request):
+    """
+    view to set new password when the user click on confirm link
+    in its mail. Basically it check if the confirm key exist, then
+    replace old password with new password and remove confirm
+    ley from the queue. Then it redirect the user to signin
+    page.
+
+    url : /sendpw/confirm/?key
+
+    """
+    confirm_key = request.GET.get('key', '')
+    if not confirm_key:
+        return HttpResponseRedirect(reverse('index'))
+
+    try:
+        uqueue = UserPasswordQueue.objects.get(
+                confirm_key__exact=confirm_key
+        )
+    except:
+        msg = _("Could not change password. Confirmation key '%s'\
+                is not registered." % confirm_key) 
+        redirect = "%s?msg=%s" % (
+                reverse('user_sendpw'), urlquote_plus(msg))
+        return HttpResponseRedirect(redirect)
+
+    try:
+        user_ = User.objects.get(id=uqueue.user.id)
+    except:
+        msg = _("Can not change password. User don't exist anymore \
+                in our database.") 
+        redirect = "%s?msg=%s" % (reverse('user_sendpw'), 
+                urlquote_plus(msg))
+        return HttpResponseRedirect(redirect)
+
+    user_.set_password(uqueue.new_password)
+    user_.save()
+    uqueue.delete()
+    msg = _("Password changed for %s. You may now sign in." % 
+            user_.username) 
+    redirect = "%s?msg=%s" % (reverse('user_signin'), 
+                                        urlquote_plus(msg))
+
+    return HttpResponseRedirect(redirect)
diff --git a/settings_local.py.dist b/settings_local.py.dist
index 14b22e5a..8d645025 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,88 +1,91 @@
-# encoding:utf-8
-import os.path
-from django.utils.translation import ugettext as _
-
-SITE_SRC_ROOT = os.path.dirname(__file__) 
-LOG_FILENAME = 'django.osqa.log'
-
-#for logging
-import logging
-logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
-
-#ADMINS and MANAGERS
-ADMINS = (('Forum Admin', 'forum@example.com'),)
-MANAGERS = ADMINS
-
-#DEBUG SETTINGS
-DEBUG = False 
-TEMPLATE_DEBUG = DEBUG
-INTERNAL_IPS = ('127.0.0.1',)
-
-DATABASE_NAME = 'osqa'             # Or path to database file if using sqlite3.
-DATABASE_USER = ''               # Not used with sqlite3.
-DATABASE_PASSWORD = ''               # Not used with sqlite3.
-DATABASE_ENGINE = 'mysql'  #mysql, etc
-DATABASE_HOST = ''
-DATABASE_PORT = ''
-
-#Moved from settings.py for better organization. (please check it up to clean up settings.py)
-
-#email server settings
-SERVER_EMAIL = ''
-DEFAULT_FROM_EMAIL = ''
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[OSQA] '
-EMAIL_HOST='osqa.net'
-EMAIL_PORT='25'
-EMAIL_USE_TLS=False
-
-#LOCALIZATIONS
-TIME_ZONE = 'America/New_York'
-
-###########################
-#
-#   this will allow running your forum with url like http://site.com/forum
-#
-#   FORUM_SCRIPT_ALIAS = 'forum/'
-#
-FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
-
-
-#OTHER SETTINGS
-APP_TITLE = u'OSQA: Open Source Q&A Forum'
-APP_SHORT_NAME = u'OSQA'
-APP_KEYWORDS = u'OSQA,CNPROG,forum,community'
-APP_DESCRIPTION = u'Ask and answer questions.'
-APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
-APP_COPYRIGHT = 'Copyright OSQA, 2009. Some rights reserved under creative commons license.'
-LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
-GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
-
-USE_I18N = True
-LANGUAGE_CODE = 'en'
-EMAIL_VALIDATION = 'off' #string - on|off
-MIN_USERNAME_LENGTH = 1
-EMAIL_UNIQUE = False
-APP_URL = 'http://osqa.net' #used by email notif system and RSS
-GOOGLE_SITEMAP_CODE = ''
-GOOGLE_ANALYTICS_KEY = ''
-BOOKS_ON = False 
-WIKI_ON = True 
-USE_EXTERNAL_LEGACY_LOGIN = False
-EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.net'
-EXTERNAL_LEGACY_LOGIN_PORT = 80
-EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
-FEEDBACK_SITE_URL = None #None or url
-
-DJANGO_VERSION = 1.1
-RESOURCE_REVISION=4
-
-USE_SPHINX_SEARCH = False #if True all SPHINX_* settings are required
-#also sphinx search engine and djangosphinxs app must be installed
-#sample sphinx configuration file is /sphinx/sphinx.conf
-SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
-SPHINX_SEARCH_INDICES=('osqa',) #a tuple of index names remember about a comma after the 
-#last item, especially if you have just one :)
-SPHINX_SERVER='localhost'
-SPHINX_PORT=3312
+# encoding:utf-8
+import os.path
+from django.utils.translation import ugettext as _
+
+SITE_SRC_ROOT = os.path.dirname(__file__) 
+LOG_FILENAME = 'django.osqa.log'
+
+#for logging
+import logging
+logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
+
+#ADMINS and MANAGERS
+ADMINS = (('Forum Admin', 'forum@example.com'),)
+MANAGERS = ADMINS
+
+#DEBUG SETTINGS
+DEBUG = False 
+TEMPLATE_DEBUG = DEBUG
+INTERNAL_IPS = ('127.0.0.1',)
+
+DATABASE_NAME = 'osqa'             # Or path to database file if using sqlite3.
+DATABASE_USER = ''               # Not used with sqlite3.
+DATABASE_PASSWORD = ''               # Not used with sqlite3.
+DATABASE_ENGINE = 'mysql'  #mysql, etc
+DATABASE_HOST = ''
+DATABASE_PORT = ''
+
+#Moved from settings.py for better organization. (please check it up to clean up settings.py)
+
+#email server settings
+SERVER_EMAIL = ''
+DEFAULT_FROM_EMAIL = ''
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_SUBJECT_PREFIX = '[OSQA] '
+EMAIL_HOST='osqa.net'
+EMAIL_PORT='25'
+EMAIL_USE_TLS=False
+
+#LOCALIZATIONS
+TIME_ZONE = 'America/New_York'
+
+###########################
+#
+#   this will allow running your forum with url like http://site.com/forum
+#
+#   FORUM_SCRIPT_ALIAS = 'forum/'
+#
+FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
+
+
+#OTHER SETTINGS
+APP_TITLE = u'OSQA: Open Source Q&A Forum'
+APP_SHORT_NAME = u'OSQA'
+APP_KEYWORDS = u'OSQA,CNPROG,forum,community'
+APP_DESCRIPTION = u'Ask and answer questions.'
+APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
+APP_COPYRIGHT = 'Copyright OSQA, 2009. Some rights reserved under creative commons license.'
+LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
+GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
+
+USE_I18N = True
+LANGUAGE_CODE = 'en'
+EMAIL_VALIDATION = 'off' #string - on|off
+MIN_USERNAME_LENGTH = 1
+EMAIL_UNIQUE = False
+APP_URL = 'http://osqa.net' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = ''
+GOOGLE_ANALYTICS_KEY = ''
+BOOKS_ON = False 
+WIKI_ON = True 
+USE_EXTERNAL_LEGACY_LOGIN = False
+EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.net'
+EXTERNAL_LEGACY_LOGIN_PORT = 80
+EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
+FEEDBACK_SITE_URL = None #None or url
+
+DJANGO_VERSION = 1.1
+RESOURCE_REVISION=4
+
+USE_SPHINX_SEARCH = False #if True all SPHINX_* settings are required
+#also sphinx search engine and djangosphinxs app must be installed
+#sample sphinx configuration file is /sphinx/sphinx.conf
+SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
+SPHINX_SEARCH_INDICES=('osqa',) #a tuple of index names remember about a comma after the 
+#last item, especially if you have just one :)
+SPHINX_SERVER='localhost'
+SPHINX_PORT=3312
+
+#Facebook settings
+FB_API_KEY='' #your api key from facebook
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
old mode 100644
new mode 100755
index 1363661e..3a12f1c6
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -1,173 +1,178 @@
-{% extends "base.html" %}
-<!-- signin.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-    <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
-
-	<link rel="stylesheet" type="text/css" media="screen" href="{% href "/content/jquery-openid/openid.css" %}"/>
-	<script type="text/javascript" src="{% href "/content/jquery-openid/jquery.openid.js" %}"></script>
-	<script type="text/javascript">  $().ready( function() { $("form.openid:eq(0)").openid(); })</script>
-	<!--<script type="text/javascript">
-	$().ready(function(){
-	    openid.init('id_openid_url');
-        setupFormValidation("#openid_form", {bsignin:{required: true}});
-	});
-	</script>-->
-{% endblock %}
-{% block content %}
-<div class="headNormal">
-	{% trans "User login" %}
-</div>
-        {% if msg %}
-            <p class="warning">{{ msg }}</p>
-        {% endif %}
-        {% if answer %}
-            <div class="message">
-                {% blocktrans with answer.question.title as title and answer.summary as summary %}
-                Your answer to {{title}} {{summary}} will be posted once you log in
-                {% endblocktrans %}
-            </div>
-        {% endif %}
-        {% if question %}
-            <div class="message">
-                {% blocktrans with question.title as title and question.summary as summary %}Your question 
-                {{title}} {{summary}} will be posted once you log in
-                {% endblocktrans %}
-            </div>
-        {% endif %}
-			<form id="openid_form" name="openid_form" class="openid" method="post" action="{% url user_signin %}"> 
-		      <div style="width:600px;float:left;margin-bottom:5px;">
-                {% trans "Click to sign in through any of these services." %}
-              </div>
-			  <ul class="providers"> 
-			  <li class="local" title="Local login">
-				  <div class="logo_box local_login_box">
-						<img src="{% href "/content/jquery-openid/images/local-login.png" %}" alt="your icon here" /> 
-				  </div>
-			  <span></span>
-			  </li> 
-			  <li class="direct" title="Google"> 
-			  	<div class="logo_box google_box">
-					<img src="{% href "/content/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
-				</div>
-		 	  </li>
-			  <li class="direct" title="Yahoo"> 
-			  	<div class="logo_box yahoo_box">
-					<img src="{% href "/content/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>
-				</div>
-			  </li>
-			  <li class="username" title="AOL screen name"> 
-			  	<div class="logo_box aol_box">
-					<img src="{% href "/content/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
-				</div>
-			  </li>
-              </ul>
-			  <ul class="providers"> 
-			  <!--<li class="openid" title="OpenID">
-				  <div class="logo_box openid_box">
-						<img src="/content/jquery-openid/images/openid.gif" alt="icon" /> 
-				  </div>
-			  <span><strong>http://{your-openid-url}</strong></span>
-			  </li>-->
-			  <li class="openid first_tiny_li" title="OpenID URL"> 
-					<img src="{% href "/content/jquery-openid/images/openidico16.png" %}" alt="icon" />
-					<span>http://{your-openid-url}</span>
-		      </li> 
-			  <li class="username" title="MyOpenID user name"> 
-					<img src="{% href "/content/jquery-openid/images/myopenid-2.png" %}" alt="icon" />
-					<span>http://<strong>username</strong>.myopenid.com/</span>
-		      </li> 
-			  <li class="username" title="Flickr user name"> 
-					<img src="{% href "/content/jquery-openid/images/flickr.png" %}" alt="icon" />
-					<span>http://flickr.com/<strong>username</strong>/</span>
-			  </li> 
-			  <li class="username" title="Technorati user name"> 
-					<img src="{% href "/content/jquery-openid/images/technorati-1.png" %}" alt="icon" />
-					<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>
-			  </li> 
-			  <li class="username" title="Wordpress blog name"> 
-					<img src="{% href "/content/jquery-openid/images/wordpress.png" %}" alt="icon" />
-					<span>http://<strong>username</strong>.wordpress.com</span>
-              </li> 
-			  <li class="username" title="Blogger blog name"> 
-					<img src="{% href "/content/jquery-openid/images/blogger-1.png" %}" alt="icon" />
-					<span>http://<strong>username</strong>.blogspot.com/</span>
-			  </li> 
-			  <li class="username" title="LiveJournal blog name"> 
-					<img src="{% href "/content/jquery-openid/images/livejournal-1.png" %}" alt="icon" />
-					<span>http://<strong>username</strong>.livejournal.com</span>
-			  </li> 
-			  <li class="username" title="ClaimID user name"> 
-					<img src="{% href "/content/jquery-openid/images/claimid-0.png" %}" alt="icon" />
-					<span>http://claimid.com/<strong>username</strong></span>
-			  </li> 
-			  <li class="username" title="Vidoop user name"> 
-					<img src="{% href "/content/jquery-openid/images/vidoop.png" %}" alt="icon" />
-					<span>http://<strong>username</strong>.myvidoop.com/</span>
-			  </li> 
-			  <li class="username" title="Verisign user name"> 
-					<img src="{% href "/content/jquery-openid/images/verisign-2.png" %}" alt="icon" />
-					<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
-			  </li> 
-			  </ul>
-			  {{ form2.next }}
-			  <fieldset> 
-				  <p id="provider_name_slot">{% trans 'Enter your <span id="enter_your_what">Provider user name</span>' %}</p> 
-				  <div><p><span></span>
-				  		<input id="openid_username" type="text" name="openid_username" /><span></span> 
-			  			<input type="submit" value="Login" />
-				  </p></div>
-			  </fieldset> 
-			  <fieldset> 
-				  <p>{% trans 'Enter your <a class="openid_logo" href="http://openid.net">OpenID</a> web address' %}</p> 
-				  <div><p><input id="openid_url" type="text" value="http://" name="openid_url" /> 
-				  <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" /></p></div> 
-			  </fieldset> 
-              <fieldset id='local_login_fs'>
-				  <p>{% trans 'Enter your login name and password' %}</p> 
-                  {% if form1.errors %}
-                    {{form1.non_field_errors.as_ul}}
-                  {% endif %}
-				  <div><p class="login"><label for="id_username">{% trans "Login name" %}</label>
-                            {{form1.username}}</p>
-                  <p class="login"><label for="id_password">{% trans "Password" %}</label>
-                            {{form1.password}}</p>
-                  <p id="local_login_buttons">
-				  <input id="blogin" name="blogin" type="submit" value="{% trans "Login" %}" />
-                  <a href="{% url user_signup %}">{% trans "Create account" %}</a><br/>
-                  <a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a>
-                  </p>
-                  </div>
-              </fieldset>
-			</form>
-{% endblock %}
-
-{% block sidebar %}
-<div class="boxC">
-    <h3 class="subtitle">{% trans "Why use OpenID?" %}</h3>
-    <ul class="list-item">
-        <li>
-		{% trans "with openid it is easier" %}
-        </li>
-        <li>
-		{% trans "reuse openid" %}
-        </li>
-        <li>
-		{% trans "openid is widely adopted" %}
-        </li>
-        <li>
-		{% trans "openid is supported open standard" %}
-        </li>
-        
-    </ul>
-    <p class="info-box-follow-up-links">
-        <a href="http://openid.net/what/" target="_blank">{% trans "Find out more" %} »</a><br/>
-        <a href="http://openid.net/get/" target="_blank">{% trans "Get OpenID" %} »</a>
-    </p>
-</div>
-{% endblock%}
-
-		<script type="text/javascript">  $( function() { $("form.openid:eq(0)").openid(); })</script>
-<!-- end signin.html -->
+{% extends "base.html" %}
+<!-- signin.html -->
+{% load i18n %}
+{% load extra_tags %}
+{% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}
+{% block forejs %}
+    <script type='text/javascript' src='{% href "/content/js/jquery.validate.pack.js" %}'></script>
+
+	<link rel="stylesheet" type="text/css" media="screen" href="{% href "/content/jquery-openid/openid.css" %}"/>
+	<script type="text/javascript" src="{% href "/content/jquery-openid/jquery.openid.js" %}"></script>
+	<script type="text/javascript">  $().ready( function() { $("form.openid:eq(0)").openid(); })</script>
+	<!--<script type="text/javascript">
+	$().ready(function(){
+	    openid.init('id_openid_url');
+        setupFormValidation("#openid_form", {bsignin:{required: true}});
+	});
+	</script>-->
+{% endblock %}
+{% block content %}
+<div class="headNormal">
+	{% trans "User login" %}
+</div>
+        {% if msg %}
+            <p class="warning">{{ msg }}</p>
+        {% endif %}
+        {% if answer %}
+            <div class="message">
+                {% blocktrans with answer.question.title as title and answer.summary as summary %}
+                Your answer to {{title}} {{summary}} will be posted once you log in
+                {% endblocktrans %}
+            </div>
+        {% endif %}
+        {% if question %}
+            <div class="message">
+                {% blocktrans with question.title as title and question.summary as summary %}Your question 
+                {{title}} {{summary}} will be posted once you log in
+                {% endblocktrans %}
+            </div>
+        {% endif %}
+			<form id="openid_form" name="openid_form" class="openid" method="post" action="{% url user_signin %}"> 
+		      <div style="width:600px;float:left;margin-bottom:5px;">
+                {% trans "Click to sign in through any of these services." %}
+              </div>
+			  <ul class="providers"> 
+			  <li class="local" title="Local login">
+				  <div class="logo_box local_login_box">
+						<img src="{% href "/content/jquery-openid/images/local-login.png" %}" alt="your icon here" /> 
+				  </div>
+			  <span></span>
+			  </li> 
+			  <li class="direct" title="Google"> 
+			  	<div class="logo_box google_box">
+					<img src="{% href "/content/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>
+				</div>
+		 	  </li>
+			  <li class="direct" title="Yahoo"> 
+			  	<div class="logo_box yahoo_box">
+					<img src="{% href "/content/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>
+				</div>
+			  </li>
+			  <li class="username" title="AOL screen name"> 
+			  	<div class="logo_box aol_box">
+					<img src="{% href "/content/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
+				</div>
+			  </li>
+              <li title="Facebook Connect">
+                    <fb:login-button onlogin="window.location.reload(true)"></fb:login-button>
+              </li>
+              </ul>            
+			  <ul class="providers"> 
+			  <!--<li class="openid" title="OpenID">
+				  <div class="logo_box openid_box">
+						<img src="/content/jquery-openid/images/openid.gif" alt="icon" /> 
+				  </div>
+			  <span><strong>http://{your-openid-url}</strong></span>
+			  </li>-->
+			  <li class="openid first_tiny_li" title="OpenID URL"> 
+					<img src="{% href "/content/jquery-openid/images/openidico16.png" %}" alt="icon" />
+					<span>http://{your-openid-url}</span>
+		      </li> 
+			  <li class="username" title="MyOpenID user name"> 
+					<img src="{% href "/content/jquery-openid/images/myopenid-2.png" %}" alt="icon" />
+					<span>http://<strong>username</strong>.myopenid.com/</span>
+		      </li> 
+			  <li class="username" title="Flickr user name"> 
+					<img src="{% href "/content/jquery-openid/images/flickr.png" %}" alt="icon" />
+					<span>http://flickr.com/<strong>username</strong>/</span>
+			  </li> 
+			  <li class="username" title="Technorati user name"> 
+					<img src="{% href "/content/jquery-openid/images/technorati-1.png" %}" alt="icon" />
+					<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>
+			  </li> 
+			  <li class="username" title="Wordpress blog name"> 
+					<img src="{% href "/content/jquery-openid/images/wordpress.png" %}" alt="icon" />
+					<span>http://<strong>username</strong>.wordpress.com</span>
+              </li> 
+			  <li class="username" title="Blogger blog name"> 
+					<img src="{% href "/content/jquery-openid/images/blogger-1.png" %}" alt="icon" />
+					<span>http://<strong>username</strong>.blogspot.com/</span>
+			  </li> 
+			  <li class="username" title="LiveJournal blog name"> 
+					<img src="{% href "/content/jquery-openid/images/livejournal-1.png" %}" alt="icon" />
+					<span>http://<strong>username</strong>.livejournal.com</span>
+			  </li> 
+			  <li class="username" title="ClaimID user name"> 
+					<img src="{% href "/content/jquery-openid/images/claimid-0.png" %}" alt="icon" />
+					<span>http://claimid.com/<strong>username</strong></span>
+			  </li> 
+			  <li class="username" title="Vidoop user name"> 
+					<img src="{% href "/content/jquery-openid/images/vidoop.png" %}" alt="icon" />
+					<span>http://<strong>username</strong>.myvidoop.com/</span>
+			  </li> 
+			  <li class="username" title="Verisign user name"> 
+					<img src="{% href "/content/jquery-openid/images/verisign-2.png" %}" alt="icon" />
+					<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>
+			  </li> 
+			  </ul>
+			  {{ form2.next }}
+			  <fieldset> 
+				  <p id="provider_name_slot">{% trans 'Enter your <span id="enter_your_what">Provider user name</span>' %}</p> 
+				  <div><p><span></span>
+				  		<input id="openid_username" type="text" name="openid_username" /><span></span> 
+			  			<input type="submit" value="Login" />
+				  </p></div>
+			  </fieldset> 
+			  <fieldset> 
+				  <p>{% trans 'Enter your <a class="openid_logo" href="http://openid.net">OpenID</a> web address' %}</p> 
+				  <div><p><input id="openid_url" type="text" value="http://" name="openid_url" /> 
+				  <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" /></p></div> 
+			  </fieldset> 
+              <fieldset id='local_login_fs'>
+				  <p>{% trans 'Enter your login name and password' %}</p> 
+                  {% if form1.errors %}
+                    {{form1.non_field_errors.as_ul}}
+                  {% endif %}
+				  <div><p class="login"><label for="id_username">{% trans "Login name" %}</label>
+                            {{form1.username}}</p>
+                  <p class="login"><label for="id_password">{% trans "Password" %}</label>
+                            {{form1.password}}</p>
+                  <p id="local_login_buttons">
+				  <input id="blogin" name="blogin" type="submit" value="{% trans "Login" %}" />
+                  <a href="{% url user_signup %}">{% trans "Create account" %}</a><br/>
+                  <a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a>
+                  </p>
+                  </div>
+              </fieldset>
+			</form>
+{% endblock %}
+
+{% block sidebar %}
+<div class="boxC">
+    <h3 class="subtitle">{% trans "Why use OpenID?" %}</h3>
+    <ul class="list-item">
+        <li>
+		{% trans "with openid it is easier" %}
+        </li>
+        <li>
+		{% trans "reuse openid" %}
+        </li>
+        <li>
+		{% trans "openid is widely adopted" %}
+        </li>
+        <li>
+		{% trans "openid is supported open standard" %}
+        </li>
+        
+    </ul>
+    <p class="info-box-follow-up-links">
+        <a href="http://openid.net/what/" target="_blank">{% trans "Find out more" %} »</a><br/>
+        <a href="http://openid.net/get/" target="_blank">{% trans "Get OpenID" %} »</a>
+    </p>
+</div>
+<script type="text/javascript" src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"></script>
+<script type="text/javascript">  FB.init("{{ fb_api_key }}","{% url  xd_receiver %}");</script> 
+{% endblock%}
+
+		<script type="text/javascript">  $( function() { $("form.openid:eq(0)").openid(); })</script>
+<!-- end signin.html -->
diff --git a/templates/base.html b/templates/base.html
old mode 100644
new mode 100755
index daafc3bc..befdc994
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,95 +1,95 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- template base.html -->
-{% load extra_filters %}
-{% load extra_tags %}
-{% load i18n %}
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
-        {% spaceless %}
-        {% block meta %}{% endblock %}
-        {% endspaceless %}
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        {% if settings.GOOGLE_SITEMAP_CODE %}
-        <meta name="verify-v1" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
-        {% endif %}
-        <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
-        <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
-        <script src="http://www.google.com/jsapi" type="text/javascript"></script>
-        <script type="text/javascript">google.load("jquery", "1.2.6");</script>
-		<script type="text/javascript">
-            var i18nLang = '{{settings.LANGUAGE_CODE}}';
-            var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
-		</script>
-        <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
-		<script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
-        <script type='text/javascript' src='{% href "/content/js/com.cnprog.utils.js" %}'></script>
-        <!--<script type="text/javascript">
-        var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
-        document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
-        </script>
-        <script type="text/javascript">
-        UserVoice.Tab.show({ 
-            key: 'cnprog',
-            host: 'cnprog.uservoice.com', 
-            forum: 'general', 
-            alignment: 'left', /* 'left', 'right' */
-            background_color:'#777', 
-            text_color: 'white', /* 'white', 'black' */
-            hover_color: '#06C',
-            lang: 'en' /* 'en', 'de', 'nl', 'es', 'fr' */
-        })
-        </script>-->
-		<!-- todo move this to settings -->
-        {% if user_messages %}
-        <style type="text/css">
-            body { margin-top:2.4em; }
-        </style>
-        <script type="text/javascript">
-            $().ready(function() {
-                $('#validate_email_alert').click(function(){notify.close(true)})
-                notify.show();
-            });
-        </script>
-        {% endif %}
-      
-        {% block forejs %}
-        {% endblock %}
-    </head>
-    <body>
-        <div class="notify" style="display:none">
-            {% autoescape off %}
-                {% if user_messages %}
-                    {% for message in user_messages %}
-                          <p class="darkred">{{ message }}<p>
-                    {% endfor %}
-                {% endif %}
-            {% endautoescape %}
-            <a id="close-notify" onclick="notify.close(true)">&times;</a>
-        </div>
-        {% include "header.html" %}
-        <div id="wrapper">
-            <div id="room">
-                <div id="CALeft">
-                    {% block content%}
-                    {% endblock%}
-
-                </div>
-                <div id="CARight">
-                    {% block sidebar%}
-                    {% endblock%}
-
-                </div>
-                <div id="tail" style="clear:both;">
-                    {% block tail %}
-                    {% endblock %}
-                </div>
-            </div>
-            <div class="spacer3"></div>
-        </div>
-        {% include "footer.html" %}
-        {% block endjs %}
-        {% endblock %}
-    </body>
-</html>
-<!-- end template base.html -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- template base.html -->
+{% load extra_filters %}
+{% load extra_tags %}
+{% load i18n %}
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="http://www.facebook.com/2008/fbml">
+    <head>
+        <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
+        {% spaceless %}
+        {% block meta %}{% endblock %}
+        {% endspaceless %}
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        {% if settings.GOOGLE_SITEMAP_CODE %}
+        <meta name="verify-v1" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
+        {% endif %}
+        <link rel="shortcut icon" href="{% href "/content/images/favicon.ico" %}" />
+        <link href="{% href "/content/style/style.css" %}" rel="stylesheet" type="text/css" />
+        <script src="http://www.google.com/jsapi" type="text/javascript"></script>
+        <script type="text/javascript">google.load("jquery", "1.2.6");</script>
+		<script type="text/javascript">
+            var i18nLang = '{{settings.LANGUAGE_CODE}}';
+            var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
+		</script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.i18n.js" %}'></script>
+		<script type='text/javascript' src='{% href "/content/js/jquery.i18n.js" %}'></script>
+        <script type='text/javascript' src='{% href "/content/js/com.cnprog.utils.js" %}'></script>
+        <!--<script type="text/javascript">
+        var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
+        document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
+        </script>
+        <script type="text/javascript">
+        UserVoice.Tab.show({ 
+            key: 'cnprog',
+            host: 'cnprog.uservoice.com', 
+            forum: 'general', 
+            alignment: 'left', /* 'left', 'right' */
+            background_color:'#777', 
+            text_color: 'white', /* 'white', 'black' */
+            hover_color: '#06C',
+            lang: 'en' /* 'en', 'de', 'nl', 'es', 'fr' */
+        })
+        </script>-->
+		<!-- todo move this to settings -->
+        {% if user_messages %}
+        <style type="text/css">
+            body { margin-top:2.4em; }
+        </style>
+        <script type="text/javascript">
+            $().ready(function() {
+                $('#validate_email_alert').click(function(){notify.close(true)})
+                notify.show();
+            });
+        </script>
+        {% endif %}
+      
+        {% block forejs %}
+        {% endblock %}
+    </head>
+    <body>
+        <div class="notify" style="display:none">
+            {% autoescape off %}
+                {% if user_messages %}
+                    {% for message in user_messages %}
+                          <p class="darkred">{{ message }}<p>
+                    {% endfor %}
+                {% endif %}
+            {% endautoescape %}
+            <a id="close-notify" onclick="notify.close(true)">&times;</a>
+        </div>
+        {% include "header.html" %}
+        <div id="wrapper">
+            <div id="room">
+                <div id="CALeft">
+                    {% block content%}
+                    {% endblock%}
+
+                </div>
+                <div id="CARight">
+                    {% block sidebar%}
+                    {% endblock%}
+
+                </div>
+                <div id="tail" style="clear:both;">
+                    {% block tail %}
+                    {% endblock %}
+                </div>
+            </div>
+            <div class="spacer3"></div>
+        </div>
+        {% include "footer.html" %}
+        {% block endjs %}
+        {% endblock %}
+    </body>
+</html>
+<!-- end template base.html -->
diff --git a/templates/xd_receiver.html b/templates/xd_receiver.html
new file mode 100755
index 00000000..c67c57b7
--- /dev/null
+++ b/templates/xd_receiver.html
@@ -0,0 +1 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" > <body> <script src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.js" type="text/javascript"></script> </body> </html> 
-- 
cgit v1.2.3-1-g7c22