Give admin rights to the EE group.

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

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 57511d02681438f267b944d9ca2032ecdb21bda2..5d3e8a31ae20ed286b50b45c6d4a71f2bd27cee8 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -105,9 +105,9 @@ class FarmConfig(DefaultConfig):
 
     acl_hierarchic = True
 
-    # Give users all rights, but don't give any rights to anonymous users
+    # Give all rights to the EE group, but no rights to anonymous users.
     acl_rights_default = u""
-    acl_rights_before = u"Known:read,write,delete,revert,admin"
+    acl_rights_before = u"EE:read,write,delete,revert,admin"
 
     # Mail --------------------------------------------------------------
 
@@ -165,18 +165,19 @@ 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 = 'lex_',
+        phpbb_prefix = phpbb_prefix,
         hint    = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
     )
     auth = [phpbb]
+    groups = phpbb.groups_backend
 
     user_autocreate = True