| Index: branches/wmf/1.18wmf1/extensions/Nuke/Nuke_body.php |
| — | — | @@ -17,43 +17,44 @@ |
| 18 | 18 | $this->setHeaders(); |
| 19 | 19 | $this->outputHeader(); |
| 20 | 20 | |
| 21 | | - if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) { |
| 22 | | - $target = $wgRequest->getText( 'target', $par ); |
| | 21 | + $target = trim( $wgRequest->getText( 'target', $par ) ); |
| | 22 | + |
| | 23 | + // Normalise name |
| | 24 | + if ( $target !== '' ) { |
| | 25 | + $user = User::newFromName( $target ); |
| | 26 | + if ( $user ) $target = $user->getName(); |
| | 27 | + } |
| | 28 | + |
| | 29 | + $reason = $wgRequest->getText( |
| | 30 | + 'wpReason', |
| | 31 | + wfMsgForContent( |
| | 32 | + 'nuke-defaultreason', |
| | 33 | + $target === '' ? wfMsg( 'nuke-multiplepeople' ) : $target |
| | 34 | + ) |
| | 35 | + ); |
| | 36 | + |
| | 37 | + if( $wgRequest->wasPosted() |
| | 38 | + && $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) |
| | 39 | + && $wgRequest->getVal( 'action' ) == 'delete' ) { |
| 23 | 40 | |
| 24 | | - // Normalise name |
| 25 | | - if ( $target !== '' ) { |
| 26 | | - $user = User::newFromName( $target ); |
| 27 | | - if ( $user ) $target = $user->getName(); |
| 28 | | - } |
| 29 | | - |
| 30 | | - $reason = $wgRequest->getText( |
| 31 | | - 'wpReason', |
| 32 | | - wfMsgForContent( |
| 33 | | - 'nuke-defaultreason', |
| 34 | | - $target === '' ? wfMsg( 'nuke-multiplepeople' ) : $target |
| 35 | | - ) |
| 36 | | - ); |
| 37 | | - |
| 38 | | - if ( $wgRequest->getVal( 'action' ) == 'delete' ) { |
| 39 | | - $pages = $wgRequest->getArray( 'pages' ); |
| | 41 | + $pages = $wgRequest->getArray( 'pages' ); |
| 40 | 42 | |
| 41 | | - if( $pages ) { |
| 42 | | - return $this->doDelete( $pages, $reason ); |
| 43 | | - } |
| | 43 | + if( $pages ) { |
| | 44 | + return $this->doDelete( $pages, $reason ); |
| 44 | 45 | } |
| 45 | | - else { |
| 46 | | - $this->listForm( $target, $reason, $wgRequest->getInt( 'limit' ) ); |
| 47 | | - } |
| 48 | 46 | } |
| 49 | | - else { |
| | 47 | + else if ( $target === '' ) { |
| 50 | 48 | $this->promptForm(); |
| 51 | 49 | } |
| | 50 | + else { |
| | 51 | + $this->listForm( $target, $reason, $wgRequest->getInt( 'limit', 500 ) ); |
| | 52 | + } |
| 52 | 53 | } |
| 53 | 54 | |
| 54 | 55 | /** |
| 55 | 56 | * Prompt for a username or IP address. |
| 56 | 57 | */ |
| 57 | | - protected function promptForm() { |
| | 58 | + protected function promptForm( $userName = '' ) { |
| 58 | 59 | global $wgOut, $wgUser; |
| 59 | 60 | |
| 60 | 61 | $wgOut->addWikiMsg( 'nuke-tools' ); |
| — | — | @@ -68,7 +69,7 @@ |
| 69 | 70 | ) |
| 70 | 71 | . '<table><tr>' |
| 71 | 72 | . '<td>' . htmlspecialchars( wfMsg( 'nuke-userorip' ) ) . '</td>' |
| 72 | | - . '<td>' . Xml::input( 'target', 40 ) . '</td>' |
| | 73 | + . '<td>' . Xml::input( 'target', 40, $userName ) . '</td>' |
| 73 | 74 | . '</tr><tr>' |
| 74 | 75 | . '<td>' . htmlspecialchars( wfMsg( 'nuke-maxpages' ) ) . '</td>' |
| 75 | 76 | . '<td>' . Xml::input( 'limit', 7, '500' ) . '</td>' |
| — | — | @@ -95,7 +96,7 @@ |
| 96 | 97 | |
| 97 | 98 | if( count( $pages ) == 0 ) { |
| 98 | 99 | $wgOut->addWikiMsg( 'nuke-nopages', $username ); |
| 99 | | - return $this->promptForm(); |
| | 100 | + return $this->promptForm( $username ); |
| 100 | 101 | } |
| 101 | 102 | |
| 102 | 103 | if ( $username == '' ) { |
| — | — | @@ -263,6 +264,9 @@ |
| 264 | 265 | $res[] = wfMsgExt( 'nuke-not-deleted', array( 'parseinline' ), $title->getPrefixedText() ); |
| 265 | 266 | } |
| 266 | 267 | } |
| 267 | | - $wgOut->addHTML( "<ul>\n<li>" .implode( "</li>\n<li>", $res ) . "</li>\n</ul>\n" ); |
| | 268 | + $wgOut->addHTML( "<ul>\n<li>" . implode( "</li>\n<li>", $res ) . "</li>\n</ul>\n" ); |
| | 269 | + |
| | 270 | + $wgOut->addWikiMsg( 'nuke-delete-more' ); |
| 268 | 271 | } |
| | 272 | + |
| 269 | 273 | } |
| Index: branches/wmf/1.18wmf1/extensions/Nuke/Nuke.i18n.php |
| — | — | @@ -33,6 +33,7 @@ |
| 34 | 34 | 'nuke-editby' => 'Created by [[Special:Contributions/$1|$1]]', |
| 35 | 35 | 'nuke-deleted' => "Page '''$1''' has been deleted.", |
| 36 | 36 | 'nuke-not-deleted' => "Page [[:$1]] '''could not''' be deleted.", |
| | 37 | + 'nuke-delete-more' => '[[Special:Nuke|Delete more pages]]', |
| 37 | 38 | ); |
| 38 | 39 | |
| 39 | 40 | /** Message documentation (Message documentation) |
| Index: branches/wmf/1.18wmf1/extensions/Nuke/Nuke.php |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | die( 'Not an entry point.' ); |
| 6 | 6 | } |
| 7 | 7 | |
| 8 | | -define( 'Nuke_VERSION', '1.1' ); |
| | 8 | +define( 'Nuke_VERSION', '1.1.1' ); |
| 9 | 9 | |
| 10 | 10 | $dir = dirname(__FILE__) . '/'; |
| 11 | 11 | |
| Property changes on: branches/wmf/1.18wmf1/extensions/Nuke |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 12 | 12 | Merged /branches/REL1_15/phase3/extensions/Nuke:r51646 |
| 13 | 13 | Merged /branches/REL1_18/extensions/Nuke:r101758,103190 |
| 14 | 14 | Merged /branches/REL1_17/phase3/extensions/Nuke:r81445,81448 |
| 15 | 15 | Merged /trunk/extensions/Nuke:r99592,99653,100092,100182,100419,100516,100686,100692,100699,103260,103315,103378,103382,103669,104337,104736,104862-104863 |
| 16 | 16 | Merged /branches/sqlite/extensions/Nuke:r58211-58321 |
| 17 | 17 | Merged /trunk/phase3/extensions/Nuke:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656 |
| 18 | 18 | Merged /branches/new-installer/phase3/extensions/Nuke:r43664-66004 |