* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
*/
/**
*/
function wfSpecialImport( $page = '' ) {
global $wgUser, $wgOut, $wgRequest, $wgTitle, $wgImportSources;
+ global $wgImportTargetNamespace;
- ###
-# $wgOut->addWikiText( "Special:Import is not ready for this beta release, sorry." );
-# return;
- ###
+ $interwiki = false;
+ $namespace = $wgImportTargetNamespace;
+ $frompage = '';
+ $history = true;
if( $wgRequest->wasPosted() && $wgRequest->getVal( 'action' ) == 'submit') {
$isUpload = false;
- $interwiki = false;
-
+ $namespace = $wgRequest->getIntOrNull( 'namespace' );
+
switch( $wgRequest->getVal( "source" ) ) {
case "upload":
$isUpload = true;
case "interwiki":
$interwiki = $wgRequest->getVal( 'interwiki' );
$history = $wgRequest->getCheck( 'interwikiHistory' );
+ $frompage = $wgRequest->getText( "frompage" );
$source = ImportStreamSource::newFromInterwiki(
$interwiki,
- $wgRequest->getText( "frompage" ),
+ $frompage,
$history );
break;
default:
- $source = new WikiError( "Unknown import source type" );
+ $source = new WikiErrorMsg( "importunknownsource" );
}
if( WikiError::isError( $source ) ) {
$wgOut->addWikiText( wfEscapeWikiText( $source->getMessage() ) );
} else {
$wgOut->addWikiText( wfMsg( "importstart" ) );
-
+
$importer = new WikiImporter( $source );
+ if( !is_null( $namespace ) ) {
+ $importer->setTargetNamespace( $namespace );
+ }
$reporter = new ImportReporter( $importer, $isUpload, $interwiki );
-
+
$reporter->open();
$result = $importer->doImport();
$reporter->close();
-
+
if( WikiError::isError( $result ) ) {
$wgOut->addWikiText( wfMsg( "importfailed",
wfEscapeWikiText( $result->getMessage() ) ) );
}
}
- $action = $wgTitle->escapeLocalUrl( 'action=submit' );
+ $action = $wgTitle->getLocalUrl( 'action=submit' );
if( $wgUser->isAllowed( 'importupload' ) ) {
$wgOut->addWikiText( wfMsg( "importtext" ) );
<tr>
<td>
<select name='interwiki'>" );
- foreach( $wgImportSources as $interwiki ) {
- $iw = htmlspecialchars( $interwiki );
- $wgOut->addHTML( "<option value=\"$iw\">$iw</option>\n" );
+ foreach( $wgImportSources as $prefix ) {
+ $iw = htmlspecialchars( $prefix );
+ $selected = ($interwiki === $prefix) ? ' selected="selected"' : '';
+ $wgOut->addHTML( "<option value=\"$iw\"$selected>$iw</option>\n" );
}
$wgOut->addHTML( "
</select>
</td>
<td>" .
- wfInput( 'frompage', 40 ) .
+ wfInput( 'frompage', 50, $frompage ) .
"</td>
</tr>
<tr>
<td></td>
<td>" .
wfCheckLabel( wfMsg( 'import-interwiki-history' ),
- 'interwikiHistory', 'interwikiHistory', true ) .
+ 'interwikiHistory', 'interwikiHistory', $history ) .
"</td>
</tr>
+ <tr>
+ <td></td>
+ <td>
+ " . wfMsgHtml( 'import-interwiki-namespace' ) . " " .
+ HTMLnamespaceselector( $namespace, '' ) . "
+ </td>
+ </tr>
<tr>
<td></td>
<td>" .
/**
* Reporting callback
+ * @addtogroup SpecialPage
*/
class ImportReporter {
function __construct( $importer, $upload, $interwiki ) {
- $importer->setPageCallback( array( $this, 'reportPage' ) );
+ $importer->setPageOutCallback( array( $this, 'reportPage' ) );
$this->mPageCount = 0;
$this->mIsUpload = $upload;
$this->mInterwiki = $interwiki;
}
-
+
function open() {
global $wgOut;
$wgOut->addHtml( "<ul>\n" );
}
-
- function reportPage( $pageName ) {
- global $wgOut, $wgUser;
+
+ function reportPage( $title, $origTitle, $revisionCount, $successCount ) {
+ global $wgOut, $wgUser, $wgLang, $wgContLang;
+
$skin = $wgUser->getSkin();
- $title = Title::newFromText( $pageName );
+
$this->mPageCount++;
-
- $wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) . "</li>\n" );
-
- $log = new LogPage( 'import' );
- if( $this->mIsUpload ) {
- $log->addEntry( 'upload', $title, '' );
- } else {
- $interwiki = '[[:' . $this->mInterwiki . ':' .
- $title->getPrefixedText() . ']]';
- $log->addEntry( 'interwiki', $title,
- wfMsg( 'import-logentry-interwiki-source', $interwiki ) );
+
+ $localCount = $wgLang->formatNum( $successCount );
+ $contentCount = $wgContLang->formatNum( $successCount );
+
+ $wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) .
+ " " .
+ wfMsgExt( 'import-revision-count', array( 'parsemag', 'escape' ), $localCount ) .
+ "</li>\n" );
+
+ if( $successCount > 0 ) {
+ $log = new LogPage( 'import' );
+ if( $this->mIsUpload ) {
+ $detail = wfMsgForContent( 'import-logentry-upload-detail',
+ $contentCount );
+ $log->addEntry( 'upload', $title, $detail );
+ } else {
+ $interwiki = '[[:' . $this->mInterwiki . ':' .
+ $origTitle->getPrefixedText() . ']]';
+ $detail = wfMsgForContent( 'import-logentry-interwiki-detail',
+ $contentCount, $interwiki );
+ $log->addEntry( 'interwiki', $title, $detail );
+ }
+
+ $comment = $detail; // quick
+ $dbw = wfGetDB( DB_MASTER );
+ $nullRevision = Revision::newNullRevision(
+ $dbw, $title->getArticleId(), $comment, true );
+ $nullRevision->insertOn( $dbw );
}
}
-
+
function close() {
global $wgOut;
if( $this->mPageCount == 0 ) {
/**
*
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
*/
class WikiRevision {
- var $title = NULL;
+ var $title = null;
var $id = 0;
var $timestamp = "20010115000000";
var $user = 0;
var $comment = "";
var $minor = false;
- function setTitle( $text ) {
- $this->title = Title::newFromText( $text );
+ function setTitle( $title ) {
+ if( is_object( $title ) ) {
+ $this->title = $title;
+ } elseif( is_null( $title ) ) {
+ throw new MWException( "WikiRevision given a null title in import. You may need to adjust \$wgLegalTitleChars." );
+ } else {
+ throw new MWException( "WikiRevision given non-object title in import." );
+ }
}
function setID( $id ) {
return $this->title;
}
- function getID() {
+ function getID() {
return $this->id;
}
}
function importOldRevision() {
- $fname = "WikiImporter::importOldRevision";
- $dbw =& wfGetDB( DB_MASTER );
+ $dbw = wfGetDB( DB_MASTER );
# Sneak a single revision into place
$user = User::newFromName( $this->getUser() );
$created = true;
} else {
$created = false;
+
+ $prior = Revision::loadFromTimestamp( $dbw, $this->title, $this->timestamp );
+ if( !is_null( $prior ) ) {
+ // FIXME: this could fail slightly for multiple matches :P
+ wfDebug( __METHOD__ . ": skipping existing revision for [[" .
+ $this->title->getPrefixedText() . "]], timestamp " .
+ $this->timestamp . "\n" );
+ return false;
+ }
}
- # FIXME: Check for exact conflicts
# FIXME: Use original rev_id optionally
# FIXME: blah blah blah
if( $created ) {
wfDebug( __METHOD__ . ": running onArticleCreate\n" );
Article::onArticleCreate( $this->title );
- } else {
- if( $changed ) {
- wfDebug( __METHOD__ . ": running onArticleEdit\n" );
- Article::onArticleEdit( $this->title );
- }
- }
- if( $created || $changed ) {
+
+ wfDebug( __METHOD__ . ": running create updates\n" );
+ $article->createUpdates( $revision );
+
+ } elseif( $changed ) {
+ wfDebug( __METHOD__ . ": running onArticleEdit\n" );
+ Article::onArticleEdit( $this->title );
+
wfDebug( __METHOD__ . ": running edit updates\n" );
$article->editUpdates(
$this->getText(),
$this->timestamp,
$revId );
}
-
+
return true;
}
}
/**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * implements Special:Import
+ * @addtogroup SpecialPage
*/
class WikiImporter {
var $mSource = null;
var $mPageCallback = null;
+ var $mPageOutCallback = null;
var $mRevisionCallback = null;
+ var $mTargetNamespace = null;
var $lastfield;
function WikiImporter( $source ) {
print "$data\n";
} else {
global $wgOut;
- $wgOut->addHTML( "<li>$data</li>\n" );
+ $wgOut->addHTML( "<li>" . htmlspecialchars( $data ) . "</li>\n" );
}
}
return $previous;
}
+ /**
+ * Sets the action to perform as each page in the stream is completed.
+ * Callback accepts the page title (as a Title object), a second object
+ * with the original title form (in case it's been overridden into a
+ * local namespace), and a count of revisions.
+ *
+ * @param callable $callback
+ * @return callable
+ */
+ function setPageOutCallback( $callback ) {
+ $previous = $this->mPageOutCallback;
+ $this->mPageOutCallback = $callback;
+ return $previous;
+ }
+
/**
* Sets the action to perform as each page revision is reached.
* @param callable $callback
return $previous;
}
+ /**
+ * Set a target namespace to override the defaults
+ */
+ function setTargetNamespace( $namespace ) {
+ if( is_null( $namespace ) ) {
+ // Don't override namespaces
+ $this->mTargetNamespace = null;
+ } elseif( $namespace >= 0 ) {
+ // FIXME: Check for validity
+ $this->mTargetNamespace = intval( $namespace );
+ } else {
+ return false;
+ }
+ }
+
/**
* Default per-revision callback, performs the import.
* @param WikiRevision $revision
* @private
*/
function importRevision( &$revision ) {
- $dbw =& wfGetDB( DB_MASTER );
- $dbw->deadlockLoop( array( &$revision, 'importOldRevision' ) );
+ $dbw = wfGetDB( DB_MASTER );
+ return $dbw->deadlockLoop( array( &$revision, 'importOldRevision' ) );
}
/**
}
}
+ /**
+ * Notify the callback function when a </page> is closed.
+ * @param Title $title
+ * @param Title $origTitle
+ * @param int $revisionCount
+ * @param int $successCount number of revisions for which callback returned true
+ * @private
+ */
+ function pageOutCallback( $title, $origTitle, $revisionCount, $successCount ) {
+ if( is_callable( $this->mPageOutCallback ) ) {
+ call_user_func( $this->mPageOutCallback, $title, $origTitle,
+ $revisionCount, $successCount );
+ }
+ }
+
# XML parser callbacks from here out -- beware!
function donothing( $parser, $x, $y="" ) {
if( $name == 'siteinfo' ) {
xml_set_element_handler( $parser, "in_siteinfo", "out_siteinfo" );
} elseif( $name == 'page' ) {
+ $this->workRevisionCount = 0;
+ $this->workSuccessCount = 0;
xml_set_element_handler( $parser, "in_page", "out_page" );
} else {
return $this->throwXMLerror( "Expected <page>, got <$name>" );
xml_set_character_data_handler( $parser, "char_append" );
break;
case "revision":
- $this->workRevision = new WikiRevision;
- $this->workRevision->setTitle( $this->workTitle );
+ if( is_object( $this->pageTitle ) ) {
+ $this->workRevision = new WikiRevision;
+ $this->workRevision->setTitle( $this->pageTitle );
+ $this->workRevisionCount++;
+ } else {
+ // Skipping items due to invalid page title
+ $this->workRevision = null;
+ }
xml_set_element_handler( $parser, "in_revision", "out_revision" );
break;
default:
}
xml_set_element_handler( $parser, "in_mediawiki", "out_mediawiki" );
- $this->workTitle = NULL;
- $this->workRevision = NULL;
+ $this->pageOutCallback( $this->pageTitle, $this->origTitle,
+ $this->workRevisionCount, $this->workSuccessCount );
+
+ $this->workTitle = null;
+ $this->workRevision = null;
+ $this->workRevisionCount = 0;
+ $this->workSuccessCount = 0;
+ $this->pageTitle = null;
+ $this->origTitle = null;
}
function in_nothing( $parser, $name, $attribs ) {
switch( $this->appendfield ) {
case "title":
$this->workTitle = $this->appenddata;
- $this->pageCallback( $this->workTitle );
+ $this->origTitle = Title::newFromText( $this->workTitle );
+ if( !is_null( $this->mTargetNamespace ) && !is_null( $this->origTitle ) ) {
+ $this->pageTitle = Title::makeTitle( $this->mTargetNamespace,
+ $this->origTitle->getDbKey() );
+ } else {
+ $this->pageTitle = Title::newFromText( $this->workTitle );
+ }
+ if( is_null( $this->pageTitle ) ) {
+ // Invalid page title? Ignore the page
+ $this->notice( "Skipping invalid page title '$this->workTitle'" );
+ } else {
+ $this->pageCallback( $this->workTitle );
+ }
break;
case "id":
if ( $this->parenttag == 'revision' ) {
- $this->workRevision->setID( $this->appenddata );
+ if( $this->workRevision )
+ $this->workRevision->setID( $this->appenddata );
}
break;
case "text":
- $this->workRevision->setText( $this->appenddata );
+ if( $this->workRevision )
+ $this->workRevision->setText( $this->appenddata );
break;
case "username":
- $this->workRevision->setUsername( $this->appenddata );
+ if( $this->workRevision )
+ $this->workRevision->setUsername( $this->appenddata );
break;
case "ip":
- $this->workRevision->setUserIP( $this->appenddata );
+ if( $this->workRevision )
+ $this->workRevision->setUserIP( $this->appenddata );
break;
case "timestamp":
- $this->workRevision->setTimestamp( $this->appenddata );
+ if( $this->workRevision )
+ $this->workRevision->setTimestamp( $this->appenddata );
break;
case "comment":
- $this->workRevision->setComment( $this->appenddata );
+ if( $this->workRevision )
+ $this->workRevision->setComment( $this->appenddata );
break;
case "minor":
- $this->workRevision->setMinor( true );
+ if( $this->workRevision )
+ $this->workRevision->setMinor( true );
break;
default:
$this->debug( "Bad append: {$this->appendfield}" );
}
xml_set_element_handler( $parser, "in_page", "out_page" );
- $out = call_user_func_array( $this->mRevisionCallback,
- array( &$this->workRevision, &$this ) );
- if( !empty( $out ) ) {
- global $wgOut;
- $wgOut->addHTML( "<li>" . $out . "</li>\n" );
+ if( $this->workRevision ) {
+ $ok = call_user_func_array( $this->mRevisionCallback,
+ array( &$this->workRevision, &$this ) );
+ if( $ok ) {
+ $this->workSuccessCount++;
+ }
}
}
}
-/** @package MediaWiki */
+/**
+ * @todo document (e.g. one-sentence class description).
+ * @addtogroup SpecialPage
+ */
class ImportStringSource {
function ImportStringSource( $string ) {
$this->mString = $string;
}
}
-/** @package MediaWiki */
+/**
+ * @todo document (e.g. one-sentence class description).
+ * @addtogroup SpecialPage
+ */
class ImportStreamSource {
function ImportStreamSource( $handle ) {
$this->mHandle = $handle;
return fread( $this->mHandle, 32768 );
}
- function newFromFile( $filename ) {
+ static function newFromFile( $filename ) {
$file = @fopen( $filename, 'rt' );
if( !$file ) {
- return new WikiError( "Couldn't open import file" );
+ return new WikiErrorMsg( "importcantopen" );
}
return new ImportStreamSource( $file );
}
- function newFromUpload( $fieldname = "xmlimport" ) {
+ static function newFromUpload( $fieldname = "xmlimport" ) {
$upload =& $_FILES[$fieldname];
if( !isset( $upload ) || !$upload['name'] ) {
}
}
- function newFromURL( $url ) {
+ function newFromURL( $url, $method = 'GET' ) {
wfDebug( __METHOD__ . ": opening $url\n" );
- # 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;
+ # Use the standard HTTP fetch function; it times out
+ # quicker and sorts out user-agent problems which might
+ # otherwise prevent importing from large sites, such
+ # as the Wikimedia cluster, etc.
+ $data = Http::request( $method, $url );
+ if( $data !== false ) {
+ $file = tmpfile();
+ fwrite( $file, $data );
+ fflush( $file );
+ fseek( $file, 0 );
+ return new ImportStreamSource( $file );
+ } else {
+ return new WikiErrorMsg( 'importcantopen' );
+ }
}
- function newFromInterwiki( $interwiki, $page, $history=false ) {
- $base = Title::getInterwikiLink( $interwiki );
+ public static function newFromInterwiki( $interwiki, $page, $history=false ) {
$link = Title::newFromText( "$interwiki:Special:Export/$page" );
- if( empty( $base ) || empty( $link ) ) {
- return new WikiError( 'Bad interwiki link' );
+ if( is_null( $link ) || $link->getInterwiki() == '' ) {
+ return new WikiErrorMsg( 'importbadinterwiki' );
} else {
$params = $history ? 'history=1' : '';
$url = $link->getFullUrl( $params );
- return ImportStreamSource::newFromURL( $url );
+ # For interwikis, use POST to avoid redirects.
+ return ImportStreamSource::newFromURL( $url, "POST" );
}
}
}
-?>
+
dépôts / lhc / web / wiklou.git / blobdiff