X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Froot.py;h=c5fc5ae2c9813d4c7543ccadaef3059c21b8861e;hp=19a47a4a60323616e96b85cf75b72cca0c35da8f;hb=f47a95ba1df58ccf9784c47beeaa0702c469b3e1;hpb=3574998f5f7c41e946610730638fd7e3fecb5835

diff --git a/ipsilon/root.py b/ipsilon/root.py
index 19a47a4..c5fc5ae 100755
--- a/ipsilon/root.py
+++ b/ipsilon/root.py
@@ -22,6 +22,9 @@ from ipsilon.util import errors
 from ipsilon.login.common import Login
 from ipsilon.login.common import Logout
 from ipsilon.admin.common import Admin
+from ipsilon.providers.common import LoadProviders
+from ipsilon.admin.login import LoginPlugins
+from ipsilon.admin.providers import ProviderPlugins
 import cherrypy
 
 sites = dict()
@@ -30,7 +33,7 @@ sites = dict()
 class Root(Page):
 
     def __init__(self, site, template_env):
-        if not site in sites:
+        if site not in sites:
             sites[site] = dict()
         if template_env:
             sites[site]['template_env'] = template_env
@@ -45,8 +48,13 @@ class Root(Page):
         self.login = Login(self._site)
         self.logout = Logout(self._site)
 
+        # set up idp providers now
+        LoadProviders(self, self._site)
+
         # after all plugins are setup we can instantiate the admin pages
-        self.admin = Admin(self._site)
+        self.admin = Admin(self._site, 'admin')
+        LoginPlugins(self._site, self.admin)
+        ProviderPlugins(self._site, self.admin)
 
     def root(self):
         return self._template('index.html', title='Ipsilon')