[Evolvis-commits] r205: sync with upstream, sync whitespace, sync permissions, release↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Nov 5 16:42:00 CET 2009


Author: mirabilos
Date: 2009-11-05 15:41:59 +0000 (Thu, 05 Nov 2009)
New Revision: 205

Modified:
   trunk/gforge_base/gforge-4.8.1+evolvis/debian/changelog
   trunk/gforge_base/gforge-4.8.1+evolvis/plugins/mediawiki/cronjobs/create-wikis.sh
   trunk/gforge_base/gforge-4.8.1+evolvis/plugins/mediawiki/www/LocalSettings.php
Log:
sync with upstream, sync whitespace, sync permissions, release


Modified: trunk/gforge_base/gforge-4.8.1+evolvis/debian/changelog
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/debian/changelog	2009-11-05 15:12:42 UTC (rev 204)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/debian/changelog	2009-11-05 15:41:59 UTC (rev 205)
@@ -1,11 +1,11 @@
-gforge (4.8.1+evolvis-7) xunstable; urgency=low
+gforge (4.8.1+evolvis-7) unstable; urgency=low
 
   * re-enable project list
   * mediawiki plugin: allow permissions to be set globally via local.inc,
     comment out per-group overrides by default; fix permissions/groups
   * integrate the evolvis theme automatically, obsolete old 4.5 ones
 
- -- Thorsten Glaser <tg at mirbsd.de>  Thu, 05 Nov 2009 16:11:24 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 05 Nov 2009 16:41:30 +0100
 
 gforge (4.8.1+evolvis-5) unstable; urgency=low
 

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/plugins/mediawiki/cronjobs/create-wikis.sh
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/plugins/mediawiki/cronjobs/create-wikis.sh	2009-11-05 15:12:42 UTC (rev 204)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/plugins/mediawiki/cronjobs/create-wikis.sh	2009-11-05 15:41:59 UTC (rev 205)
@@ -25,19 +25,22 @@
 // changed in /etc/gforge/local.d/70plugin_mediawiki instead.
 
 // Edit permissions for group members
-//\$wgGroupPermissions['Members']['edit']          = true;
-//\$wgGroupPermissions['Members']['createpage']    = true;
-//\$wgGroupPermissions['Members']['createtalk']    = true;
+//\$wgGroupPermissions['Members']['edit']           = true;
+//\$wgGroupPermissions['Members']['createpage']     = true;
+//\$wgGroupPermissions['Members']['createtalk']     = true;
+//\$wgGroupPermissions['Members']['read']           = true;
 
 // Edit permissions for non-members
-//\$wgGroupPermissions['Siteusers']['edit']        = false;
-//\$wgGroupPermissions['Siteusers']['createpage']  = false;
-//\$wgGroupPermissions['Siteusers']['createtalk']  = false;
+//\$wgGroupPermissions['ForgeUsers']['edit']        = false;
+//\$wgGroupPermissions['ForgeUsers']['createpage']  = false;
+//\$wgGroupPermissions['ForgeUsers']['createtalk']  = false;
+//\$wgGroupPermissions['ForgeUsers']['read']        = true;
 
 // Edit permissions for anonymous users
-//\$wgGroupPermissions['*']['edit']          = false;
-//\$wgGroupPermissions['*']['createpage']    = false;
-//\$wgGroupPermissions['*']['createtalk']    = false;
+//\$wgGroupPermissions['*']['edit']                 = false;
+//\$wgGroupPermissions['*']['createpage']           = false;
+//\$wgGroupPermissions['*']['createtalk']           = false;
+//\$wgGroupPermissions['*']['read']                 = true;
 
 EOF
 

Modified: trunk/gforge_base/gforge-4.8.1+evolvis/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/plugins/mediawiki/www/LocalSettings.php	2009-11-05 15:12:42 UTC (rev 204)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/plugins/mediawiki/www/LocalSettings.php	2009-11-05 15:41:59 UTC (rev 205)
@@ -131,8 +131,8 @@
                         if (!in_array ('Members', $current_groups)) {
                                 $user->addGroup ('Members') ;
                         }
-                        if (!in_array ('Siteusers', $current_groups)) {
-                                $user->addGroup ('Siteusers') ;
+                        if (!in_array ('ForgeUsers', $current_groups)) {
+                                $user->addGroup ('ForgeUsers') ;
                         }
                 } elseif ($perm && is_object($perm) && $perm->isMember()) {
                         if (in_array ('Administrators', $current_groups)) {
@@ -141,8 +141,8 @@
                         if (!in_array ('Members', $current_groups)) {
                                 $user->addGroup ('Members') ;
                         }
-                        if (!in_array ('Siteusers', $current_groups)) {
-                                $user->addGroup ('Siteusers') ;
+                        if (!in_array ('ForgeUsers', $current_groups)) {
+                                $user->addGroup ('ForgeUsers') ;
                         }
                 } else {
                         if (in_array ('Administrators', $current_groups)) {
@@ -151,8 +151,8 @@
                         if (in_array ('Members', $current_groups)) {
                                 $user->removeGroup ('Members') ;
                         }
-                        if (!in_array ('Siteusers', $current_groups)) {
-                                $user->addGroup ('Siteusers') ;
+                        if (!in_array ('ForgeUsers', $current_groups)) {
+                                $user->addGroup ('ForgeUsers') ;
                         }
                 }
 
@@ -172,34 +172,34 @@
 
 $GLOBALS['wgHooks']['UserLoadFromSession'][]='FusionForgeMWAuth';
 
-$wgGroupPermissions['Members']['createaccount'] = true;
-$wgGroupPermissions['Members']['edit']          = ifsetor($sys_plugin_mediawiki_access_member_edit);
-$wgGroupPermissions['Members']['createpage']    = ifsetor($sys_plugin_mediawiki_access_member_createpage);
-$wgGroupPermissions['Members']['createtalk']    = ifsetor($sys_plugin_mediawiki_access_member_createtalk);
-$wgGroupPermissions['Members']['read']          = ifsetor($sys_plugin_mediawiki_access_member_read, true);
+$wgGroupPermissions['Members']['createaccount']    = true;
+$wgGroupPermissions['Members']['edit']             = ifsetor($sys_plugin_mediawiki_access_member_edit);
+$wgGroupPermissions['Members']['createpage']       = ifsetor($sys_plugin_mediawiki_access_member_createpage);
+$wgGroupPermissions['Members']['createtalk']       = ifsetor($sys_plugin_mediawiki_access_member_createtalk);
+$wgGroupPermissions['Members']['read']             = ifsetor($sys_plugin_mediawiki_access_member_read, true);
 
-$wgGroupPermissions['Siteusers']['createaccount'] = false;
-$wgGroupPermissions['Siteusers']['edit']          = ifsetor($sys_plugin_mediawiki_access_user_edit);
-$wgGroupPermissions['Siteusers']['createpage']    = ifsetor($sys_plugin_mediawiki_access_user_createpage);
-$wgGroupPermissions['Siteusers']['createtalk']    = ifsetor($sys_plugin_mediawiki_access_user_createtalk);
-$wgGroupPermissions['Siteusers']['read']          = ifsetor($sys_plugin_mediawiki_access_user_read);
+$wgGroupPermissions['ForgeUsers']['createaccount'] = false;
+$wgGroupPermissions['ForgeUsers']['edit']          = ifsetor($sys_plugin_mediawiki_access_user_edit);
+$wgGroupPermissions['ForgeUsers']['createpage']    = ifsetor($sys_plugin_mediawiki_access_user_createpage);
+$wgGroupPermissions['ForgeUsers']['createtalk']    = ifsetor($sys_plugin_mediawiki_access_user_createtalk);
+$wgGroupPermissions['ForgeUsers']['read']          = ifsetor($sys_plugin_mediawiki_access_user_read);
 
-$wgGroupPermissions['*']['createaccount']       = false;
-$wgGroupPermissions['*']['edit']                = ifsetor($sys_plugin_mediawiki_access_anon_edit);
-$wgGroupPermissions['*']['createpage']          = ifsetor($sys_plugin_mediawiki_access_anon_createpage);
-$wgGroupPermissions['*']['createtalk']          = ifsetor($sys_plugin_mediawiki_access_anon_createtalk);
-$wgGroupPermissions['*']['read']                = ifsetor($sys_plugin_mediawiki_access_anon_read);
+$wgGroupPermissions['*']['createaccount']          = false;
+$wgGroupPermissions['*']['edit']                   = ifsetor($sys_plugin_mediawiki_access_anon_edit);
+$wgGroupPermissions['*']['createpage']             = ifsetor($sys_plugin_mediawiki_access_anon_createpage);
+$wgGroupPermissions['*']['createtalk']             = ifsetor($sys_plugin_mediawiki_access_anon_createtalk);
+$wgGroupPermissions['*']['read']                   = ifsetor($sys_plugin_mediawiki_access_anon_read);
 
 if (file_exists ("$wikidata/LocalSettings.php")) {
         require ("$wikidata/LocalSettings.php") ;
 }
 
 // required to make user groups work
-$wgGroupPermissions['user']['createaccount']      = false;
-$wgGroupPermissions['user']['edit']               = false;
-$wgGroupPermissions['user']['createpage']         = false;
-$wgGroupPermissions['user']['createtalk']         = false;
-$wgGroupPermissions['user']['read']               = false;
+$wgGroupPermissions['user']['createaccount']       = false;
+$wgGroupPermissions['user']['edit']                = false;
+$wgGroupPermissions['user']['createpage']          = false;
+$wgGroupPermissions['user']['createtalk']          = false;
+$wgGroupPermissions['user']['read']                = false;
 
 $wgFavicon = '/images/icon.png' ;
 $wgBreakFrames = false ;




More information about the evolvis-commits mailing list