1 files changed, 20 insertions, 12 deletions

diff --git a/quoins/openid_controllers.py b/quoins/openid_controllers.py
index 9491195..efb65c5 100644
--- a/quoins/openid_controllers.py
+++ b/quoins/openid_controllers.py
@@ -29,6 +29,7 @@ import types
 import os.path
 
 from utils import get_oid_connection
+from model import *
 
 class DecideController(object):
     def __init__(self, oid_controller):
@@ -49,11 +50,17 @@ class DecideController(object):
         session['oid_request']=oid_request
         session.save()
 
-        return dict(openid = self.oid_controller,
-                    oid_request = oid_request,
-                    required = sr_required,
-                    optional = sr_optional,
-                    )
+        d = dict(openid = self.oid_controller,
+                 oid_request = oid_request,
+                 required = sr_required,
+                 optional = sr_optional,
+                 )
+
+        if self.oid_controller.quoins:
+            blog = DBSession.query(Blog).get(1)
+            d['blog'] = blog
+            d['quoins'] = self.oid_controller.quoins
+        return d
 
 class ResponseController(object):
     def __init__(self, oid_controller):
@@ -81,6 +88,12 @@ class OpenIDController(TGController):
         'timezone': 'Time zone',
         }
 
+    def __init__(self, *args, **kw):
+        self.get_name_from_id = kw.pop('get_name_from_id', lambda x: x)
+        self.path = kw.pop('path', '/')
+        self.quoins = kw.pop('quoins', None)
+        super(OpenIDController, self).__init__(*args, **kw)
+
     def url(self, obj=None):
         if obj is None:
             u = tg.url(self.path)
@@ -94,13 +107,8 @@ class OpenIDController(TGController):
         if port:
             port = ':'+port
         return 'http://%s%s%s'%(tg.config.get('server.webhost'), port,
-                              self.url(obj))
+                                self.url(obj))
         
-    def __init__(self, *args, **kw):
-        self.get_name_from_id = kw.pop('get_name_from_id', lambda x: x)
-        self.path = kw.pop('path', '/')
-        super(OpenIDController, self).__init__(*args, **kw)
-
     def getSRegValue(self, user, field):
         val = None
         if field=='nickname': val = user.user_name
@@ -132,7 +140,7 @@ class OpenIDController(TGController):
 
         store = MySQLStore(get_oid_connection())
         oserver = openid.server.server.Server(store,
-                         self.absolute_url('/openid/server'))
+                         self.absolute_url('/server'))
 
         data = {}
         for field in sreg_req.required+sreg_req.optional: