diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2010-07-28 11:52:48 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2010-07-28 11:52:48 +0200 |
commit | 222b01f5169f1c7e69762e0e8904c24f78f71882 (patch) | |
tree | 8e932e12546bb991357ec48eb1638d1770be7a35 /includes/specials/SpecialListgrouprights.php | |
parent | 00ab76a6b686e98a914afc1975812d2b1aaa7016 (diff) |
update to MediaWiki 1.16.0
Diffstat (limited to 'includes/specials/SpecialListgrouprights.php')
-rw-r--r-- | includes/specials/SpecialListgrouprights.php | 74 |
1 files changed, 62 insertions, 12 deletions
diff --git a/includes/specials/SpecialListgrouprights.php b/includes/specials/SpecialListgrouprights.php index d1fc0818..83724a4f 100644 --- a/includes/specials/SpecialListgrouprights.php +++ b/includes/specials/SpecialListgrouprights.php @@ -25,14 +25,15 @@ class SpecialListGroupRights extends SpecialPage { */ public function execute( $par ) { global $wgOut, $wgImplicitGroups, $wgMessageCache; - global $wgGroupPermissions, $wgAddGroups, $wgRemoveGroups; + global $wgGroupPermissions, $wgRevokePermissions, $wgAddGroups, $wgRemoveGroups; + global $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf; $wgMessageCache->loadAllMessages(); $this->setHeaders(); $this->outputHeader(); $wgOut->addHTML( - Xml::openElement( 'table', array( 'class' => 'mw-listgrouprights-table' ) ) . + Xml::openElement( 'table', array( 'class' => 'wikitable mw-listgrouprights-table' ) ) . '<tr>' . Xml::element( 'th', null, wfMsg( 'listgrouprights-group' ) ) . Xml::element( 'th', null, wfMsg( 'listgrouprights-rights' ) ) . @@ -40,7 +41,7 @@ class SpecialListGroupRights extends SpecialPage { ); foreach( $wgGroupPermissions as $group => $permissions ) { - $groupname = ( $group == '*' ) ? 'all' : htmlspecialchars( $group ); // Replace * with a more descriptive groupname + $groupname = ( $group == '*' ) ? 'all' : $group; // Replace * with a more descriptive groupname $msg = wfMsg( 'group-' . $groupname ); if ( wfEmptyMsg( 'group-' . $groupname, $msg ) || $msg == '' ) { @@ -58,23 +59,41 @@ class SpecialListGroupRights extends SpecialPage { if( $group == '*' ) { // Do not make a link for the generic * group - $grouppage = $groupnameLocalized; + $grouppage = htmlspecialchars($groupnameLocalized); } else { - $grouppage = $this->skin->makeLink( $grouppageLocalized, $groupnameLocalized ); + $grouppage = $this->skin->link( + Title::newFromText( $grouppageLocalized ), + htmlspecialchars($groupnameLocalized) + ); } if ( $group === 'user' ) { // Link to Special:listusers for implicit group 'user' - $grouplink = '<br />' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Listusers' ), wfMsgHtml( 'listgrouprights-members' ), '' ); + $grouplink = '<br />' . $this->skin->link( + SpecialPage::getTitleFor( 'Listusers' ), + wfMsgHtml( 'listgrouprights-members' ), + array(), + array(), + array( 'known', 'noclasses' ) + ); } elseif ( !in_array( $group, $wgImplicitGroups ) ) { - $grouplink = '<br />' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Listusers' ), wfMsgHtml( 'listgrouprights-members' ), 'group=' . $group ); + $grouplink = '<br />' . $this->skin->link( + SpecialPage::getTitleFor( 'Listusers' ), + wfMsgHtml( 'listgrouprights-members' ), + array(), + array( 'group' => $group ), + array( 'known', 'noclasses' ) + ); } else { // No link to Special:listusers for other implicit groups as they are unlistable $grouplink = ''; } + $revoke = isset( $wgRevokePermissions[$group] ) ? $wgRevokePermissions[$group] : array(); $addgroups = isset( $wgAddGroups[$group] ) ? $wgAddGroups[$group] : array(); $removegroups = isset( $wgRemoveGroups[$group] ) ? $wgRemoveGroups[$group] : array(); + $addgroupsSelf = isset( $wgGroupsAddToSelf[$group] ) ? $wgGroupsAddToSelf[$group] : array(); + $removegroupsSelf = isset( $wgGroupsRemoveFromSelf[$group] ) ? $wgGroupsRemoveFromSelf[$group] : array(); $wgOut->addHTML( '<tr> @@ -82,30 +101,47 @@ class SpecialListGroupRights extends SpecialPage { $grouppage . $grouplink . '</td> <td>' . - self::formatPermissions( $permissions, $addgroups, $removegroups ) . + self::formatPermissions( $permissions, $revoke, $addgroups, $removegroups, $addgroupsSelf, $removegroupsSelf ) . '</td> </tr>' ); } $wgOut->addHTML( - Xml::closeElement( 'table' ) . "\n" + Xml::closeElement( 'table' ) . "\n<br /><hr />\n" ); + $wgOut->wrapWikiMsg( "<div class=\"mw-listgrouprights-key\">\n$1\n</div>", 'listgrouprights-key' ); } /** * Create a user-readable list of permissions from the given array. * * @param $permissions Array of permission => bool (from $wgGroupPermissions items) + * @param $revoke Array of permission => bool (from $wgRevokePermissions items) + * @param $add Array of groups this group is allowed to add or true + * @param $remove Array of groups this group is allowed to remove or true + * @param $addSelf Array of groups this group is allowed to add to self or true + * @param $removeSelf Array of group this group is allowed to remove from self or true * @return string List of all granted permissions, separated by comma separator */ - private static function formatPermissions( $permissions, $add, $remove ) { + private static function formatPermissions( $permissions, $revoke, $add, $remove, $addSelf, $removeSelf ) { global $wgLang; + $r = array(); foreach( $permissions as $permission => $granted ) { - if ( $granted ) { + //show as granted only if it isn't revoked to prevent duplicate display of permissions + if( $granted && ( !isset( $revoke[$permission] ) || !$revoke[$permission] ) ) { $description = wfMsgExt( 'listgrouprights-right-display', array( 'parseinline' ), User::getRightDescription( $permission ), - $permission + '<span class="mw-listgrouprights-right-name">' . $permission . '</span>' + ); + $r[] = $description; + } + } + foreach( $revoke as $permission => $revoked ) { + if( $revoked ) { + $description = wfMsgExt( 'listgrouprights-right-revoked', array( 'parseinline' ), + User::getRightDescription( $permission ), + '<span class="mw-listgrouprights-right-name">' . $permission . '</span>' ); $r[] = $description; } @@ -114,13 +150,27 @@ class SpecialListGroupRights extends SpecialPage { if( $add === true ){ $r[] = wfMsgExt( 'listgrouprights-addgroup-all', array( 'escape' ) ); } else if( is_array( $add ) && count( $add ) ) { + $add = array_values( array_unique( $add ) ); $r[] = wfMsgExt( 'listgrouprights-addgroup', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $add ) ), count( $add ) ); } if( $remove === true ){ $r[] = wfMsgExt( 'listgrouprights-removegroup-all', array( 'escape' ) ); } else if( is_array( $remove ) && count( $remove ) ) { + $remove = array_values( array_unique( $remove ) ); $r[] = wfMsgExt( 'listgrouprights-removegroup', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $remove ) ), count( $remove ) ); } + if( $addSelf === true ){ + $r[] = wfMsgExt( 'listgrouprights-addgroup-self-all', array( 'escape' ) ); + } else if( is_array( $addSelf ) && count( $addSelf ) ) { + $addSelf = array_values( array_unique( $addSelf ) ); + $r[] = wfMsgExt( 'listgrouprights-addgroup-self', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $addSelf ) ), count( $addSelf ) ); + } + if( $removeSelf === true ){ + $r[] = wfMsgExt( 'listgrouprights-removegroup-self-all', array( 'escape' ) ); + } else if( is_array( $removeSelf ) && count( $removeSelf ) ) { + $removeSelf = array_values( array_unique( $removeSelf ) ); + $r[] = wfMsgExt( 'listgrouprights-removegroup-self', array( 'parseinline' ), $wgLang->listToText( array_map( array( 'User', 'makeGroupLinkWiki' ), $removeSelf ) ), count( $removeSelf ) ); + } if( empty( $r ) ) { return ''; } else { |