[Fusionforge-commits] r8692 - in trunk/gforge/plugins/mediawiki: cronjobs www

[Roland Mas]

Author: lolando
Date: 2010-01-27 17:43:56 +0100 (Wed, 27 Jan 2010)
New Revision: 8692

Modified:
   trunk/gforge/plugins/mediawiki/cronjobs/create-wikis.sh
   trunk/gforge/plugins/mediawiki/www/LocalSettings.php
Log:
Fixed permissions system in Mediawiki to allow differenciating logged-in and non-logged-in users

Modified: trunk/gforge/plugins/mediawiki/cronjobs/create-wikis.sh
===================================================================
--- trunk/gforge/plugins/mediawiki/cronjobs/create-wikis.sh	2010-01-26 19:39:37 UTC (rev 8691)
+++ trunk/gforge/plugins/mediawiki/cronjobs/create-wikis.sh	2010-01-27 16:43:56 UTC (rev 8692)
@@ -27,9 +27,9 @@
 \$wgGroupPermissions['Members']['createtalk']    = true;
 
 // Edit permissions for non-members
-\$wgGroupPermissions['Users']['edit']          = false;
-\$wgGroupPermissions['Users']['createpage']    = false;
-\$wgGroupPermissions['Users']['createtalk']    = false;
+\$wgGroupPermissions['ForgeUsers']['edit']          = false;
+\$wgGroupPermissions['ForgeUsers']['createpage']    = false;
+\$wgGroupPermissions['ForgeUsers']['createtalk']    = false;
 
 // Edit permissions for anonymous users
 \$wgGroupPermissions['*']['edit']          = false;

Modified: trunk/gforge/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-01-26 19:39:37 UTC (rev 8691)
+++ trunk/gforge/plugins/mediawiki/www/LocalSettings.php	2010-01-27 16:43:56 UTC (rev 8692)
@@ -125,8 +125,8 @@
                         if (!in_array ('Members', $current_groups)) {
                                 $user->addGroup ('Members') ;
                         }
-                        if (!in_array ('Users', $current_groups)) {
-                                $user->addGroup ('Users') ;
+                        if (!in_array ('ForgeUsers', $current_groups)) {
+                                $user->addGroup ('ForgeUsers') ;
                         }
                 } elseif ($perm && is_object($perm) && $perm->isMember()) {
                         if (in_array ('Administrators', $current_groups)) {
@@ -135,8 +135,8 @@
                         if (!in_array ('Members', $current_groups)) {
                                 $user->addGroup ('Members') ;
                         }
-                        if (!in_array ('Users', $current_groups)) {
-                                $user->addGroup ('Users') ;
+                        if (!in_array ('ForgeUsers', $current_groups)) {
+                                $user->addGroup ('ForgeUsers') ;
                         }
                 } else {
                         if (in_array ('Administrators', $current_groups)) {
@@ -145,8 +145,8 @@
                         if (in_array ('Members', $current_groups)) {
                                 $user->removeGroup ('Members') ;
                         }
-                        if (!in_array ('Users', $current_groups)) {
-                                $user->addGroup ('Users') ;
+                        if (!in_array ('ForgeUsers', $current_groups)) {
+                                $user->addGroup ('ForgeUsers') ;
                         }
                 }
 
@@ -183,11 +183,16 @@
 $wgGroupPermissions['Members']['createpage']    = true;
 $wgGroupPermissions['Members']['createtalk']    = true;
 
-$wgGroupPermissions['Users']['createaccount'] = false;
-$wgGroupPermissions['Users']['edit']          = false;
-$wgGroupPermissions['Users']['createpage']    = false;
-$wgGroupPermissions['Users']['createtalk']    = false;
+$wgGroupPermissions['ForgeUsers']['createaccount'] = false;
+$wgGroupPermissions['ForgeUsers']['edit']          = false;
+$wgGroupPermissions['ForgeUsers']['createpage']    = false;
+$wgGroupPermissions['ForgeUsers']['createtalk']    = false;
 
+$wgGroupPermissions['user']['createaccount'] = false;
+$wgGroupPermissions['user']['edit']          = false;
+$wgGroupPermissions['user']['createpage']    = false;
+$wgGroupPermissions['user']['createtalk']    = false;
+
 $wgGroupPermissions['*']['createaccount'] = false;
 $wgGroupPermissions['*']['edit']          = false;
 $wgGroupPermissions['*']['createpage']    = false;