From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 3 May 2012 13:01:35 +0200 Subject: Update to MediaWiki 1.19.0 --- includes/specials/SpecialExport.php | 209 +++++++++++++++++++++++------------- 1 file changed, 132 insertions(+), 77 deletions(-) (limited to 'includes/specials/SpecialExport.php') diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php index 50754b6a..d061389e 100644 --- a/includes/specials/SpecialExport.php +++ b/includes/specials/SpecialExport.php @@ -38,9 +38,9 @@ class SpecialExport extends SpecialPage { } public function execute( $par ) { - global $wgOut, $wgRequest, $wgSitename, $wgExportAllowListContributors; + global $wgSitename, $wgExportAllowListContributors, $wgExportFromNamespaces; global $wgExportAllowHistory, $wgExportMaxHistory, $wgExportMaxLinkDepth; - global $wgExportFromNamespaces; + global $wgExportAllowAll; $this->setHeaders(); $this->outputHeader(); @@ -48,16 +48,18 @@ class SpecialExport extends SpecialPage { // Set some variables $this->curonly = true; $this->doExport = false; - $this->templates = $wgRequest->getCheck( 'templates' ); - $this->images = $wgRequest->getCheck( 'images' ); // Doesn't do anything yet + $request = $this->getRequest(); + $this->templates = $request->getCheck( 'templates' ); + $this->images = $request->getCheck( 'images' ); // Doesn't do anything yet $this->pageLinkDepth = $this->validateLinkDepth( - $wgRequest->getIntOrNull( 'pagelink-depth' ) + $request->getIntOrNull( 'pagelink-depth' ) ); $nsindex = ''; + $exportall = false; - if ( $wgRequest->getCheck( 'addcat' ) ) { - $page = $wgRequest->getText( 'pages' ); - $catname = $wgRequest->getText( 'catname' ); + if ( $request->getCheck( 'addcat' ) ) { + $page = $request->getText( 'pages' ); + $catname = $request->getText( 'catname' ); if ( $catname !== '' && $catname !== null && $catname !== false ) { $t = Title::makeTitleSafe( NS_MAIN, $catname ); @@ -74,9 +76,9 @@ class SpecialExport extends SpecialPage { } } } - elseif( $wgRequest->getCheck( 'addns' ) && $wgExportFromNamespaces ) { - $page = $wgRequest->getText( 'pages' ); - $nsindex = $wgRequest->getText( 'nsindex', '' ); + elseif( $request->getCheck( 'addns' ) && $wgExportFromNamespaces ) { + $page = $request->getText( 'pages' ); + $nsindex = $request->getText( 'nsindex', '' ); if ( strval( $nsindex ) !== '' ) { /** @@ -88,10 +90,14 @@ class SpecialExport extends SpecialPage { } } } - elseif( $wgRequest->wasPosted() && $par == '' ) { - $page = $wgRequest->getText( 'pages' ); - $this->curonly = $wgRequest->getCheck( 'curonly' ); - $rawOffset = $wgRequest->getVal( 'offset' ); + elseif( $request->getCheck( 'exportall' ) && $wgExportAllowAll ) { + $this->doExport = true; + $exportall = true; + } + elseif( $request->wasPosted() && $par == '' ) { + $page = $request->getText( 'pages' ); + $this->curonly = $request->getCheck( 'curonly' ); + $rawOffset = $request->getVal( 'offset' ); if( $rawOffset ) { $offset = wfTimestamp( TS_MW, $rawOffset ); @@ -99,14 +105,14 @@ class SpecialExport extends SpecialPage { $offset = null; } - $limit = $wgRequest->getInt( 'limit' ); - $dir = $wgRequest->getVal( 'dir' ); + $limit = $request->getInt( 'limit' ); + $dir = $request->getVal( 'dir' ); $history = array( 'dir' => 'asc', 'offset' => false, 'limit' => $wgExportMaxHistory, ); - $historyCheck = $wgRequest->getCheck( 'history' ); + $historyCheck = $request->getCheck( 'history' ); if ( $this->curonly ) { $history = WikiExporter::CURRENT; @@ -127,8 +133,8 @@ class SpecialExport extends SpecialPage { } } else { // Default to current-only for GET requests. - $page = $wgRequest->getText( 'pages', $par ); - $historyCheck = $wgRequest->getCheck( 'history' ); + $page = $request->getText( 'pages', $par ); + $historyCheck = $request->getCheck( 'history' ); if( $historyCheck ) { $history = WikiExporter::FULL; @@ -146,31 +152,32 @@ class SpecialExport extends SpecialPage { $history = WikiExporter::CURRENT; } - $list_authors = $wgRequest->getCheck( 'listauthors' ); + $list_authors = $request->getCheck( 'listauthors' ); if ( !$this->curonly || !$wgExportAllowListContributors ) { $list_authors = false ; } if ( $this->doExport ) { - $wgOut->disable(); + $this->getOutput()->disable(); // Cancel output buffering and gzipping if set // This should provide safer streaming for pages with history wfResetOutputBuffers(); - $wgRequest->response()->header( "Content-type: application/xml; charset=utf-8" ); + $request->response()->header( "Content-type: application/xml; charset=utf-8" ); - if( $wgRequest->getCheck( 'wpDownload' ) ) { + if( $request->getCheck( 'wpDownload' ) ) { // Provide a sane filename suggestion $filename = urlencode( $wgSitename . '-' . wfTimestampNow() . '.xml' ); - $wgRequest->response()->header( "Content-disposition: attachment;filename={$filename}" ); + $request->response()->header( "Content-disposition: attachment;filename={$filename}" ); } - $this->doExport( $page, $history, $list_authors ); + $this->doExport( $page, $history, $list_authors, $exportall ); return; } - $wgOut->addWikiMsg( 'exporttext' ); + $out = $this->getOutput(); + $out->addWikiMsg( 'exporttext' ); $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalUrl( 'action=submit' ) ) ); @@ -182,6 +189,15 @@ class SpecialExport extends SpecialPage { $form .= Xml::submitButton( wfMsg( 'export-addns' ), array( 'name' => 'addns' ) ) . '
'; } + if ( $wgExportAllowAll ) { + $form .= Xml::checkLabel( + wfMsg( 'exportall' ), + 'exportall', + 'exportall', + $request->wasPosted() ? $request->getCheck( 'exportall' ) : false + ) . '
'; + } + $form .= Xml::element( 'textarea', array( 'name' => 'pages', 'cols' => 40, 'rows' => 10 ), $page, false ); $form .= '
'; @@ -190,17 +206,17 @@ class SpecialExport extends SpecialPage { wfMsg( 'exportcuronly' ), 'curonly', 'curonly', - $wgRequest->wasPosted() ? $wgRequest->getCheck( 'curonly' ) : true + $request->wasPosted() ? $request->getCheck( 'curonly' ) : true ) . '
'; } else { - $wgOut->addHTML( wfMsgExt( 'exportnohistory', 'parse' ) ); + $out->addHTML( wfMsgExt( 'exportnohistory', 'parse' ) ); } $form .= Xml::checkLabel( wfMsg( 'export-templates' ), 'templates', 'wpExportTemplates', - $wgRequest->wasPosted() ? $wgRequest->getCheck( 'templates' ) : false + $request->wasPosted() ? $request->getCheck( 'templates' ) : false ) . '
'; if( $wgExportMaxLinkDepth || $this->userCanOverrideExportDepth() ) { @@ -212,18 +228,29 @@ class SpecialExport extends SpecialPage { wfMsg( 'export-download' ), 'wpDownload', 'wpDownload', - $wgRequest->wasPosted() ? $wgRequest->getCheck( 'wpDownload' ) : true + $request->wasPosted() ? $request->getCheck( 'wpDownload' ) : true ) . '
'; + if ( $wgExportAllowListContributors ) { + $form .= Xml::checkLabel( + wfMsg( 'exportlistauthors' ), + 'listauthors', + 'listauthors', + $request->wasPosted() ? $request->getCheck( 'listauthors' ) : false + ) . '
'; + } + $form .= Xml::submitButton( wfMsg( 'export-submit' ), Linker::tooltipAndAccesskeyAttribs( 'export' ) ); $form .= Xml::closeElement( 'form' ); - $wgOut->addHTML( $form ); + $out->addHTML( $form ); } + /** + * @return bool + */ private function userCanOverrideExportDepth() { - global $wgUser; - return $wgUser->isAllowed( 'override-export-depth' ); + return $this->getUser()->isAllowed( 'override-export-depth' ); } /** @@ -233,47 +260,55 @@ class SpecialExport extends SpecialPage { * @param $history Mixed: one of the WikiExporter history export constants * @param $list_authors Boolean: Whether to add distinct author list (when * not returning full history) + * @param $exportall Boolean: Whether to export everything */ - private function doExport( $page, $history, $list_authors ) { - $pageSet = array(); // Inverted index of all pages to look up - - // Split up and normalize input - foreach( explode( "\n", $page ) as $pageName ) { - $pageName = trim( $pageName ); - $title = Title::newFromText( $pageName ); - if( $title && $title->getInterwiki() == '' && $title->getText() !== '' ) { - // Only record each page once! - $pageSet[$title->getPrefixedText()] = true; + private function doExport( $page, $history, $list_authors, $exportall ) { + + // If we are grabbing everything, enable full history and ignore the rest + if ( $exportall ) { + $history = WikiExporter::FULL; + } else { + + $pageSet = array(); // Inverted index of all pages to look up + + // Split up and normalize input + foreach( explode( "\n", $page ) as $pageName ) { + $pageName = trim( $pageName ); + $title = Title::newFromText( $pageName ); + if( $title && $title->getInterwiki() == '' && $title->getText() !== '' ) { + // Only record each page once! + $pageSet[$title->getPrefixedText()] = true; + } } - } - // Set of original pages to pass on to further manipulation... - $inputPages = array_keys( $pageSet ); + // Set of original pages to pass on to further manipulation... + $inputPages = array_keys( $pageSet ); - // Look up any linked pages if asked... - if( $this->templates ) { - $pageSet = $this->getTemplates( $inputPages, $pageSet ); - } - $linkDepth = $this->pageLinkDepth; - if( $linkDepth ) { - $pageSet = $this->getPageLinks( $inputPages, $pageSet, $linkDepth ); - } + // Look up any linked pages if asked... + if( $this->templates ) { + $pageSet = $this->getTemplates( $inputPages, $pageSet ); + } + $linkDepth = $this->pageLinkDepth; + if( $linkDepth ) { + $pageSet = $this->getPageLinks( $inputPages, $pageSet, $linkDepth ); + } - /* - // Enable this when we can do something useful exporting/importing image information. :) - if( $this->images ) ) { - $pageSet = $this->getImages( $inputPages, $pageSet ); - } - */ + /* + // Enable this when we can do something useful exporting/importing image information. :) + if( $this->images ) ) { + $pageSet = $this->getImages( $inputPages, $pageSet ); + } + */ - $pages = array_keys( $pageSet ); + $pages = array_keys( $pageSet ); - // Normalize titles to the same format and remove dupes, see bug 17374 - foreach( $pages as $k => $v ) { - $pages[$k] = str_replace( " ", "_", $v ); - } + // Normalize titles to the same format and remove dupes, see bug 17374 + foreach( $pages as $k => $v ) { + $pages[$k] = str_replace( " ", "_", $v ); + } - $pages = array_unique( $pages ); + $pages = array_unique( $pages ); + } /* Ok, let's get to it... */ if( $history == WikiExporter::CURRENT ) { @@ -296,7 +331,10 @@ class SpecialExport extends SpecialPage { $exporter->list_authors = $list_authors; $exporter->openStream(); - foreach( $pages as $page ) { + if ( $exportall ) { + $exporter->allPages(); + } else { + foreach( $pages as $page ) { /* if( $wgExportMaxHistory && !$this->curonly ) { $title = Title::newFromText( $page ); @@ -310,15 +348,16 @@ class SpecialExport extends SpecialPage { } }*/ #Bug 8824: Only export pages the user can read - $title = Title::newFromText( $page ); - if( is_null( $title ) ) { - continue; #TODO: perhaps output an tag or something. - } - if( !$title->userCanRead() ) { - continue; #TODO: perhaps output an tag or something. - } + $title = Title::newFromText( $page ); + if( is_null( $title ) ) { + continue; #TODO: perhaps output an tag or something. + } + if( !$title->userCan( 'read', $this->getUser() ) ) { + continue; #TODO: perhaps output an tag or something. + } - $exporter->pageByTitle( $title ); + $exporter->pageByTitle( $title ); + } } $exporter->closeStream(); @@ -328,6 +367,10 @@ class SpecialExport extends SpecialPage { } } + /** + * @param $title Title + * @return array + */ private function getPagesFromCategory( $title ) { global $wgContLang; @@ -356,6 +399,10 @@ class SpecialExport extends SpecialPage { return $pages; } + /** + * @param $nsindex int + * @return array + */ private function getPagesFromNamespace( $nsindex ) { global $wgContLang; @@ -399,6 +446,8 @@ class SpecialExport extends SpecialPage { /** * Validate link depth setting, if available. + * @param $depth int + * @return int */ private function validateLinkDepth( $depth ) { global $wgExportMaxLinkDepth; @@ -421,7 +470,13 @@ class SpecialExport extends SpecialPage { return intval( min( $depth, 5 ) ); } - /** Expand a list of pages to include pages linked to from that page. */ + /** + * Expand a list of pages to include pages linked to from that page. + * @param $inputPages array + * @param $pageSet array + * @param $depth int + * @return array + */ private function getPageLinks( $inputPages, $pageSet, $depth ) { for( ; $depth > 0; --$depth ) { $pageSet = $this->getLinks( -- cgit v1.2.2