projects
/
matthijs
/
projects
/
wipi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
phpbb: Restructure to make PhpbbAuth and PhpbbGroupsBackend more equal.
[matthijs/projects/wipi.git]
/
conf
/
farmconfig.py
diff --git
a/conf/farmconfig.py
b/conf/farmconfig.py
index e6fb492f52c3cfd80f28641c145bc5f837556c90..c17bb474c977991e01e20f2b9d997f117be411f5 100644
(file)
--- a/
conf/farmconfig.py
+++ b/
conf/farmconfig.py
@@
-105,9
+105,9
@@
class FarmConfig(DefaultConfig):
acl_hierarchic = True
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_default = u""
- acl_rights_before = u"
Known
:read,write,delete,revert,admin"
+ acl_rights_before = u"
EE
:read,write,delete,revert,admin"
# Mail --------------------------------------------------------------
# Mail --------------------------------------------------------------
@@
-165,18
+165,19
@@
class FarmConfig(DefaultConfig):
require_comment = True
# Authentication
require_comment = True
# Authentication
- from auth.phpbb import PhpbbAuth # This comes from plugin
- from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname, phpbb_prefix
-
phpbb = PhpbbAuth
(
+ import auth.phpbb
+ import dbsettings
+
(phpbb_auth, phpbb_groups) = auth.phpbb.setup
(
name = 'phpbb',
name = 'phpbb',
- dbhost = phpbb_dbhost,
- dbuser = phpbb_dbuser,
- dbpass = phpbb_dbpass,
- dbname = phpbb_dbname,
- phpbb_prefix = phpbb_prefix,
+ dbhost =
dbsettings.
phpbb_dbhost,
+ dbuser =
dbsettings.
phpbb_dbuser,
+ dbpass =
dbsettings.
phpbb_dbpass,
+ dbname =
dbsettings.
phpbb_dbname,
+ phpbb_prefix =
dbsettings.
phpbb_prefix,
hint = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
)
hint = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
)
- auth = [phpbb]
+ auth = [phpbb_auth]
+ groups = phpbb_groups
user_autocreate = True
user_autocreate = True