1 files changed, 64 insertions, 7 deletions

diff --git a/includes/SpecialExport.php b/includes/SpecialExport.php
index 5e6d6d8d..a597fdd0 100644
--- a/includes/SpecialExport.php
+++ b/includes/SpecialExport.php
@@ -18,10 +18,37 @@
 # http://www.gnu.org/copyleft/gpl.html
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
+function wfExportGetPagesFromCategory( $title ) {
+	global $wgContLang;
+
+	$name = $title->getDBKey();
+
+	$dbr = wfGetDB( DB_SLAVE );
+
+	list( $page, $categorylinks ) = $dbr->tableNamesN( 'page', 'categorylinks' );
+	$sql = "SELECT page_namespace, page_title FROM $page " .
+		"JOIN $categorylinks ON cl_from = page_id " .
+		"WHERE cl_to = " . $dbr->addQuotes( $name );
+
+	$pages = array();
+	$res = $dbr->query( $sql, 'wfExportGetPagesFromCategory' );
+	while ( $row = $dbr->fetchObject( $res ) ) {
+		$n = $row->page_title;
+		if ($row->page_namespace) {
+			$ns = $wgContLang->getNsText( $row->page_namespace );
+			$n = $ns . ':' . $n;
+		}
+
+		$pages[] = $n;
+	}
+	$dbr->freeResult($res);
+
+	return $pages;
+}
+
 /**
  *
  */
@@ -30,7 +57,21 @@ function wfSpecialExport( $page = '' ) {
 	global $wgExportAllowHistory, $wgExportMaxHistory;
 
 	$curonly = true;
-	if( $wgRequest->wasPosted() ) {
+	$doexport = false;
+
+	if ( $wgRequest->getCheck( 'addcat' ) ) {
+		$page = $wgRequest->getText( 'pages' );
+		$catname = $wgRequest->getText( 'catname' );
+		
+		if ( $catname !== '' && $catname !== NULL && $catname !== false ) {
+			$t = Title::makeTitleSafe( NS_CATEGORY, $catname );
+			if ( $t ) {
+				$catpages = wfExportGetPagesFromCategory( $t );
+				if ( $catpages ) $page .= "\n" . implode( "\n", $catpages );
+			}
+		}
+	}
+	else if( $wgRequest->wasPosted() ) {
 		$page = $wgRequest->getText( 'pages' );
 		$curonly = $wgRequest->getCheck( 'curonly' );
 		$rawOffset = $wgRequest->getVal( 'offset' );
@@ -60,6 +101,8 @@ function wfSpecialExport( $page = '' ) {
 				$history['dir'] = 'desc';
 			}
 		}
+		
+		if( $page != '' ) $doexport = true;
 	} else {
 		// Default to current-only for GET requests
 		$page = $wgRequest->getText( 'pages', $page );
@@ -69,7 +112,10 @@ function wfSpecialExport( $page = '' ) {
 		} else {
 			$history = WikiExporter::CURRENT;
 		}
+		
+		if( $page != '' ) $doexport = true;
 	}
+
 	if( !$wgExportAllowHistory ) {
 		// Override
 		$history = WikiExporter::CURRENT;
@@ -78,7 +124,7 @@ function wfSpecialExport( $page = '' ) {
 	$list_authors = $wgRequest->getCheck( 'listauthors' );
 	if ( !$curonly || !$wgExportAllowListContributors ) $list_authors = false ;
 
-	if( $page != '' ) {
+	if ( $doexport ) {
 		$wgOut->disable();
 		
 		// Cancel output buffering and gzipping if set
@@ -87,7 +133,7 @@ function wfSpecialExport( $page = '' ) {
 		header( "Content-type: application/xml; charset=utf-8" );
 		$pages = explode( "\n", $page );
 
-		$db =& wfGetDB( DB_SLAVE );
+		$db = wfGetDB( DB_SLAVE );
 		$exporter = new WikiExporter( $db, $history );
 		$exporter->list_authors = $list_authors ;
 		$exporter->openStream();
@@ -105,7 +151,13 @@ function wfSpecialExport( $page = '' ) {
 					}
 				}
 			}*/
-			$exporter->pageByName( $page );
+
+			#Bug 8824: Only export pages the user can read
+			$title = Title::newFromText( $page );
+			if( is_null( $title ) ) continue; #TODO: perhaps output an <error> tag or something.
+			if( !$title->userCan( 'read' ) ) continue; #TODO: perhaps output an <error> tag or something.
+
+			$exporter->pageByTitle( $title );
 		}
 		
 		$exporter->closeStream();
@@ -116,7 +168,12 @@ function wfSpecialExport( $page = '' ) {
 	$titleObj = SpecialPage::getTitleFor( "Export" );
 	
 	$form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalUrl() ) );
-	$form .= wfOpenElement( 'textarea', array( 'name' => 'pages', 'cols' => 40, 'rows' => 10 ) ) . '</textarea><br />';
+
+	$form .= wfInputLabel( wfMsg( 'export-addcattext' ), 'catname', 'catname', 40 ) . ' ';
+	$form .= wfSubmitButton( wfMsg( 'export-addcat' ), array( 'name' => 'addcat' ) ) . '<br />';
+
+	$form .= wfOpenElement( 'textarea', array( 'name' => 'pages', 'cols' => 40, 'rows' => 10 ) ) . htmlspecialchars($page). '</textarea><br />';
+
 	if( $wgExportAllowHistory ) {
 		$form .= wfCheck( 'curonly', true, array( 'value' => 'true', 'id' => 'curonly' ) );
 		$form .= wfLabel( wfMsg( 'exportcuronly' ), 'curonly' ) . '<br />';