http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100182
Revision: 100182
Author: jeroendedauw
Date: 2011-10-18 22:46:31 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Follow up to r82136;
Modified Paths:
--------------
trunk/extensions/Nuke/Nuke.i18n.php
trunk/extensions/Nuke/Nuke.php
trunk/extensions/Nuke/Nuke_body.php
Modified: trunk/extensions/Nuke/Nuke.i18n.php
===================================================================
--- trunk/extensions/Nuke/Nuke.i18n.php 2011-10-18 22:42:41 UTC (rev 100181)
+++ trunk/extensions/Nuke/Nuke.i18n.php 2011-10-18 22:46:31 UTC (rev 100182)
@@ -33,6 +33,7 @@
'nuke-editby' => 'Created by [[Special:Contributions/$1|$1]]',
'nuke-deleted' => "Page '''$1''' has been deleted.",
'nuke-not-deleted' => "Page [[:$1]] '''could not''' be deleted.",
+ 'nuke-delete-more' => '[[Special:Nuke|Delete more pages]]',
);
/** Message documentation (Message documentation)
Modified: trunk/extensions/Nuke/Nuke.php
===================================================================
--- trunk/extensions/Nuke/Nuke.php 2011-10-18 22:42:41 UTC (rev 100181)
+++ trunk/extensions/Nuke/Nuke.php 2011-10-18 22:46:31 UTC (rev 100182)
@@ -4,7 +4,7 @@
die( 'Not an entry point.' );
}
-define( 'Nuke_VERSION', '1.1' );
+define( 'Nuke_VERSION', '1.1.1' );
$dir = dirname(__FILE__) . '/';
Modified: trunk/extensions/Nuke/Nuke_body.php
===================================================================
--- trunk/extensions/Nuke/Nuke_body.php 2011-10-18 22:42:41 UTC (rev 100181)
+++ trunk/extensions/Nuke/Nuke_body.php 2011-10-18 22:46:31 UTC (rev 100182)
@@ -17,41 +17,44 @@
$this->setHeaders();
$this->outputHeader();
- if( $wgRequest->wasPosted() && $wgUser->matchEditToken(
$wgRequest->getVal( 'wpEditToken' ) ) ) {
- $target = $wgRequest->getText( 'target', $par );
+ $target = trim( $wgRequest->getText( 'target', $par ) );
+
+ // Normalise name
+ if ( $target !== '' ) {
+ $user = User::newFromName( $target );
+ if ( $user ) $target = $user->getName();
+ }
+
+ $reason = $wgRequest->getText(
+ 'wpReason',
+ wfMsgForContent(
+ 'nuke-defaultreason',
+ $target === '' ? wfMsg( 'nuke-multiplepeople' )
: $target
+ )
+ );
+
+ if( $wgRequest->wasPosted()
+ && $wgUser->matchEditToken( $wgRequest->getVal(
'wpEditToken' ) )
+ && $wgRequest->getVal( 'action' ) == 'delete' ) {
+
+ $pages = $wgRequest->getArray( 'pages' );
- // Normalise name
- if ( $target !== '' ) {
- $user = User::newFromName( $target );
- if ( $user ) $target = $user->getName();
+ if( $pages ) {
+ return $this->doDelete( $pages, $reason );
}
-
- $reason = $wgRequest->getText(
- 'wpReason',
- wfMsgForContent(
- 'nuke-defaultreason',
- $target === '' ? wfMsg(
'nuke-multiplepeople' ) : $target
- )
- );
-
- if ( $wgRequest->getVal( 'action' ) == 'delete' ) {
- $pages = $wgRequest->getArray( 'pages' );
-
- if( $pages ) {
- return $this->doDelete( $pages, $reason
);
- }
- } else {
- $this->listForm( $target, $reason,
$wgRequest->getInt( 'limit' ) );
- }
- } else {
+ }
+ else if ( $target === '' ) {
$this->promptForm();
}
+ else {
+ $this->listForm( $target, $reason, $wgRequest->getInt(
'limit', 500 ) );
+ }
}
/**
* Prompt for a username or IP address.
*/
- protected function promptForm() {
+ protected function promptForm( $userName = '' ) {
global $wgOut, $wgUser;
$wgOut->addWikiMsg( 'nuke-tools' );
@@ -66,7 +69,7 @@
)
. '<table><tr>'
. '<td>' . htmlspecialchars( wfMsg(
'nuke-userorip' ) ) . '</td>'
- . '<td>' . Xml::input( 'target', 40 ) . '</td>'
+ . '<td>' . Xml::input( 'target', 40, $userName
) . '</td>'
. '</tr><tr>'
. '<td>' . htmlspecialchars( wfMsg(
'nuke-maxpages' ) ) . '</td>'
. '<td>' . Xml::input( 'limit', 7, '500' ) .
'</td>'
@@ -93,7 +96,7 @@
if( count( $pages ) == 0 ) {
$wgOut->addWikiMsg( 'nuke-nopages', $username );
- return $this->promptForm();
+ return $this->promptForm( $username );
}
if ( $username == '' ) {
@@ -257,6 +260,10 @@
$res[] = wfMsgExt( 'nuke-not-deleted', array(
'parseinline' ), $title->getPrefixedText() );
}
}
+
$wgOut->addHTML( "<ul>\n<li>" . implode( "</li>\n<li>", $res )
. "</li>\n</ul>\n" );
+
+ $wgOut->addWikiMsg( 'nuke-delete-more' );
}
+
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
