config: Put phpbb_prefix in dbsettings.py.

[matthijs/projects/wipi.git] / conf / farmconfig.py

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 2dd9e2b4b22d029f591827ff6ba7816d7063e3ba..e6fb492f52c3cfd80f28641c145bc5f837556c90 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -165,14 +165,15 @@ class FarmConfig(DefaultConfig):
     require_comment = True
 
     # Authentication
-    from auth.phpbb_login import phpbb_login # This comes from plugin
-    from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname
-    phpbb = phpbb_login(
+    from auth.phpbb import PhpbbAuth # This comes from plugin
+    from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname, phpbb_prefix
+    phpbb = PhpbbAuth(
         name    = 'phpbb',
         dbhost  = phpbb_dbhost,
         dbuser  = phpbb_dbuser,
         dbpass  = phpbb_dbpass,
         dbname  = phpbb_dbname,
+        phpbb_prefix = phpbb_prefix,
         hint    = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
     )
     auth = [phpbb]