Another fix.

[lhc/web/wiklou.git] / includes / SpecialExport.php

diff --git a/includes/SpecialExport.php b/includes/SpecialExport.php
index a402b65..610f627 100644 (file)
--- a/includes/SpecialExport.php
+++ b/includes/SpecialExport.php
@@ -18,27 +18,17 @@
 # http://www.gnu.org/copyleft/gpl.html
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
-/** */
-require_once( 'Export.php' );
-
 /**
  *
  */
 function wfSpecialExport( $page = '' ) {
        global $wgOut, $wgRequest, $wgExportAllowListContributors;
        global $wgExportAllowHistory, $wgExportMaxHistory;
-       $maxLimit = 200;
 
        $curonly = true;
-       $fullHistory = array(
-               'dir' => 'asc',
-               'offset' => false,
-               'limit' => $maxLimit,
-       );
        if( $wgRequest->wasPosted() ) {
                $page = $wgRequest->getText( 'pages' );
                $curonly = $wgRequest->getCheck( 'curonly' );
@@ -53,13 +43,13 @@ function wfSpecialExport( $page = '' ) {
                $history = array(
                        'dir' => 'asc',
                        'offset' => false,
-                       'limit' => $maxLimit,
+                       'limit' => $wgExportMaxHistory,
                );
                $historyCheck = $wgRequest->getCheck( 'history' );
                if ( $curonly ) {
-                       $history = MW_EXPORT_CURRENT;
+                       $history = WikiExporter::CURRENT;
                } elseif ( !$historyCheck ) {
-                       if ( $limit > 0 && $limit < $maxLimit ) {
+                       if ( $limit > 0 && $limit < $wgExportMaxHistory ) {
                                $history['limit'] = $limit;
                        }
                        if ( !is_null( $offset ) ) {
@@ -74,14 +64,14 @@ function wfSpecialExport( $page = '' ) {
                $page = $wgRequest->getText( 'pages', $page );
                $historyCheck = $wgRequest->getCheck( 'history' );
                if( $historyCheck ) {
-                       $history = MW_EXPORT_FULL;
+                       $history = WikiExporter::FULL;
                } else {
-                       $history = MW_EXPORT_CURRENT;
+                       $history = WikiExporter::CURRENT;
                }
        }
        if( !$wgExportAllowHistory ) {
                // Override
-               $history = MW_EXPORT_CURRENT;
+               $history = WikiExporter::CURRENT;
        }
        
        $list_authors = $wgRequest->getCheck( 'listauthors' );
@@ -92,21 +82,17 @@ function wfSpecialExport( $page = '' ) {
                
                // Cancel output buffering and gzipping if set
                // This should provide safer streaming for pages with history
-               while( $status = ob_get_status() ) {
-                       ob_end_clean();
-                       if( $status['name'] == 'ob_gzhandler' ) {
-                               header( 'Content-Encoding:' );
-                       }
-               }
+               wfResetOutputBuffers();
                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();
                
                foreach( $pages as $page ) {
+                       /*
                        if( $wgExportMaxHistory && !$curonly ) {
                                $title = Title::newFromText( $page );
                                if( $title ) {
@@ -117,8 +103,14 @@ function wfSpecialExport( $page = '' ) {
                                                continue;
                                        }
                                }
-                       }
-                       $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();
@@ -126,7 +118,7 @@ function wfSpecialExport( $page = '' ) {
        }
 
        $wgOut->addWikiText( wfMsg( "exporttext" ) );
-       $titleObj = Title::makeTitle( NS_SPECIAL, "Export" );
+       $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 />';