Revision: 50838
Author: siebrand
Date: 2009-05-20 22:04:10 +0000 (Wed, 20 May 2009)
Log Message:
-----------
* add right- message
* remove trailing whitespace, stylize.php
* bump version
Modified Paths:
--------------
trunk/extensions/SharedUserRights/SharedUserRights.i18n.php
trunk/extensions/SharedUserRights/SharedUserRights.php
trunk/extensions/SharedUserRights/SharedUserRights_body.php
Modified: trunk/extensions/SharedUserRights/SharedUserRights.i18n.php
===================================================================
--- trunk/extensions/SharedUserRights/SharedUserRights.i18n.php 2009-05-20
22:02:28 UTC (rev 50837)
+++ trunk/extensions/SharedUserRights/SharedUserRights.i18n.php 2009-05-20
22:04:10 UTC (rev 50838)
@@ -18,6 +18,7 @@
'gblrights-logpage' => 'Global Rights Log',
'gblrights-pagetext' => 'This is a log of all the changes that are made
to the wiki family\'s global rights table',
'gblrights-rights-entry' => 'changed global group membership for $1
from $2 to $3',
+ 'right-userrights-global' => 'Manage shared user rights',
);
/** Message documentation (Message documentation)
Modified: trunk/extensions/SharedUserRights/SharedUserRights.php
===================================================================
--- trunk/extensions/SharedUserRights/SharedUserRights.php 2009-05-20
22:02:28 UTC (rev 50837)
+++ trunk/extensions/SharedUserRights/SharedUserRights.php 2009-05-20
22:04:10 UTC (rev 50838)
@@ -6,7 +6,7 @@
*
* @author Łukasz 'TOR' Garczewski <t...@wikia-inc.com>
* @author Charles Melbye <char...@yourwiki.net>
-* @version 0.10
+* @version 0.11
* @copyright Copyright © 2008 Łukasz 'TOR' Garczewski, Wikia, Inc.
* @copyright Copyright (C) 2008 YourWiki, Inc.
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0
or later
@@ -23,7 +23,7 @@
'path' => __FILE__,
'name' => 'SharedUserRights',
'url' => 'http://www.mediawiki.org/wiki/Extension:SharedUserRights',
- 'version' => '0.10',
+ 'version' => '0.11',
'author' => array( "Łukasz 'TOR' Garczewski", 'Charles Melbye' ),
'description' => 'Easy global user rights administration',
'descriptionmsg' => 'gblrights-desc',
@@ -57,7 +57,7 @@
'sug_group',
array ( 'sug_user' => $user->mId ) );
while ( $row = $dbr->fetchObject( $res ) ) {
- if( !in_array( $row->sug_group, $groups ) ) {
+ if ( !in_array( $row->sug_group, $groups ) ) {
$groups[] = $row->sug_group;
}
}
@@ -68,14 +68,14 @@
return $groups;
}
-/**
+/**
* Get a shared table name
*/
function efSharedTable( $table )
{
global $wgSharedDB;
- if (!empty( $wgSharedDB )) {
+ if ( !empty( $wgSharedDB ) ) {
return "`$wgSharedDB`.`$table`";
} else {
return "`$table`";
Modified: trunk/extensions/SharedUserRights/SharedUserRights_body.php
===================================================================
--- trunk/extensions/SharedUserRights/SharedUserRights_body.php 2009-05-20
22:02:28 UTC (rev 50837)
+++ trunk/extensions/SharedUserRights/SharedUserRights_body.php 2009-05-20
22:04:10 UTC (rev 50838)
@@ -45,7 +45,7 @@
} else {
$this->mTarget = $wgRequest->getVal( 'user' );
}
-
+
# This might be redundant, but more security is always good.
Right?
if ( !$this->userCanExecute( $wgUser ) ) {
global $wgOut;
@@ -104,7 +104,7 @@
$allgroups = $this->getAllGroups();
$addgroup = array();
$removegroup = array();
-
+
foreach ( $allgroups as $group ) {
// We'll tell it to remove all unchecked groups, and
add all checked groups.
// Later on, this gets filtered for what can actually
be removed
@@ -114,7 +114,7 @@
$removegroup[] = $group;
}
}
-
+
$removegroup = array_unique(
array_intersect( (array)$removegroup, $allgroups ) );
$addgroup = array_unique(
@@ -122,7 +122,7 @@
$oldGroups = $this->listGroups( $username );
$newGroups = $oldGroups;
-
+
# remove groups
if ( $removegroup ) {
$newGroups = array_diff( $newGroups, $removegroup );
@@ -130,7 +130,7 @@
$this->removeGroup( $username, $group );
}
}
-
+
# add new groups
if ( $addgroup ) {
$newGroups = array_merge( $newGroups, $addgroup );
@@ -138,7 +138,7 @@
$this->addGroup( $username, $group );
}
}
-
+
$newGroups = array_unique( $newGroups );
# Clear the caches
@@ -191,8 +191,8 @@
function addGroup( $username, $groupname ) {
$groups = $this->listGroups( $username );
-
- if( in_array( $groupname, $groups )) {
+
+ if ( in_array( $groupname, $groups ) ) {
return false;
} else {
$user = $this->fetchUser( $username );
@@ -212,7 +212,7 @@
function removeGroup( $username, $groupname ) {
$user = $this->fetchUser( $username );
-
+
$dbw = wfGetDB( DB_MASTER );
$dbw->delete( efSharedTable( 'shared_user_groups' ), array(
@@ -232,7 +232,7 @@
$dbr = wfGetDB( DB_SLAVE, array(), $wgSharedDB );
$groups = array();
-
+
$res = $dbr->select(
'shared_user_groups',
'sug_group',
@@ -256,7 +256,7 @@
*/
function fetchUser( $username ) {
global $wgOut, $wgUser;
-
+
$name = trim( $username );
if ( $name == '' ) {
@@ -403,12 +403,12 @@
foreach ( $allgroups as $group ) {
$set = in_array( $group, $usergroups );
-
+
$attr = array();
$text = User::getGroupMember( $group );
$checkbox = Xml::checkLabel( $text, "wpGroup-$group",
"wpGroup-$group", $set, $attr );
-
+
$settable_col .= "$checkbox<br />\n";
}
@@ -440,7 +440,7 @@
return $ret;
}
-
+
/**
* Show a rights log fragment for the specified user
*
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
