1 files changed, 11 insertions, 21 deletions

diff --git a/quoins/controllers.py b/quoins/controllers.py
index 6aac7a2..541d90b 100644
--- a/quoins/controllers.py
+++ b/quoins/controllers.py
@@ -41,31 +41,18 @@ import openid.consumer.consumer
 import openid.server.server
 import openid.extensions.sreg
 from openid.store.sqlstore import MySQLStore
-import MySQLdb
-import sqlalchemy.engine.url
 import types
 
 import xmlrpclib, sys, re
 from linkback import LinkBackHandler, PingBackURI, TrackBackURI
 import base64
 import urllib
+import openid_controllers
+from utils import get_oid_connection
 
 def b64encode(x):
     return base64.encodestring(x)[:-1]
 
-def get_oid_connection(config=None):
-    if config is None:
-        config = tg.config
-    backupuri = config.get('sqlalchemy.url')
-    uri = config.get('openid.store', backupuri)
-    u = sqlalchemy.engine.url.make_url(uri)
-    pw = u.password or ''
-    conn = MySQLdb.connect (host = u.host,
-                            user = u.username,
-                            passwd = pw,
-                            db = u.database)
-    return conn
-
 def fix_url(url):
     parts = urlsplit(url)
     if not parts[0]:
@@ -335,6 +322,15 @@ class BlogController(TGController):
     feed = Feed()
     pingback = Pingback()
 
+    def __init__(self, *args, **kw):
+        self.path = kw.pop('path', '/')
+        self.post_paginate = kw.pop('paginate', 5)
+        get_name_from_id = kw.pop('get_name_from_id', lambda x: x)
+        self.openid = openid_controllers.OpenIDController(path=self.path+'/openid/',
+                                                          get_name_from_id = get_name_from_id)
+        self.feed.blog_controller = self
+        super(BlogController, self).__init__(*args, **kw)
+
     def url(self, obj=None):
         if obj is None:
             u = tg.url(self.path)
@@ -428,12 +424,6 @@ Comment:
         t = Thread(target=send_email, args=(msg, fromaddr, toaddr))
         t.start()
 
-    def __init__(self, *args, **kw):
-        self.path = kw.pop('path', '/')
-        self.post_paginate = kw.pop('paginate', 5)
-        self.feed.blog_controller = self
-        super(BlogController, self).__init__(*args, **kw)
-
     @expose(template="genshi:quoinstemplates.index")
     def index(self, start=0):
         pylons.response.headers['X-XRDS-Location']=self.absolute_url('/yadis')