From f1263ed7d8710f31336b4ccad58a5c5663a316fb Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Fri, 27 Apr 2007 09:01:09 +0000 Subject: [PATCH] * Adding a 'reason' field to Special:Userrights --- RELEASE-NOTES | 1 + includes/SpecialUserrights.php | 51 ++++++++++++++++--------------- languages/messages/MessagesDe.php | 5 +-- languages/messages/MessagesEn.php | 1 + maintenance/language/messages.inc | 3 +- 5 files changed, 33 insertions(+), 28 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 5364979ed0..c5f6cb44e0 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -128,6 +128,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * 'contribsub' message changed to 'contribsub2' with two parameters to permit better localization. Change is reverse-compatible and can be ignored for most wikis. +* Adding a 'reason' field to Special:Userrights == Bugfixes since 1.9 == diff --git a/includes/SpecialUserrights.php b/includes/SpecialUserrights.php index 7f00b1fa3f..c6e4669a72 100644 --- a/includes/SpecialUserrights.php +++ b/includes/SpecialUserrights.php @@ -53,10 +53,12 @@ class UserrightsForm extends HTMLForm { 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( 'member' ), - $this->mRequest->getArray( 'available' ) ); + $this->mRequest->getArray( 'available' ), + $reason ); } } } @@ -69,9 +71,10 @@ class UserrightsForm extends HTMLForm { * @param string $username Username to apply changes to. * @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 * */ - function saveUserGroups( $username, $removegroup, $addgroup) { + function saveUserGroups( $username, $removegroup, $addgroup, $reason ) { global $wgOut; $u = User::newFromName($username); @@ -107,7 +110,7 @@ class UserrightsForm extends HTMLForm { wfRunHooks( 'UserRights', array( &$u, $addgroup, $removegroup ) ); $log = new LogPage( 'rights' ); - $log->addEntry( 'rights', Title::makeTitle( NS_USER, $u->getName() ), '', array( $this->makeGroupNameList( $oldGroups ), + $log->addEntry( 'rights', Title::makeTitle( NS_USER, $u->getName() ), $reason, array( $this->makeGroupNameList( $oldGroups ), $this->makeGroupNameList( $newGroups ) ) ); } @@ -148,29 +151,27 @@ class UserrightsForm extends HTMLForm { $groups = $user->getGroups(); - $wgOut->addHTML( "
action\" method=\"post\">\n". - wfElement( 'input', array( - 'type' => 'hidden', - 'name' => 'user-editname', - 'value' => $username ) ) . - wfElement( 'input', array( - 'type' => 'hidden', - 'name' => 'wpEditToken', - 'value' => $wgUser->editToken( $username ) ) ) . - $this->fieldset( 'editusergroup', - $wgOut->parse( wfMsg('editinguser', $username ) ) . - '
'. - HTMLSelectGroups('member', $this->mName.'-groupsmember', $groups,true,6). - ''. - HTMLSelectGroups('available', $this->mName.'-groupsavailable', $groups,true,6,true). - '
'."\n". + $wgOut->addHTML( + Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->action, 'name' => 'editGroup' ) ) . + Xml::hidden( 'user-editname', $username ) . + Xml::hidden( 'wpEditToken', $wgUser->editToken( $username ) ) . + Xml::openElement( 'fieldset' ) . + Xml::element( 'legend', array(), wfMsg( 'userrights-editusergroup' ) ) . + $wgOut->parse( wfMsg( 'editinguser', $username ) ) . + " + + + + + + + +
" . HTMLSelectGroups( 'member', $this->mName.'-groupsmember', $groups, true, 6 ) . "" . HTMLSelectGroups( 'available', $this->mName.'-groupsavailable', $groups, true, 6, true) . "
" . $wgOut->parse( wfMsg( 'userrights-reason' ) ) . "" . Xml::input( 'user-reason', 30 ) . "
\n" . $wgOut->parse( wfMsg('userrights-groupshelp') ) . - wfElement( 'input', array( - 'type' => 'submit', - 'name' => 'saveusergroups', - 'value' => wfMsg( 'saveusergroups' ) ) ) - )); - $wgOut->addHTML( "
\n" ); + Xml::submitButton( wfMsg( 'saveusergroups' ), array( 'name' => 'saveusergroups' ) ) . + Xml::closeElement( 'fieldset' ) . + Xml::closeElement( 'form' ) . "\n" + ); } } // end class UserrightsForm ?> diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php index 50fc5ee847..a90d979492 100644 --- a/languages/messages/MessagesDe.php +++ b/languages/messages/MessagesDe.php @@ -884,6 +884,7 @@ Wenn Sie sich mit dem Thema auskennen, können Sie selbst die Seite „[[$1]]“ 'userrights-groupsavailable' => 'Verfügbare Gruppen:', 'userrights-groupshelp' => "Wählen Sie die Gruppen, aus denen der Benutzer entfernt oder zu denen er hinzugefügt werden soll. Nicht selektierte Gruppen werden nicht geändert. Eine Selektion kann mit '''Strg + Linksklick''' (bzw. Ctrl + Linksklick) entfernt werden.", +'userrights-reason' => 'Grund:', # Groups 'group' => 'Gruppe:', @@ -1469,7 +1470,7 @@ Im [[Special:Log/delete|Lösch-Logbuch]] finden Sie eine Übersicht der kürzlic # Contributions 'contributions' => 'Benutzerbeiträge', 'mycontris' => 'Eigene Beiträge', -'contribsub2' => 'Für $1 ($2)', +'contribsub2' => 'Für $1 ($2)', 'nocontribs' => 'Es wurden keine Benutzerbeiträge mit diesen Kriterien gefunden.', 'ucnote' => 'Dies sind die letzten $1 Beiträge des Benutzers in den letzten $2 Tagen.', 'uclinks' => 'Zeige die letzten $1 Beiträge; zeige die letzten $2 Tage.', @@ -1885,7 +1886,7 @@ Variants for Chinese language 'variantname-kk-cn' => 'kk-cn', 'variantname-kk' => 'kk', -'passwordtooshort' => 'Das Passwort ist zu kurz. Es muss mindestens $1 Zeichen lang sein.', +'passwordtooshort' => 'Fehler bei der Passwort-Wahl: Es muss mindestens $1 Zeichen lang sein und darf nicht mit dem Benutzernamen identisch sein.', # Metadata 'metadata' => 'Metadaten', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index b7392bcf87..f1c6500318 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1266,6 +1266,7 @@ containing all of the search terms will appear in the result).", 'userrights-groupsavailable' => 'Available groups:', 'userrights-groupshelp' => 'Select groups you want the user to be removed from or added to. Unselected groups will not be changed. You can deselect a group with CTRL + Left Click', +'userrights-reason' => 'Reason:', # Groups 'group' => 'Group:', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index be207fcf7a..c4e8ee890c 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -690,6 +690,7 @@ $wgMessageStructure = array( 'userrights-groupsmember', 'userrights-groupsavailable', 'userrights-groupshelp', + 'userrights-reason', ), 'group' => array( 'group', @@ -1222,7 +1223,7 @@ $wgMessageStructure = array( 'contributions' => array( 'contributions', 'mycontris', - 'contribsub', + 'contribsub2', 'nocontribs', 'ucnote', 'uclinks', -- 2.20.1