* @subpackage SpecialPage
*/
+/** */
require_once( 'WikiError.php' );
/**
* Constructor
*/
function wfSpecialImport( $page = '' ) {
- global $wgOut, $wgLang, $wgRequest, $wgTitle;
- global $wgImportSources;
+ global $wgUser, $wgOut, $wgRequest, $wgTitle, $wgImportSources;
###
# $wgOut->addWikiText( "Special:Import is not ready for this beta release, sorry." );
###
if( $wgRequest->wasPosted() && $wgRequest->getVal( 'action' ) == 'submit') {
- $importer = new WikiImporter();
-
switch( $wgRequest->getVal( "source" ) ) {
case "upload":
- $result = $importer->setupFromUpload( "xmlimport" );
+ if( $wgUser->isAllowed( 'importupload' ) ) {
+ $source = ImportStreamSource::newFromUpload( "xmlimport" );
+ } else {
+ return $wgOut->permissionRequired( 'importupload' );
+ }
break;
case "interwiki":
- $result = $importer->setupFromInterwiki(
+ $source = ImportStreamSource::newFromInterwiki(
$wgRequest->getVal( "interwiki" ),
$wgRequest->getText( "frompage" ) );
break;
default:
- $result = new WikiError( "Unknown import source type" );
+ $source = new WikiError( "Unknown import source type" );
}
- if( WikiError::isError( $result ) ) {
- $wgOut->addWikiText( wfEscapeWikiText( $result->getMessage() ) );
+ if( WikiError::isError( $source ) ) {
+ $wgOut->addWikiText( wfEscapeWikiText( $source->getMessage() ) );
} else {
- $importer->setRevisionHandler( "wfImportOldRevision" );
+ $importer = new WikiImporter( $source );
$result = $importer->doImport();
if( WikiError::isError( $result ) ) {
- $wgOut->addHTML( "<p>" . wfMsg( "importfailed",
- htmlspecialchars( $result->getMessage() ) ) . "</p>" );
+ $wgOut->addWikiText( wfMsg( "importfailed",
+ wfEscapeWikiText( $result->getMessage() ) ) );
} else {
# Success!
- $wgOut->addHTML( "<p>" . wfMsg( "importsuccess" ) . "</p>" );
+ $wgOut->addWikiText( wfMsg( "importsuccess" ) );
}
}
}
- $wgOut->addWikiText( "<p>" . wfMsg( "importtext" ) . "</p>" );
$action = $wgTitle->escapeLocalUrl( 'action=submit' );
- $wgOut->addHTML( "
+
+ if( $wgUser->isAllowed( 'importupload' ) ) {
+ $wgOut->addWikiText( wfMsg( "importtext" ) );
+ $wgOut->addHTML( "
<fieldset>
- <legend>Upload XML</legend>
+ <legend>" . wfMsgHtml('upload') . "</legend>
<form enctype='multipart/form-data' method='post' action=\"$action\">
<input type='hidden' name='action' value='submit' />
<input type='hidden' name='source' value='upload' />
<input type='hidden' name='MAX_FILE_SIZE' value='2000000' />
<input type='file' name='xmlimport' value='' size='30' />
- <input type='submit' value='" . htmlspecialchars( wfMsg( "uploadbtn" ) ) . "'/>
+ <input type='submit' value='" . wfMsgHtml( "uploadbtn" ) . "'/>
</form>
</fieldset>
" );
-
+ } else {
+ if( empty( $wgImportSources ) ) {
+ $wgOut->addWikiText( wfMsg( 'importnosources' ) );
+ }
+ }
+
if( !empty( $wgImportSources ) ) {
$wgOut->addHTML( "
<fieldset>
- <legend>Interwiki import</legend>
+ <legend>" . wfMsgHtml('importinterwiki') . "</legend>
<form method='post' action=\"$action\">
<input type='hidden' name='action' value='submit' />
<input type='hidden' name='source' value='interwiki' />
}
}
-function wfImportOldRevision( &$revision ) {
- $dbw =& wfGetDB( DB_MASTER );
- $dbw->deadlockLoop( array( &$revision, 'importOldRevision' ) );
-}
-
/**
*
* @package MediaWiki
var $user_text = "";
var $text = "";
var $comment = "";
+ var $minor = false;
function setTitle( $text ) {
$this->title = Title::newFromText( $text );
function setTimestamp( $ts ) {
# 2003-08-05T18:30:02Z
- $this->timestamp = preg_replace( '/^(....)-(..)-(..)T(..):(..):(..)Z$/', '$1$2$3$4$5$6', $ts );
+ $this->timestamp = wfTimestamp( TS_MW, $ts );
}
function setUsername( $user ) {
$this->comment = $text;
}
+ function setMinor( $minor ) {
+ $this->minor = (bool)$minor;
+ }
+
function getTitle() {
return $this->title;
}
function getComment() {
return $this->comment;
}
+
+ function getMinor() {
+ return $this->minor;
+ }
function importOldRevision() {
$fname = "WikiImporter::importOldRevision";
# Sneak a single revision into place
$user = User::newFromName( $this->getUser() );
+ if( $user ) {
+ $userId = intval( $user->getId() );
+ $userText = $user->getName();
+ } else {
+ $userId = 0;
+ $userText = $this->getUser();
+ }
+ // avoid memory leak...?
+ global $wgLinkCache;
+ $wgLinkCache->clear();
+
$article = new Article( $this->title );
$pageId = $article->getId();
if( $pageId == 0 ) {
'page' => $pageId,
'text' => $this->getText(),
'comment' => $this->getComment(),
- 'user' => IntVal( $user->getId() ),
- 'user_text' => $user->getName(),
+ 'user' => $userId,
+ 'user_text' => $userText,
'timestamp' => $this->timestamp,
- 'minor_edit' => 0
+ 'minor_edit' => $this->minor,
) );
$revId = $revision->insertOn( $dbw );
$article->updateIfNewerOn( $dbw, $revision );
* @subpackage SpecialPage
*/
class WikiImporter {
- var $mSource = NULL;
- var $mRevisionHandler = NULL;
+ var $mSource = null;
+ var $mPageCallback = null;
+ var $mRevisionCallback = null;
var $lastfield;
- function WikiImporter() {
- $this->setRevisionHandler( array( &$this, "defaultRevisionHandler" ) );
+ function WikiImporter( $source ) {
+ $this->setRevisionCallback( array( &$this, "importRevision" ) );
+ $this->mSource = $source;
}
function throwXmlError( $err ) {
$this->debug( "FAILURE: $err" );
- }
-
- function setupFromFile( $filename ) {
- $this->mSource = @file_get_contents( $filename );
- if( $this->mSource === false ) {
- return new WikiError( "Couldn't open import file" );
- }
- return true;
- }
-
- function setupFromUpload( $fieldname = "xmlimport" ) {
- global $wgOut;
-
- $upload =& $_FILES[$fieldname];
-
- if( !isset( $upload ) ) {
- return new WikiErrorMsg( 'importnofile' );
- }
- if( !empty( $upload['error'] ) ) {
- return new WikiErrorMsg( 'importuploaderror', $upload['error'] );
- }
- $fname = $upload['tmp_name'];
- if( is_uploaded_file( $fname ) ) {
- return $this->setupFromFile( $fname );
- } else {
- return new WikiErrorMsg( 'importnofile' );
- }
- }
-
- function setupFromURL( $url ) {
- # fopen-wrappers are normally turned off for security.
- ini_set( "allow_url_fopen", true );
- $ret = $this->setupFromFile( $url );
- ini_set( "allow_url_fopen", false );
- return $ret;
- }
-
- function setupFromInterwiki( $interwiki, $page ) {
- $base = Title::getInterwikiLink( $interwiki );
- if( empty( $base ) ) {
- return new WikiError( 'Bad interwiki link' );
- } else {
- $import = wfUrlencode( "Special:Export/$page" );
- $url = str_replace( "$1", $import, $base );
- $this->notice( "Importing from $url" );
- return $this->setupFromURL( $url );
- }
+ wfDebug( "WikiImporter XML error: $err\n" );
}
# --------------
# case folding violates XML standard, turn it off
xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
- xml_set_object( $parser, &$this );
+ xml_set_object( $parser, $this );
xml_set_element_handler( $parser, "in_start", "" );
- if( !xml_parse( $parser, $this->mSource, true ) ) {
- return new WikiXmlError( $parser );
- }
+ $offset = 0; // for context extraction on error reporting
+ do {
+ $chunk = $this->mSource->readChunk();
+ if( !xml_parse( $parser, $chunk, $this->mSource->atEnd() ) ) {
+ wfDebug( "WikiImporter::doImport encountered XML parsing error\n" );
+ return new WikiXmlError( $parser, 'XML import parse failure', $chunk, $offset );
+ }
+ $offset += strlen( $chunk );
+ } while( $chunk !== false && !$this->mSource->atEnd() );
xml_parser_free( $parser );
return true;
}
function debug( $data ) {
- #$this->notice( "DEBUG: $data\n" );
+ #wfDebug( "IMPORT: $data\n" );
}
function notice( $data ) {
}
}
- function setRevisionHandler( $functionref ) {
- $this->mRevisionHandler = $functionref;
+ /**
+ * Sets the action to perform as each new page in the stream is reached.
+ * @param callable $callback
+ * @return callable
+ */
+ function setPageCallback( $callback ) {
+ $previous = $this->mPageCallback;
+ $this->mPageCallback = $callback;
+ return $previous;
+ }
+
+ /**
+ * Sets the action to perform as each page revision is reached.
+ * @param callable $callback
+ * @return callable
+ */
+ function setRevisionCallback( $callback ) {
+ $previous = $this->mRevisionCallback;
+ $this->mRevisionCallback = $callback;
+ return $previous;
+ }
+
+ /**
+ * Default per-revision callback, performs the import.
+ * @param WikiRevision $revision
+ * @access private
+ */
+ function importRevision( &$revision ) {
+ $dbw =& wfGetDB( DB_MASTER );
+ $dbw->deadlockLoop( array( &$revision, 'importOldRevision' ) );
}
-
- function defaultRevisionHandler( &$revision ) {
+
+ /**
+ * Alternate per-revision callback, for debugging.
+ * @param WikiRevision $revision
+ * @access private
+ */
+ function debugRevisionHandler( &$revision ) {
$this->debug( "Got revision:" );
if( is_object( $revision->title ) ) {
$this->debug( "-- Title: " . $revision->title->getPrefixedText() );
$this->debug( "-- Text: " . $revision->text );
}
+ /**
+ * Notify the callback function when a new <page> is reached.
+ * @param Title $title
+ * @access private
+ */
+ function pageCallback( $title ) {
+ if( is_callable( $this->mPageCallback ) ) {
+ call_user_func( $this->mPageCallback, $title );
+ }
+ }
# XML parser callbacks from here out -- beware!
function in_mediawiki( $parser, $name, $attribs ) {
$this->debug( "in_mediawiki $name" );
- if( $name != "page" ) {
+ if( $name == 'siteinfo' ) {
+ xml_set_element_handler( $parser, "in_siteinfo", "out_siteinfo" );
+ } elseif( $name == 'page' ) {
+ xml_set_element_handler( $parser, "in_page", "out_page" );
+ } else {
return $this->throwXMLerror( "Expected <page>, got <$name>" );
}
- xml_set_element_handler( $parser, "in_page", "out_page" );
}
function out_mediawiki( $parser, $name ) {
$this->debug( "out_mediawiki $name" );
}
xml_set_element_handler( $parser, "donothing", "donothing" );
}
+
+
+ function in_siteinfo( $parser, $name, $attribs ) {
+ // no-ops for now
+ $this->debug( "in_siteinfo $name" );
+ switch( $name ) {
+ case "sitename":
+ case "base":
+ case "generator":
+ case "case":
+ case "namespaces":
+ case "namespace":
+ break;
+ default:
+ return $this->throwXMLerror( "Element <$name> not allowed in <siteinfo>." );
+ }
+ }
+
+ function out_siteinfo( $parser, $name ) {
+ if( $name == "siteinfo" ) {
+ xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
+ }
+ }
+
function in_page( $parser, $name, $attribs ) {
$this->debug( "in_page $name" );
}
xml_set_element_handler( $parser, "in_$this->parenttag", "out_$this->parenttag" );
xml_set_character_data_handler( $parser, "donothing" );
+
switch( $this->appendfield ) {
case "title":
$this->workTitle = $this->appenddata;
+ $this->pageCallback( $this->workTitle );
break;
case "text":
$this->workRevision->setText( $this->appenddata );
case "comment":
$this->workRevision->setComment( $this->appenddata );
break;
+ case "minor":
+ $this->workRevision->setMinor( true );
+ break;
default:
$this->debug( "Bad append: {$this->appendfield}" );
}
case "id":
case "timestamp":
case "comment":
+ case "minor":
case "text":
$this->parenttag = "revision";
$this->appendfield = $name;
}
xml_set_element_handler( $parser, "in_page", "out_page" );
- $out = call_user_func( $this->mRevisionHandler, &$this->workRevision, &$this );
+ $out = call_user_func_array( $this->mRevisionCallback,
+ array( &$this->workRevision, &$this ) );
if( !empty( $out ) ) {
global $wgOut;
$wgOut->addHTML( "<li>" . $out . "</li>\n" );
switch( $name ) {
case "username":
case "ip":
+ case "id":
$this->parenttag = "contributor";
$this->appendfield = $name;
xml_set_element_handler( $parser, "in_nothing", "out_append" );
}
+/** @package MediaWiki */
+class ImportStringSource {
+ function ImportStringSource( $string ) {
+ $this->mString = $string;
+ $this->mRead = false;
+ }
+
+ function atEnd() {
+ return $this->mRead;
+ }
+
+ function readChunk() {
+ if( $this->atEnd() ) {
+ return false;
+ } else {
+ $this->mRead = true;
+ return $this->mString;
+ }
+ }
+}
+
+/** @package MediaWiki */
+class ImportStreamSource {
+ function ImportStreamSource( $handle ) {
+ $this->mHandle = $handle;
+ }
+
+ function atEnd() {
+ return feof( $this->mHandle );
+ }
+
+ function readChunk() {
+ return fread( $this->mHandle, 32768 );
+ }
+
+ function newFromFile( $filename ) {
+ $file = @fopen( $filename, 'rt' );
+ if( !$file ) {
+ return new WikiError( "Couldn't open import file" );
+ }
+ return new ImportStreamSource( $file );
+ }
+
+ function newFromUpload( $fieldname = "xmlimport" ) {
+ global $wgOut;
+
+ $upload =& $_FILES[$fieldname];
+
+ if( !isset( $upload ) ) {
+ return new WikiErrorMsg( 'importnofile' );
+ }
+ if( !empty( $upload['error'] ) ) {
+ return new WikiErrorMsg( 'importuploaderror', $upload['error'] );
+ }
+ $fname = $upload['tmp_name'];
+ if( is_uploaded_file( $fname ) ) {
+ return ImportStreamSource::newFromFile( $fname );
+ } else {
+ return new WikiErrorMsg( 'importnofile' );
+ }
+ }
+
+ function newFromURL( $url ) {
+ # fopen-wrappers are normally turned off for security.
+ ini_set( "allow_url_fopen", true );
+ $ret = ImportStreamSource::newFromFile( $url );
+ ini_set( "allow_url_fopen", false );
+ return $ret;
+ }
+
+ function newFromInterwiki( $interwiki, $page ) {
+ $base = Title::getInterwikiLink( $interwiki );
+ if( empty( $base ) ) {
+ return new WikiError( 'Bad interwiki link' );
+ } else {
+ $import = wfUrlencode( "Special:Export/$page" );
+ $url = str_replace( "$1", $import, $base );
+ return ImportStreamSource::newFromURL( $url );
+ }
+ }
+}
+
?>
dépôts / lhc / web / wiklou.git / blobdiff