* Special page to allow managing user group membership
*
* @addtogroup SpecialPage
- * @todo This code is disgusting and needs a total rewrite
+ * @todo Use checkboxes or something, this list thing is incomprehensible to
+ * normal human beings.
*/
-/** */
-require_once( dirname(__FILE__) . '/HTMLForm.php');
-
-/** Entry point */
-function wfSpecialUserrights() {
- global $wgRequest;
- $form = new UserrightsForm($wgRequest);
- $form->execute();
-}
-
/**
* A class to manage user levels rights.
* @addtogroup SpecialPage
*/
-class UserrightsForm extends HTMLForm {
- var $mPosted, $mRequest, $mSaveprefs;
- /** Escaped local url name*/
- var $action;
-
- /** Constructor*/
- public function __construct( &$request ) {
- $this->mPosted = $request->wasPosted();
- $this->mRequest =& $request;
- $this->mName = 'userrights';
- $this->mReason = $request->getText( 'user-reason' );
-
- $titleObj = SpecialPage::getTitleFor( 'Userrights' );
- $this->action = $titleObj->escapeLocalURL();
+class UserrightsPage extends SpecialPage {
+ # The target of the local right-adjuster's interest. Can be gotten from
+ # either a GET parameter or a subpage-style parameter, so have a member
+ # variable for it.
+ protected $mTarget;
+ protected $isself = false;
+
+ public function __construct() {
+ parent::__construct( 'Userrights' );
+ }
+
+ public function isRestricted() {
+ return true;
+ }
+
+ public function userCanExecute( $user ) {
+ $available = $this->changeableGroups();
+ return !empty( $available['add'] )
+ or !empty( $available['remove'] )
+ or ($this->isself and
+ (!empty( $available['add-self'] )
+ or !empty( $available['remove-self'] )));
}
/**
* Manage forms to be shown according to posted data.
* Depending on the submit button used, call a form or a save function.
+ *
+ * @param mixed $par String if any subpage provided, else null
*/
- function execute() {
+ function execute( $par ) {
// If the visitor doesn't have permissions to assign or remove
// any groups, it's a bit silly to give them the user search prompt.
- $available = $this->changeableGroups();
- if( empty( $available['add'] ) && empty( $available['remove'] ) ) {
+ global $wgUser, $wgRequest;
+
+ if( $par ) {
+ $this->mTarget = $par;
+ } else {
+ $this->mTarget = $wgRequest->getVal( 'user' );
+ }
+
+ if (!$this->mTarget) {
+ /*
+ * If the user specified no target, and they can only
+ * edit their own groups, automatically set them as the
+ * target.
+ */
+ $available = $this->changeableGroups();
+ if (empty($available['add']) && empty($available['remove']))
+ $this->mTarget = $wgUser->getName();
+ }
+
+ if ($this->mTarget == $wgUser->getName())
+ $this->isself = true;
+
+ if( !$this->userCanExecute( $wgUser ) ) {
// fixme... there may be intermediate groups we can mention.
- global $wgOut, $wgUser;
+ global $wgOut;
$wgOut->showPermissionsErrorPage( array(
$wgUser->isAnon()
? 'userrights-nologin'
: 'userrights-notallowed' ) );
return;
}
-
+
+ if ( wfReadOnly() ) {
+ global $wgOut;
+ $wgOut->readOnlyPage();
+ return;
+ }
+
+ $this->outputHeader();
+
+ $this->setHeaders();
+
// show the general form
$this->switchForm();
- if( $this->mPosted ) {
- // show some more forms
- if( $this->mRequest->getCheck( 'ssearchuser' ) ) {
- $this->editUserGroupsForm( $this->mRequest->getVal( 'user-editname' ) );
- }
+ if( $wgRequest->wasPosted() ) {
// save settings
- if( $this->mRequest->getCheck( 'saveusergroups' ) ) {
- global $wgUser;
- $username = $this->mRequest->getVal( 'user-editname' );
- $reason = $this->mRequest->getVal( 'user-reason' );
- if( $wgUser->matchEditToken( $this->mRequest->getVal( 'wpEditToken' ), $username ) ) {
- $this->saveUserGroups( $username,
- $this->mRequest->getArray( 'removable' ),
- $this->mRequest->getArray( 'available' ),
- $reason );
+ if( $wgRequest->getCheck( 'saveusergroups' ) ) {
+ $reason = $wgRequest->getVal( 'user-reason' );
+ if( $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ), $this->mTarget ) ) {
+ $this->saveUserGroups(
+ $this->mTarget,
+ $wgRequest->getArray( 'removable' ),
+ $wgRequest->getArray( 'available' ),
+ $reason
+ );
}
}
}
- }
+ // show some more forms
+ if( $this->mTarget ) {
+ $this->editUserGroupsForm( $this->mTarget );
+ }
+ }
/**
* Save user groups changes in the database.
* @param array $removegroup id of groups to be removed.
* @param array $addgroup id of groups to be added.
* @param string $reason Reason for group change
- *
+ * @return null
*/
function saveUserGroups( $username, $removegroup, $addgroup, $reason = '') {
+ global $wgUser, $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
+
$user = $this->fetchUser( $username );
if( !$user ) {
return;
// Validate input set...
$changeable = $this->changeableGroups();
+ if ($wgUser->getId() != 0 && $wgUser->getId() == $user->getId()) {
+ $addable = array_merge($changeable['add'], $wgGroupsAddToSelf);
+ $removable = array_merge($changeable['remove'], $wgGroupsRemoveFromSelf);
+ } else {
+ $addable = $changeable['add'];
+ $removable = $changeable['remove'];
+ }
+
$removegroup = array_unique(
- array_intersect( (array)$removegroup, $changeable['remove'] ) );
+ array_intersect( (array)$removegroup, $removable ) );
$addgroup = array_unique(
- array_intersect( (array)$addgroup, $changeable['add'] ) );
+ array_intersect( (array)$addgroup, $addable ) );
$oldGroups = $user->getGroups();
$newGroups = $oldGroups;
wfRunHooks( 'UserRights', array( &$user, $addgroup, $removegroup ) );
}
- $log = new LogPage( 'rights' );
- $log->addEntry( 'rights',
- $user->getUserPage(),
- $this->mReason,
- array(
- $this->makeGroupNameList( $oldGroups ),
- $this->makeGroupNameList( $newGroups ) ) );
+ if( $newGroups != $oldGroups ) {
+ $log = new LogPage( 'rights' );
+
+ global $wgRequest;
+ $log->addEntry( 'rights',
+ $user->getUserPage(),
+ $wgRequest->getText( 'user-reason' ),
+ array(
+ $this->makeGroupNameList( $oldGroups ),
+ $this->makeGroupNameList( $newGroups )
+ )
+ );
+ }
}
/**
$this->showEditUserGroupsForm( $user, $groups );
- // This isn't really ideal logging behavior,
- // but let's not hide the interwiki logs if
- // we're using them as is.
+ // This isn't really ideal logging behavior, but let's not hide the
+ // interwiki logs if we're using them as is.
$this->showLogFragment( $user, $wgOut );
}
list( $name, $database ) = array_map( 'trim', $parts );
if( !$wgUser->isAllowed( 'userrights-interwiki' ) ) {
- $wgOut->addWikiText( wfMsg( 'userrights-no-interwiki' ) );
+ $wgOut->addWikiMsg( 'userrights-no-interwiki' );
return null;
}
if( !UserRightsProxy::validDatabase( $database ) ) {
- $wgOut->addWikiText( wfMsg( 'userrights-nodatabase', $database ) );
+ $wgOut->addWikiMsg( 'userrights-nodatabase', $database );
return null;
}
}
if( $name == '' ) {
- $wgOut->addWikiText( wfMsg( 'nouserspecified' ) );
+ $wgOut->addWikiMsg( 'nouserspecified' );
return false;
}
}
if( !$name ) {
- $wgOut->addWikiText( wfMsg( 'noname' ) );
+ $wgOut->addWikiMsg( 'noname' );
return null;
}
}
}
if( !$user || $user->isAnon() ) {
- $wgOut->addWikiText( wfMsg( 'nosuchusershort', wfEscapeWikiText( $username ) ) );
+ $wgOut->addWikiMsg( 'nosuchusershort', $username );
return null;
}
* Output a form to allow searching for a user
*/
function switchForm() {
- global $wgOut, $wgRequest;
- $username = $wgRequest->getText( 'user-editname' );
- $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->action, 'name' => 'uluser' ) );
- $form .= '<fieldset><legend>' . wfMsgHtml( 'userrights-lookup-user' ) . '</legend>';
- $form .= '<p>' . Xml::inputLabel( wfMsg( 'userrights-user-editname' ), 'user-editname', 'username', 30, $username ) . '</p>';
- $form .= '<p>' . Xml::submitButton( wfMsg( 'editusergroup' ), array( 'name' => 'ssearchuser' ) ) . '</p>';
- $form .= '</fieldset>';
- $form .= '</form>';
- $wgOut->addHTML( $form );
+ global $wgOut, $wgScript;
+ $wgOut->addHTML(
+ Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'name' => 'uluser', 'id' => 'mw-userrights-form1' ) ) .
+ Xml::hidden( 'title', 'Special:Userrights' ) .
+ Xml::openElement( 'fieldset' ) .
+ Xml::element( 'legend', array(), wfMsg( 'userrights-lookup-user' ) ) .
+ Xml::inputLabel( wfMsg( 'userrights-user-editname' ), 'user', 'username', 30, $this->mTarget ) . ' ' .
+ Xml::submitButton( wfMsg( 'editusergroup' ) ) .
+ Xml::closeElement( 'fieldset' ) .
+ Xml::closeElement( 'form' ) . "\n"
+ );
}
/**
* @return Array: Tuple of addable, then removable groups
*/
protected function splitGroups( $groups ) {
+ global $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
list($addable, $removable) = array_values( $this->changeableGroups() );
- $removable = array_intersect($removable, $groups ); // Can't remove groups the user doesn't have
- $addable = array_diff( $addable, $groups ); // Can't add groups the user does have
+
+ $removable = array_intersect(
+ array_merge($this->isself ? $wgGroupsRemoveFromSelf : array(), $removable),
+ $groups ); // Can't remove groups the user doesn't have
+ $addable = array_diff(
+ array_merge($this->isself ? $wgGroupsAddToSelf : array(), $addable),
+ $groups ); // Can't add groups the user does have
return array( $addable, $removable );
}
/**
* Show the form to edit group memberships.
*
- * @todo make all CSS-y and semantic
* @param $user User or UserRightsProxy you're editing
* @param $groups Array: Array of groups the user is in
*/
protected function showEditUserGroupsForm( $user, $groups ) {
global $wgOut, $wgUser;
-
+
list( $addable, $removable ) = $this->splitGroups( $groups );
-
+
$list = array();
foreach( $user->getGroups() as $group )
$list[] = self::buildGroupLink( $group );
- $grouplist = implode( ', ', $list );
-
+
+ $grouplist = '';
+ if( count( $list ) > 0 ) {
+ $grouplist = '<p>' . wfMsgHtml( 'userrights-groupsmember' ) . ' ' . implode( ', ', $list ) . '</p>';
+ }
$wgOut->addHTML(
- Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->action, 'name' => 'editGroup' ) ) .
- Xml::hidden( 'user-editname', $user->getName() ) .
- Xml::hidden( 'wpEditToken', $wgUser->editToken( $user->getName() ) ) .
+ Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalURL(), 'name' => 'editGroup', 'id' => 'mw-userrights-form2' ) ) .
+ Xml::hidden( 'user', $this->mTarget ) .
+ Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->mTarget ) ) .
Xml::openElement( 'fieldset' ) .
Xml::element( 'legend', array(), wfMsg( 'userrights-editusergroup' ) ) .
- wfMsgExt( 'editinguser', array( 'parse' ),
- wfEscapeWikiText( $user->getName() ) ) .
- '<p>' . wfMsgHtml('userrights-groupsmember') . ' ' . $grouplist . '</p>' .
+ wfMsgExt( 'editinguser', array( 'parse' ), wfEscapeWikiText( $user->getName() ) ) .
+ $grouplist .
$this->explainRights() .
- "<table border='0'>
- <tr>
- <td></td>
- <td>
- <table width='400'>
- <tr>
- <td width='50%'>" . $this->removeSelect( $removable ) . "</td>
- <td width='50%'>" . $this->addSelect( $addable ) . "</td>
- </tr>
- </table>
- </tr>
- <tr>
- <td colspan='2'>" .
- $wgOut->parse( wfMsg('userrights-groupshelp') ) .
- "</td>
- </tr>
- <tr>
- <td>" .
- Xml::label( wfMsg( 'userrights-reason' ), 'wpReason' ) .
- "</td>
- <td>" .
- Xml::input( 'user-reason', 60, false, array( 'id' => 'wpReason', 'maxlength' => 255 ) ) .
- "</td>
- </tr>
- <tr>
- <td></td>
- <td>" .
- Xml::submitButton( wfMsg( 'saveusergroups' ), array( 'name' => 'saveusergroups' ) ) .
- "</td>
- </tr>
- </table>\n" .
+ Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-userrights-table-outer' ) ) .
+ "<tr>
+ <td></td>
+ <td>" .
+ Xml::openElement( 'table', array( 'style' => 'width:400px;', 'id' => 'mw-userrights-table-inner' ) ) .
+ "<tr>
+ <td style='width:50%;'>" .
+ $this->removeSelect( $removable ) .
+ "</td>
+ <td style='width:50%;'>" .
+ $this->addSelect( $addable ) .
+ "</td>
+ </tr>" .
+ Xml::closeElement( 'table' ) .
+ "</tr>
+ <tr>
+ <td colspan='2'>" .
+ $wgOut->parse( wfMsg( 'userrights-groupshelp' ) ) .
+ "</td>
+ </tr>
+ <tr>
+ <td>" .
+ Xml::label( wfMsg( 'userrights-reason' ), 'wpReason' ) .
+ "</td>
+ <td>" .
+ Xml::input( 'user-reason', 60, false, array( 'id' => 'wpReason', 'maxlength' => 255 ) ) .
+ "</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>" .
+ Xml::submitButton( wfMsg( 'saveusergroups' ), array( 'name' => 'saveusergroups' ) ) .
+ "</td>
+ </tr>" .
+ Xml::closeElement( 'table' ) . "\n" .
Xml::closeElement( 'fieldset' ) .
Xml::closeElement( 'form' ) . "\n"
);
}
-
+
/**
* Format a link to a group description page
*
*/
private function explainRights() {
global $wgUser, $wgLang;
-
+
$out = array();
- list( $add, $remove ) = array_values( $this->changeableGroups() );
-
+ list( $add, $remove, $addself, $rmself ) = array_values( $this->changeableGroups() );
+
if( count( $add ) > 0 )
- $out[] = wfMsgExt( 'userrights-available-add', 'parseinline', $wgLang->listToText( $add ) );
+ $out[] = wfMsgExt( 'userrights-available-add', 'parseinline',
+ $wgLang->listToText( $add ), count( $add ) );
if( count( $remove ) > 0 )
- $out[] = wfMsgExt( 'userrights-available-remove', 'parseinline', $wgLang->listToText( $remove ) );
-
+ $out[] = wfMsgExt( 'userrights-available-remove', 'parseinline',
+ $wgLang->listToText( $remove ), count( $add ) );
+ if( count( $addself ) > 0 )
+ $out[] = wfMsgExt( 'userrights-available-add-self', 'parseinline',
+ $wgLang->listToText( $addself ), count( $addself ) );
+ if( count( $rmself ) > 0 )
+ $out[] = wfMsgExt( 'userrights-available-remove-self', 'parseinline',
+ $wgLang->listToText( $rmself ), count( $rmself ) );
+
return count( $out ) > 0
- ? implode( ' ', $out )
+ ? implode( '<br />', $out )
: wfMsgExt( 'userrights-available-none', 'parseinline' );
}
* @return Array array( 'add' => array( addablegroups ), 'remove' => array( removablegroups ) )
*/
function changeableGroups() {
- global $wgUser;
+ global $wgUser, $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
if( $wgUser->isAllowed( 'userrights' ) ) {
// This group gives the right to modify everything (reverse-
$all = array_merge( User::getAllGroups() );
return array(
'add' => $all,
- 'remove' => $all
+ 'remove' => $all,
+ 'add-self' => array(),
+ 'remove-self' => array()
);
}
// Okay, it's not so simple, we will have to go through the arrays
- $groups = array( 'add' => array(), 'remove' => array() );
+ $groups = array(
+ 'add' => array(),
+ 'remove' => array(),
+ 'add-self' => $wgGroupsAddToSelf,
+ 'remove-self' => $wgGroupsRemoveFromSelf);
$addergroups = $wgUser->getEffectiveGroups();
foreach ($addergroups as $addergroup) {
)
)
);
- $output->addHtml( "<h2>" . htmlspecialchars( LogPage::logName( 'rights' ) ) . "</h2>\n" );
+ $output->addHtml( Xml::element( 'h2', null, LogPage::logName( 'rights' ) . "\n" ) );
$viewer->showList( $output );
}
-
}
dépôts / lhc / web / wiklou.git / blobdiff