Revert r29671, it was based on a misunderstanding of the purpose of the LoggedOut...

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

diff --git a/includes/SpecialExport.php b/includes/SpecialExport.php
index dc52e00..12bd4d5 100644 (file)
--- a/includes/SpecialExport.php
+++ b/includes/SpecialExport.php
@@ -18,24 +18,60 @@
 # 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;
+}
+
 /**
  *
  */
 function wfSpecialExport( $page = '' ) {
-       global $wgOut, $wgRequest, $wgExportAllowListContributors;
+       global $wgOut, $wgRequest, $wgSitename, $wgExportAllowListContributors;
        global $wgExportAllowHistory, $wgExportMaxHistory;
 
        $curonly = true;
-       $fullHistory = array(
-               'dir' => 'asc',
-               'offset' => false,
-               'limit' => $wgExportMaxHistory,
-       );
-       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 == '' ) {
                $page = $wgRequest->getText( 'pages' );
                $curonly = $wgRequest->getCheck( 'curonly' );
                $rawOffset = $wgRequest->getVal( 'offset' );
@@ -65,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 );
@@ -74,7 +112,10 @@ function wfSpecialExport( $page = '' ) {
                } else {
                        $history = WikiExporter::CURRENT;
                }
+               
+               if( $page != '' ) $doexport = true;
        }
+
        if( !$wgExportAllowHistory ) {
                // Override
                $history = WikiExporter::CURRENT;
@@ -83,21 +124,21 @@ 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
                // 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" );
+               if( $wgRequest->getCheck( 'wpDownload' ) ) {
+                       // Provide a sane filename suggestion
+                       $filename = urlencode( $wgSitename . '-' . wfTimestampNow() . '.xml' );
+                       $wgRequest->response()->header( "Content-disposition: attachment;filename={$filename}" );
+               }
                $pages = explode( "\n", $page );
 
-               $db =& wfGetDB( DB_SLAVE );
+               $db = wfGetDB( DB_SLAVE );
                $exporter = new WikiExporter( $db, $history );
                $exporter->list_authors = $list_authors ;
                $exporter->openStream();
@@ -115,27 +156,41 @@ 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();
                return;
        }
 
-       $wgOut->addWikiText( wfMsg( "exporttext" ) );
-       $titleObj = Title::makeTitle( NS_SPECIAL, "Export" );
+       $self = SpecialPage::getTitleFor( 'Export' );
+       $wgOut->addHtml( wfMsgExt( 'exporttext', 'parse' ) );
+       
+       $form = Xml::openElement( 'form', array( 'method' => 'post',
+               'action' => $self->getLocalUrl( 'action=submit' ) ) );
+       
+       $form .= Xml::inputLabel( wfMsg( 'export-addcattext' )  , 'catname', 'catname', 40 ) . '&nbsp;';
+       $form .= Xml::submitButton( wfMsg( 'export-addcat' ), array( 'name' => 'addcat' ) ) . '<br />';
+       
+       $form .= Xml::openElement( 'textarea', array( 'name' => 'pages', 'cols' => 40, 'rows' => 10 ) );
+       $form .= htmlspecialchars( $page );
+       $form .= Xml::closeElement( 'textarea' );
+       $form .= '<br />';
        
-       $form = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalUrl() ) );
-       $form .= wfOpenElement( 'textarea', array( 'name' => 'pages', 'cols' => 40, 'rows' => 10 ) ) . '</textarea><br />';
        if( $wgExportAllowHistory ) {
-               $form .= wfCheck( 'curonly', true, array( 'value' => 'true', 'id' => 'curonly' ) );
-               $form .= wfLabel( wfMsg( 'exportcuronly' ), 'curonly' ) . '<br />';
+               $form .= Xml::checkLabel( wfMsg( 'exportcuronly' ), 'curonly', 'curonly', true ) . '<br />';
        } else {
-               $wgOut->addWikiText( wfMsg( 'exportnohistory' ) );
+               $wgOut->addHtml( wfMsgExt( 'exportnohistory', 'parse' ) );
        }
-       $form .= wfHidden( 'action', 'submit' );
-       $form .= wfSubmitButton( wfMsg( 'export-submit' ) ) . '</form>';
+       $form .= Xml::checkLabel( wfMsg( 'export-download' ), 'wpDownload', 'wpDownload', true ) . '<br />';
+       
+       $form .= Xml::submitButton( wfMsg( 'export-submit' ) );
+       $form .= Xml::closeElement( 'form' );
        $wgOut->addHtml( $form );
-}
-
-?>
+}
\ No newline at end of file