Well-formedness error

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

diff --git a/includes/SpecialExport.php b/includes/SpecialExport.php
index 9f23fbb..8497113 100644 (file)
--- a/includes/SpecialExport.php
+++ b/includes/SpecialExport.php
@@ -1,12 +1,30 @@
-<?
+<?php
+# Copyright (C) 2003 Brion Vibber <brion@pobox.com>
+# http://www.mediawiki.org/
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or 
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# http://www.gnu.org/copyleft/gpl.html
 
 function wfSpecialExport( $page = "" ) {
-       global $wgOut, $wgLang;
+       global $wgOut, $wgLang, $wgRequest;
        
-       if( $_REQUEST['action'] == 'submit') {
-               $page = $_REQUEST['pages'];
-               $curonly = isset($_REQUEST['curonly']) ? true : false;
+       if( $wgRequest->getVal( 'action' ) == 'submit') {
+               $page = $wgRequest->getText( 'pages' );
+               $curonly = $wgRequest->getCheck( 'curonly' );
        } else {
+               # Pre-check the 'current version only' box in the UI
                $curonly = true;
        }
        
@@ -15,16 +33,17 @@ function wfSpecialExport( $page = "" ) {
                $pages = explode( "\n", $page );
                $xml = pages2xml( $pages, $curonly );
                echo $xml;
-               exit();
+               wfAbruptExit();
        }
        
        $wgOut->addWikiText( wfMsg( "exporttext" ) );
-       $action = wfLocalUrlE( $wgLang->SpecialPage( "Export" ) );
+       $titleObj = Title::makeTitle( NS_SPECIAL, "Export" );
+       $action = $titleObj->escapeLocalURL();
        $wgOut->addHTML( "
 <form method='post' action=\"$action\">
 <input type='hidden' name='action' value='submit' />
 <textarea name='pages' cols='40' rows='10'></textarea><br />
-<label><input type='checkbox' name='curonly' value='true' checked />
+<label><input type='checkbox' name='curonly' value='true' checked='checked' />
 " . wfMsg( "exportcuronly" ) . "</label><br />
 <input type='submit' />
 </form>
@@ -33,7 +52,8 @@ function wfSpecialExport( $page = "" ) {
 
 function pages2xml( $pages, $curonly = false ) {
        global $wgLanguageCode, $wgInputEncoding, $wgLang;
-       $xml = "<mediawiki version=\"0.1\" xml:ns=\"$wgLanguageCode\">\n";
+       $xml = "<" . "?xml version=\"1.0\" encoding=\"UTF-8\" ?" . ">\n" .
+               "<mediawiki version=\"0.1\" xml:lang=\"$wgLanguageCode\">\n";
        foreach( $pages as $page ) {
                $xml .= page2xml( $page, $curonly );
        }
@@ -46,6 +66,7 @@ function pages2xml( $pages, $curonly = false ) {
 function page2xml( $page, $curonly, $full = false ) {
        global $wgInputCharset, $wgLang;
        $title = Title::NewFromText( $page );
+       if( !$title ) return "";
        $t = wfStrencode( $title->getDBKey() );
        $ns = $title->getNamespace();
        $sql = "SELECT cur_id as id,cur_timestamp as timestamp,cur_user as user,cur_user_text as user_text," .
@@ -64,12 +85,12 @@ function page2xml( $page, $curonly, $full = false ) {
                }
                if( !$curonly ) {
                        $sql = "SELECT old_id as id,old_timestamp as timestamp, old_user as user, old_user_text as user_text," .
-                               "old_comment as comment, old_text as text FROM old " .
+                               "old_comment as comment, old_text as text, old_flags as flags FROM old " .
                                "WHERE old_namespace=$ns AND old_title='$t' ORDER BY old_timestamp";
                        $res = wfQuery( $sql, DB_READ );
 
-                       while( $s = wfFetchObject( $res ) ) {
-                               $xml .= revision2xml( $s, $full, false );
+                       while( $s2 = wfFetchObject( $res ) ) {
+                               $xml .= revision2xml( $s2, $full, false );
                        }
                }
                $xml .= revision2xml( $s, $full, true );
@@ -94,14 +115,14 @@ function revision2xml( $s, $full, $cur ) {
                $u = "<ip>" . htmlspecialchars( $s->user_text ) . "</ip>";
        }
        $xml .= "      <contributor>$u</contributor>\n";
-       if($s->minor) {
+       if( !empty( $s->minor ) ) {
                $xml .= "      <minor/>\n";
        }
        if($s->comment != "") {
                $c = htmlspecialchars( $s->comment );
                $xml .= "      <comment>$c</comment>\n";
        }
-       $t = htmlspecialchars( $s->text );
+       $t = htmlspecialchars( Article::getRevisionText( $s, "" ) );
        $xml .= "      <text>$t</text>\n";
        $xml .= "    </revision>\n";
        return $xml;