From 7e4b48ec1592b3ae0b8c3bc741e2493e874245c4 Mon Sep 17 00:00:00 2001 From: Roland Mas Date: Fri, 12 Feb 2010 12:11:46 +0000 Subject: [PATCH] Use the sysop group to grant Mediawiki rights to project admins --- gforge/plugins/mediawiki/cronjobs/create-wikis.sh | 3 --- gforge/plugins/mediawiki/www/LocalSettings.php | 12 ++++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gforge/plugins/mediawiki/cronjobs/create-wikis.sh b/gforge/plugins/mediawiki/cronjobs/create-wikis.sh index 5d8ee30283..87d2a4fb0a 100755 --- a/gforge/plugins/mediawiki/cronjobs/create-wikis.sh +++ b/gforge/plugins/mediawiki/cronjobs/create-wikis.sh @@ -21,9 +21,6 @@ for project in $projects ; do \$wgEnableUploads = false; // Don't forget to "chown www-data $wdprefix/$project/images" -// Edit permissions for group admins -\$wgGroupPermissions['Administrators']['*'] = true; - // Edit permissions for group members \$wgGroupPermissions['Members']['edit'] = true; \$wgGroupPermissions['Members']['createpage'] = true; diff --git a/gforge/plugins/mediawiki/www/LocalSettings.php b/gforge/plugins/mediawiki/www/LocalSettings.php index 469986fec8..4b81a45951 100644 --- a/gforge/plugins/mediawiki/www/LocalSettings.php +++ b/gforge/plugins/mediawiki/www/LocalSettings.php @@ -119,8 +119,8 @@ function FusionForgeMWAuth( $user, &$result ) { $user->loadGroups() ; $current_groups = $user->getGroups() ; if ($perm && is_object($perm) && $perm->isAdmin()) { - if (!in_array ('Administrators', $current_groups)) { - $user->addGroup ('Administrators') ; + if (!in_array ('sysop', $current_groups)) { + $user->addGroup ('sysop') ; } if (!in_array ('Members', $current_groups)) { $user->addGroup ('Members') ; @@ -129,8 +129,8 @@ function FusionForgeMWAuth( $user, &$result ) { $user->addGroup ('ForgeUsers') ; } } elseif ($perm && is_object($perm) && $perm->isMember()) { - if (in_array ('Administrators', $current_groups)) { - $user->removeGroup ('Administrators') ; + if (in_array ('sysop', $current_groups)) { + $user->removeGroup ('sysop') ; } if (!in_array ('Members', $current_groups)) { $user->addGroup ('Members') ; @@ -139,8 +139,8 @@ function FusionForgeMWAuth( $user, &$result ) { $user->addGroup ('ForgeUsers') ; } } else { - if (in_array ('Administrators', $current_groups)) { - $user->removeGroup ('Administrators') ; + if (in_array ('sysop', $current_groups)) { + $user->removeGroup ('sysop') ; } if (in_array ('Members', $current_groups)) { $user->removeGroup ('Members') ; -- 2.30.2