recaptcha for conventional registration\n\

simpler email subscription form at registration\n\
fixed urls in rss feed\n\
added experimental remote password login api (cleartext password for remote site entered locally)\n\
included example for Mediawiki Authentication plugin\n\
very simple message to everyone management command

5 files changed, 112 insertions, 328 deletions

diff --git a/django_authopenid/external_login.py b/django_authopenid/external_login.py
deleted file mode 100644
index bd49c009..00000000
--- a/django_authopenid/external_login.py
+++ /dev/null
@@ -1,103 +0,0 @@
-#this file contains stub functions that can be extended to support
-#connect legacy login with external site
-import settings
-from django_authopenid.models import ExternalLoginData
-import httplib
-import urllib
-import Cookie
-import cookielib
-from django import forms
-import xml.dom.minidom as xml
-import logging
-
-def login(request,user):
-    """performs the additional external login operation
-    """
-    pass
-
-def set_login_cookies(response,user):
-    #should be unique value by design
-    try:
-        eld = ExternalLoginData.objects.get(user=user)
-
-        data = eld.external_session_data
-        dom = xml.parseString(data)
-        login_response = dom.getElementsByTagName('login')[0]
-        userid = login_response.getAttribute('lguserid') 
-        username = login_response.getAttribute('lgusername')
-        token = login_response.getAttribute('lgtoken')
-        prefix = login_response.getAttribute('cookieprefix').decode('utf-8')
-        sessionid = login_response.getAttribute('sessionid')
-
-        c = {}
-        c[prefix + 'UserName'] = username
-        c[prefix + 'UserID'] = userid
-        c[prefix + 'Token'] = token
-        c[prefix + '_session'] = sessionid
-
-        #custom code that copies cookies from external site
-        #not sure how to set paths and domain of cookies here
-        for key in c:
-            if c[key]:
-                response.set_cookie(str(key),value=str(c[key]))
-    except ExternalLoginData.DoesNotExist:
-        #this must be an OpenID login
-        pass
-
-#function to perform external logout, if needed
-def logout(request):
-    pass
-
-#should raise User.DoesNotExist or pass
-def clean_username(username):
-    return username
-
-def check_password(username,password):
-    """connects to external site and submits username/password pair
-    return True or False depending on correctness of login
-    saves remote unique id and remote session data in table ExternalLoginData
-    may raise forms.ValidationError
-    """
-    host = settings.EXTERNAL_LEGACY_LOGIN_HOST
-    port = settings.EXTERNAL_LEGACY_LOGIN_PORT
-    ext_site = httplib.HTTPConnection(host,port)
-
-    #custom code. this one does authentication through
-    #MediaWiki API
-    params = urllib.urlencode({'action':'login','format':'xml',
-            'lgname':username,'lgpassword':password})
-    headers = {"Content-type": "application/x-www-form-urlencoded",
-                'User-Agent':"User-Agent':'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.7) Gecko/2009021910 Firefox/3.0.7",
-              "Accept": "text/xml"}
-    ext_site.request("POST","/wiki/api.php",params,headers)
-    response = ext_site.getresponse()
-    if response.status != 200:
-        raise forms.ValidationError('error ' + response.status + ' ' + response.reason)
-    data = response.read().strip()
-    ext_site.close()
-
-    dom = xml.parseString(data)
-    login = dom.getElementsByTagName('login')[0]
-    result = login.getAttribute('result')
-    
-    if result == 'Success':
-        username = login.getAttribute('lgusername')
-        try:
-            eld = ExternalLoginData.objects.get(external_username=username)
-        except ExternalLoginData.DoesNotExist:
-            eld = ExternalLoginData()
-        eld.external_username = username
-        eld.external_session_data = data
-        eld.save()
-        return True 
-    else:
-        error = login.getAttribute('details')
-        raise forms.ValidationError(error)
-    return False 
-
-def createuser(username,email,password):
-    pass
-
-#retrieve email address
-def get_email(username,password):
-    return ''
diff --git a/django_authopenid/forms.py b/django_authopenid/forms.py
index 6781401e..2fe6db74 100644
--- a/django_authopenid/forms.py
+++ b/django_authopenid/forms.py
@@ -35,11 +35,12 @@ from django.contrib.auth.models import User
 from django.contrib.auth import authenticate
 from django.utils.translation import ugettext as _
 from django.conf import settings
-import external_login
 import types
 import re
 from django.utils.safestring import mark_safe
-
+from recaptcha_django import ReCaptchaField
+from utils.forms import NextUrlField, UserNameField, UserEmailField, SetPasswordForm
+EXTERNAL_LOGIN_APP = settings.LOAD_EXTERNAL_LOGIN_APP()
 
 # needed for some linux distributions like debian
 try:
@@ -47,7 +48,7 @@ try:
 except ImportError:
     from yadis import xri
     
-from django_authopenid.util import clean_next
+from utils.forms import clean_next
 from django_authopenid.models import ExternalLoginData
 
 __all__ = ['OpenidSigninForm', 'ClassicLoginForm', 'OpenidVerifyForm',
@@ -55,102 +56,6 @@ __all__ = ['OpenidSigninForm', 'ClassicLoginForm', 'OpenidVerifyForm',
         'ChangeEmailForm', 'EmailPasswordForm', 'DeleteForm',
         'ChangeOpenidForm']
 
-class NextUrlField(forms.CharField):
-    def __init__(self):
-        super(NextUrlField,self).__init__(max_length = 255,widget = forms.HiddenInput(),required = False)
-    def clean(self,value):
-        return clean_next(value)
-
-attrs_dict = { 'class': 'required login' }
-
-class UserNameField(forms.CharField):
-    username_re = re.compile(r'^[\w ]+$')
-    RESERVED_NAMES = (u'fuck', u'shit', u'ass', u'sex', u'add',
-                       u'edit', u'save', u'delete', u'manage', u'update', 'remove', 'new')
-    def __init__(self,must_exist=False,skip_clean=False,label=_('choose a username'),**kw):
-        self.must_exist = must_exist
-        self.skip_clean = skip_clean
-        super(UserNameField,self).__init__(max_length=30,
-                widget=forms.TextInput(attrs=attrs_dict),
-                label=label,
-                error_messages={'required':_('user name is required'),
-                                'taken':_('sorry, this name is taken, please choose another'),
-                                'forbidden':_('sorry, this name is not allowed, please choose another'),
-                                'missing':_('sorry, there is no user with this name'),
-                                'multiple-taken':_('sorry, we have a serious error - user name is taken by several users'),
-                                'invalid':_('user name can only consist of letters, empty space and underscore'),
-                            },
-                **kw
-                )
-
-    def clean(self,username):
-        """ validate username """
-        username = super(UserNameField,self).clean(username.strip())
-        if self.skip_clean == True:
-            return username
-        if hasattr(self, 'user_instance'):
-            if username == self.user_instance.username:
-                return username
-        if not username_re.search(username):
-            raise forms.ValidationError(self.error_messages['invalid'])
-        if username in self.RESERVED_NAMES:
-            raise forms.ValidationError(self.error_messages['forbidden'])
-        try:
-            user = User.objects.get(
-                    username__exact = username
-            )
-            if user:
-                if self.must_exist:
-                    return username
-                else:
-                    raise forms.ValidationError(self.error_messages['taken'])
-        except User.DoesNotExist:
-            if self.must_exist:
-                raise forms.ValidationError(self.error_messages['missing'])
-            else:
-                return username
-        except User.MultipleObjectsReturned:
-            raise forms.ValidationError(self.error_messages['multiple-taken'])
-
-class UserEmailField(forms.EmailField):
-    def __init__(self,skip_clean=False,**kw):
-        self.skip_clean = skip_clean
-        super(UserEmailField,self).__init__(widget=forms.TextInput(attrs=dict(attrs_dict,
-            maxlength=200)), label=mark_safe(_('your email address')),
-            error_messages={'required':_('email address is required'),
-                            'invalid':_('please enter a valid email address'),
-                            'taken':_('this email is already used by someone else, please choose another'),
-                            },
-            **kw
-            )
-
-    def clean(self,email):
-        """ validate if email exist in database
-        from legacy register
-        return: raise error if it exist """
-        email = super(UserEmailField,self).clean(email.strip())
-        if self.skip_clean:
-            return email
-        if settings.EMAIL_UNIQUE == True:
-            try:
-                user = User.objects.get(email = email)
-                raise forms.ValidationError(self.error_messsages['taken'])
-            except User.DoesNotExist:
-                return email
-            except User.MultipleObjectsReturned:
-                raise forms.ValidationError(self.error_messages['taken'])
-        else:
-            return email 
-
-def clean_nonempty_field_method(self,field):
-    value = None
-    if field in self.cleaned_data:
-        value = str(self.cleaned_data[field]).strip()
-        if value == '':
-            value = None
-    self.cleaned_data[field] = value
-    return value 
-
 class OpenidSigninForm(forms.Form):
     """ signin form """
     openid_url = forms.CharField(max_length=255, widget=forms.widgets.TextInput(attrs={'class': 'openid-login-input', 'size':80}))
@@ -171,7 +76,8 @@ class ClassicLoginForm(forms.Form):
     next = NextUrlField()
     username = UserNameField(required=False,skip_clean=True)
     password = forms.CharField(max_length=128, 
-            widget=forms.widgets.PasswordInput(attrs=attrs_dict), required=False)
+            widget=forms.widgets.PasswordInput(attrs={'class':'required login'}), 
+            required=False)
 
     def __init__(self, data=None, files=None, auto_id='id_%s',
             prefix=None, initial=None): 
@@ -179,13 +85,21 @@ class ClassicLoginForm(forms.Form):
                 prefix, initial)
         self.user_cache = None
 
-    clean_nonempty_field = clean_nonempty_field_method
+    def _clean_nonempty_field(self,field):
+        value = None
+        if field in self.cleaned_data:
+            value = str(self.cleaned_data[field]).strip()
+            if value == '':
+                value = None
+        self.cleaned_data[field] = value
+        return value 
+
 
     def clean_username(self):
-        return self.clean_nonempty_field('username')
+        return self._clean_nonempty_field('username')
 
     def clean_password(self):
-        return self.clean_nonempty_field('password')
+        return self._clean_nonempty_field('password')
 
     def clean(self):
         """ 
@@ -208,7 +122,7 @@ class ClassicLoginForm(forms.Form):
             if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
                 pw_ok = False
                 try:
-                    pw_ok = external_login.check_password(username,password)
+                    pw_ok = EXTERNAL_LOGIN_APP.api.check_password(username,password)
                 except forms.ValidationError, e:
                     error_list.extend(e.messages)
                 if pw_ok:
@@ -274,7 +188,7 @@ class OpenidVerifyForm(forms.Form):
     next = NextUrlField()
     username = UserNameField(must_exist=True)
     password = forms.CharField(max_length=128, 
-            widget=forms.widgets.PasswordInput(attrs=attrs_dict))
+            widget=forms.widgets.PasswordInput(attrs={'class':'required login'}))
     
     def __init__(self, data=None, files=None, auto_id='id_%s',
             prefix=None, initial=None): 
@@ -302,53 +216,19 @@ class OpenidVerifyForm(forms.Form):
         """ get authenticated user """
         return self.user_cache
 
-
-attrs_dict = { 'class': 'required' }
-username_re = re.compile(r'^[\w ]+$')
-
-class ClassicRegisterForm(forms.Form):
+class ClassicRegisterForm(SetPasswordForm):
     """ legacy registration form """
 
     next = NextUrlField()
     username = UserNameField()
     email = UserEmailField()
-    password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
-            label=_('choose password'),
-            error_messages={'required':_('password is required')},
-            )
-    password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
-            label=mark_safe(_('retype password')),
-            error_messages={'required':_('please, retype your password'),
-                            'nomatch':_('sorry, entered passwords did not match, please try again')},
-            required=False
-            )
-    
-    def clean_password2(self):
-        """
-        Validates that the two password inputs match.
-        
-        """
-        self.cleaned_data['password2'] = self.cleaned_data.get('password2','')
-        if self.cleaned_data['password2'] == '':
-            del self.cleaned_data['password2']
-            raise forms.ValidationError(self.fields['password2'].error_messages['required'])
-        if 'password1' in self.cleaned_data \
-                and self.cleaned_data['password1'] == \
-                self.cleaned_data['password2']:
-            return self.cleaned_data['password2']
-        else:
-            del self.cleaned_data['password2']
-            del self.cleaned_data['password1']
-            raise forms.ValidationError(self.fields['password2'].error_messages['nomatch'])
-
-class ChangePasswordForm(forms.Form):
+    #fields password1 and password2 are inherited
+    recaptcha = ReCaptchaField()
+
+class ChangePasswordForm(SetPasswordForm):
     """ change password form """
-    oldpw = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
+    oldpw = forms.CharField(widget=forms.PasswordInput(attrs={'class':'required'}),
                 label=mark_safe(_('Current password')))
-    password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
-                label=mark_safe(_('New password')))
-    password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict),
-                label=mark_safe(_('Retype new password')))
 
     def __init__(self, data=None, user=None, *args, **kwargs):
         if user is None:
@@ -362,17 +242,6 @@ class ChangePasswordForm(forms.Form):
             raise forms.ValidationError(_("Old password is incorrect. \
                     Please enter the correct password."))
         return self.cleaned_data['oldpw']
-    
-    def clean_password2(self):
-        """
-        Validates that the two password inputs match.
-        """
-        if 'password1' in self.cleaned_data and \
-                'password2' in self.cleaned_data and \
-           self.cleaned_data['password1'] == self.cleaned_data['password2']:
-            return self.cleaned_data['password2']
-        raise forms.ValidationError(_("new passwords do not match"))
-        
         
 class ChangeEmailForm(forms.Form):
     """ change email form """
@@ -416,8 +285,8 @@ class ChangeopenidForm(forms.Form):
 
 class DeleteForm(forms.Form):
     """ confirm form to delete an account """
-    confirm = forms.CharField(widget=forms.CheckboxInput(attrs=attrs_dict))
-    password = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict))
+    confirm = forms.CharField(widget=forms.CheckboxInput(attrs={'class':'required'}))
+    password = forms.CharField(widget=forms.PasswordInput(attrs={'class':'required'}))
 
     def __init__(self, data=None, files=None, auto_id='id_%s',
             prefix=None, initial=None, user=None):
diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py
index 112cbbe1..e1986d19 100755
--- a/django_authopenid/urls.py
+++ b/django_authopenid/urls.py
@@ -1,7 +1,21 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls.defaults import patterns, url
 from django.utils.translation import ugettext as _
+from django.conf import settings
 
+#print 'stuff to import %s' % settings.EXTERNAL_LOGIN_APP.__name__ + '.views'
+#try:
+#    settings.EXTERNAL_LOGIN_APP = __import__('mediawiki.views')
+#print 'stuff to import %s' % settings.EXTERNAL_LOGIN_APP.__name__ + '.views'
+#try:
+#    print 'imported fine'
+#    print settings.EXTERNAL_LOGIN_APP.__dict__.keys()
+#except:
+#    print 'dammit!'
+#from mediawiki.views import signup_view
+#settings.EXTERNAL_LOGIN_APP.views.signup_view()
+
+#print settings.EXTERNAL_LOGIN_APP.__dict__.keys()
 urlpatterns = patterns('django_authopenid.views',
     # yadis rdf
     url(r'^yadis.xrdf$', 'xrdf', name='yadis_xrdf'),
@@ -12,7 +26,6 @@ urlpatterns = patterns('django_authopenid.views',
     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
@@ -29,3 +42,21 @@ urlpatterns = patterns('django_authopenid.views',
     url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'),
     url(r'^%s$' % _('delete/'), 'delete', name='user_delete'),
 )
+
+#todo move these out of this file completely 
+if settings.USE_EXTERNAL_LEGACY_LOGIN:
+    from forum.forms import NotARobotForm
+    EXTERNAL_LOGIN_APP = settings.LOAD_EXTERNAL_LOGIN_APP()
+    urlpatterns += patterns('',
+        url('^%s$' % _('external-login/forgot-password/'),\
+            'django_authopenid.views.external_legacy_login_info', \
+            name='user_external_legacy_login_issues'),
+        url('^%s$' % _('external-login/signup/'), \
+            EXTERNAL_LOGIN_APP.views.signup,\
+            name='user_external_legacy_login_signup'),
+#        url('^%s$' % _('external-login/signup/'), \
+#            EXTERNAL_LOGIN_APP.forms.RegisterFormWizard( \
+#                [EXTERNAL_LOGIN_APP.forms.RegisterForm, \
+#                NotARobotForm]),\
+#            name='user_external_legacy_login_signup'),
+    )
diff --git a/django_authopenid/util.py b/django_authopenid/util.py
index edb6808e..165756e0 100644
--- a/django_authopenid/util.py
+++ b/django_authopenid/util.py
@@ -6,7 +6,6 @@ import openid.store
 
 from django.db.models.query import Q
 from django.conf import settings
-from django.http import str_to_unicode
 from django.core.urlresolvers import reverse
 
 # needed for some linux distributions like debian
@@ -16,25 +15,12 @@ except:
     from yadis import xri
 
 import time, base64, hashlib, operator
-import urllib
+from utils.forms import clean_next, get_next_url
 
 from models import Association, Nonce
 
 __all__ = ['OpenID', 'DjangoOpenIDStore', 'from_openid_response', 'clean_next']
 
-DEFAULT_NEXT = '/' + getattr(settings, 'FORUM_SCRIPT_ALIAS')
-def clean_next(next):
-    if next is None:
-        return DEFAULT_NEXT
-    next = str_to_unicode(urllib.unquote(next), 'utf-8')
-    next = next.strip()
-    if next.startswith('/'):
-        return next
-    return DEFAULT_NEXT
-
-def get_next_url(request):
-    return clean_next(request.REQUEST.get('next'))
-
 class OpenID:
     def __init__(self, openid_, issued, attrs=None, sreg_=None):
         self.openid = openid_
diff --git a/django_authopenid/views.py b/django_authopenid/views.py
index d087d215..b09dea7c 100755
--- a/django_authopenid/views.py
+++ b/django_authopenid/views.py
@@ -32,7 +32,7 @@
 
 from django.http import HttpResponseRedirect, get_host, Http404, \
                          HttpResponseServerError
-from django.shortcuts import render_to_response as render
+from django.shortcuts import render_to_response
 from django.template import RequestContext, loader, Context
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -61,23 +61,23 @@ import re
 import urllib
 
 
-from forum.forms import EditUserEmailFeedsForm
-from django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response, get_next_url 
+from forum.forms import SimpleEmailSubscribeForm 
+from django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response
 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
+from utils.forms import get_next_url
+
+EXTERNAL_LOGIN_APP = settings.LOAD_EXTERNAL_LOGIN_APP()
 
 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)
+        EXTERNAL_LOGIN_APP.api.login(request,user)
 
     #1) get old session key
     session_key = request.session.session_key
@@ -90,7 +90,7 @@ 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)
+        EXTERNAL_LOGIN_APP.api.logout(request)
 
 def get_url_host(request):
     if request.is_secure():
@@ -158,7 +158,7 @@ def default_on_success(request, identity_url, openid_response):
 
 def default_on_failure(request, message):
     """ default failure action on signin """
-    return render('openid_failure.html', {
+    return render_to_response('openid_failure.html', {
         'message': message
     })
 
@@ -184,7 +184,7 @@ def signin(request,newquestion=False,newanswer=False):
     """
     request.encoding = 'UTF-8'
     on_failure = signin_failure
-    email_feeds_form = EditUserEmailFeedsForm()
+    email_feeds_form = SimpleEmailSubscribeForm()
     next = get_next_url(request)
     form_signin = OpenidSigninForm(initial={'next':next})
     form_auth = ClassicLoginForm(initial={'next':next})
@@ -206,35 +206,31 @@ def signin(request,newquestion=False,newanswer=False):
                         request.session['external_username'] = username
                         request.session['external_password'] = password
 
-                        #2) see if username clashes with some existing user
+                        #2) try to extract user email and nickname from external service
+                        email = EXTERNAL_LOGIN_APP.api.get_email(username,password)
+                        screen_name = EXTERNAL_LOGIN_APP.api.get_screen_name(username,password)
+
+                        #3) 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}
+                        username_taken = User.is_username_taken(screen_name)
+
+                        email_feeds_form = SimpleEmailSubscribeForm()
+                        form_data = {'username':screen_name,'email':email,'next':next}
                         form = OpenidRegisterForm(initial=form_data)
-                        template_data = {'form1':form,'username':username,\
+                        template_data = {'form1':form,'username':screen_name,\
                                         '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,\
+                        return render_to_response('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)
+                        EXTERNAL_LOGIN_APP.api.set_login_cookies(response,user)
                         return response
                 else:
                     #regular password authentication
@@ -246,7 +242,7 @@ def signin(request,newquestion=False,newanswer=False):
             #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)
+                email_feeds_form = SimpleEmailSubscribeForm(request.POST)
                 form1_is_valid = form.is_valid()
                 form2_is_valid = email_feeds_form.is_valid()
                 if form1_is_valid and form2_is_valid:
@@ -254,10 +250,10 @@ def signin(request,newquestion=False,newanswer=False):
                     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_LOGIN_APP.api.connect_local_user_to_external_user(user,username,password)
                         external_username = request.session['external_username']
                         eld = ExternalLoginData.objects.get(external_username=external_username)
                         eld.user = user
@@ -266,7 +262,9 @@ def signin(request,newquestion=False,newanswer=False):
                         email_feeds_form.save(user)
                         del request.session['external_username']
                         del request.session['external_password']
-                        return HttpResponseRedirect(reverse('index'))
+                        response = HttpResponseRedirect(reverse('index'))
+                        EXTERNAL_LOGIN_APP.api.set_login_cookies(response, user)
+                        return response
                     else:
                         if password:
                             del request.session['external_username']
@@ -281,7 +279,7 @@ def signin(request,newquestion=False,newanswer=False):
                         '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,
+                    return render_to_response('authopenid/complete.html',data,
                             context_instance=RequestContext(request))
             else:
                 raise Http404
@@ -319,7 +317,7 @@ def signin(request,newquestion=False,newanswer=False):
         if len(alist) > 0:
             answer = alist[0]
 
-    return render('authopenid/signin.html', {
+    return render_to_response('authopenid/signin.html', {
         'question':question,
         'answer':answer,
         'form1': form_auth,
@@ -400,14 +398,14 @@ def register(request):
         'next': next,
         'username': nickname,
     })
-    email_feeds_form = EditUserEmailFeedsForm()
+    email_feeds_form = SimpleEmailSubscribeForm()
 
     user_ = None
     is_redirect = False
     if request.POST:
         if 'bnewaccount' in request.POST.keys():
             form1 = OpenidRegisterForm(request.POST)
-            email_feeds_form = EditUserEmailFeedsForm(request.POST)
+            email_feeds_form = SimpleEmailSubscribeForm(request.POST)
             if form1.is_valid() and email_feeds_form.is_valid():
                 next = form1.cleaned_data['next']
                 is_redirect = True
@@ -469,7 +467,7 @@ def register(request):
     else:
         provider_logo = providers[provider_name]
 
-    return render('authopenid/complete.html', {
+    return render_to_response('authopenid/complete.html', {
         'form1': form1,
         'form2': form2,
         'email_feeds_form': email_feeds_form,
@@ -490,7 +488,7 @@ def signin_failure(request, message):
     form_signin = OpenidSigninForm(initial={'next': next})
     form_auth = ClassicLoginForm(initial={'next': next})
 
-    return render('authopenid/signin.html', {
+    return render_to_response('authopenid/signin.html', {
         'msg': message,
         'form1': form_auth,
         'form2': form_signin,
@@ -506,11 +504,11 @@ def signup(request):
     templates: authopenid/signup.html, authopenid/confirm_email.txt
     """
     if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-        return HttpResponseRedirect(reverse('user_external_legacy_login_issues'))
+        return HttpResponseRedirect(reverse('user_external_legacy_login_signup'))
     next = get_next_url(request)
     if request.POST:
         form = ClassicRegisterForm(request.POST)
-        email_feeds_form = EditUserEmailFeedsForm(request.POST)
+        email_feeds_form = SimpleEmailSubscribeForm(request.POST)
 
         #validation outside if to remember form values
         form1_is_valid = form.is_valid()
@@ -523,7 +521,7 @@ def signup(request):
 
             user_ = User.objects.create_user( username,email,password )
             if settings.USE_EXTERNAL_LEGACY_LOGIN == True:
-                external_login.create_user(username,email,password)
+                EXTERNAL_LOGIN_APP.api.create_user(username,email,password)
            
             user_.backend = "django.contrib.auth.backends.ModelBackend"
             login(request, user_)
@@ -545,8 +543,8 @@ def signup(request):
             return HttpResponseRedirect(next)
     else:
         form = ClassicRegisterForm(initial={'next':next})
-        email_feeds_form = EditUserEmailFeedsForm()
-    return render('authopenid/signup.html', {
+        email_feeds_form = SimpleEmailSubscribeForm()
+    return render_to_response('authopenid/signup.html', {
         'form': form, 
         'email_feeds_form': email_feeds_form 
         }, context_instance=RequestContext(request))
@@ -571,7 +569,7 @@ def xrdf(request):
     return_to = [
         "%s%s" % (url_host, reverse('user_complete_signin'))
     ]
-    return render('authopenid/yadis.xrdf', { 
+    return render_to_response('authopenid/yadis.xrdf', { 
         'return_to': return_to 
         }, context_instance=RequestContext(request))
 
@@ -599,7 +597,7 @@ def account_settings(request):
         is_openid = False
 
 
-    return render('authopenid/settings.html', {
+    return render_to_response('authopenid/settings.html', {
         'msg': msg,
         'is_openid': is_openid
         }, context_instance=RequestContext(request))
@@ -633,7 +631,7 @@ def changepw(request):
     else:
         form = ChangePasswordForm(user=user_)
 
-    return render('authopenid/changepw.html', {'form': form },
+    return render_to_response('authopenid/changepw.html', {'form': form },
                                 context_instance=RequestContext(request))
 
 def find_email_validation_messages(user):
@@ -697,7 +695,7 @@ def send_email_key(request):
 
     if settings.EMAIL_VALIDATION != 'off':
         if request.user.email_isvalid:
-            return render('authopenid/changeemail.html',
+            return render_to_response('authopenid/changeemail.html',
                             { 'email': request.user.email, 
                               'action_type': 'key_not_sent', 
                               'change_link': reverse('user_changeemail')},
@@ -712,7 +710,7 @@ def send_email_key(request):
 
 #internal server view used as return value by other views
 def validation_email_sent(request):
-    return render('authopenid/changeemail.html',
+    return render_to_response('authopenid/changeemail.html',
                     { 'email': request.user.email, 
                     'change_email_url': reverse('user_changeemail'),
                     'action_type': 'validate', }, 
@@ -730,7 +728,7 @@ def verifyemail(request,id=None,key=None):
                 user.email_isvalid = True
                 clear_email_validation_message(user)
                 user.save()
-                return render('authopenid/changeemail.html', {
+                return render_to_response('authopenid/changeemail.html', {
                     'action_type': 'validation_complete',
                     }, context_instance=RequestContext(request))
     raise Http404
@@ -773,7 +771,7 @@ def changeemail(request, action='change'):
         form = ChangeEmailForm(initial={'email': user_.email},
                 user=user_)
     
-    output = render('authopenid/changeemail.html', {
+    output = render_to_response('authopenid/changeemail.html', {
         'form': form,
         'email': user_.email,
         'action_type': action,
@@ -857,7 +855,7 @@ def changeopenid(request):
                     changeopenid_failure, redirect_to)    
 
     form = ChangeopenidForm(initial={'openid_url': openid_url }, user=user_)
-    return render('authopenid/changeopenid.html', {
+    return render_to_response('authopenid/changeopenid.html', {
         'form': form,
         'has_openid': has_openid, 
         'msg': msg 
@@ -934,7 +932,7 @@ def delete(request):
     form = DeleteForm(user=user_)
 
     msg = request.GET.get('msg','')
-    return render('authopenid/delete.html', {
+    return render_to_response('authopenid/delete.html', {
         'form': form, 
         'msg': msg, 
         }, context_instance=RequestContext(request))
@@ -969,7 +967,10 @@ def deleteopenid_failure(request, message):
     return HttpResponseRedirect(redirect_to)
 
 def external_legacy_login_info(request):
-    return render('authopenid/external_legacy_login_info.html', context_instance=RequestContext(request))
+    feedback_url = reverse('feedback')
+    return render_to_response('authopenid/external_legacy_login_info.html', 
+                    {'feedback_url':feedback_url}, 
+                    context_instance=RequestContext(request))
 
 def sendpw(request):
     """
@@ -1019,7 +1020,7 @@ def sendpw(request):
     else:
         form = EmailPasswordForm()
         
-    return render('authopenid/sendpw.html', {
+    return render_to_response('authopenid/sendpw.html', {
         'form': form,
         'msg': msg 
         }, context_instance=RequestContext(request))