global $wgImportTargetNamespace;
$interwiki = false;
- $articleName = '';
$namespace = $wgImportTargetNamespace;
$frompage = '';
$history = true;
+ if ( wfReadOnly() ) {
+ $wgOut->readOnlyPage();
+ return;
+ }
+
if( $wgRequest->wasPosted() && $wgRequest->getVal( 'action' ) == 'submit') {
$isUpload = false;
- $articleName = htmlspecialchars( $wgRequest->getText( 'articlename' ) );
$namespace = $wgRequest->getIntOrNull( 'namespace' );
switch( $wgRequest->getVal( "source" ) ) {
}
if( WikiError::isError( $source ) ) {
- $wgOut->addWikiText( '<p class="error">' . wfMsg( "importfailed", wfEscapeWikiText( $source->getMessage() ) ) . '</p>' );
+ $wgOut->wrapWikiMsg( '<p class="error">$1</p>', array( 'importfailed', $source->getMessage() ) );
} else {
- $wgOut->addWikiText( wfMsg( "importstart" ) );
+ $wgOut->addWikiMsg( "importstart" );
$importer = new WikiImporter( $source );
if( !is_null( $namespace ) ) {
$importer->setTargetNamespace( $namespace );
}
- if( !is_null( $articleName ) ) {
- $importer->setTargetArticleName( $articleName );
- }
$reporter = new ImportReporter( $importer, $isUpload, $interwiki );
$reporter->open();
if( WikiError::isError( $result ) ) {
# No source or XML parse error
- $wgOut->addWikiText( '<p class="error">' . wfMsg( "importfailed", wfEscapeWikiText( $result->getMessage() ) ) . '</p>' );
+ $wgOut->wrapWikiMsg( '<p class="error">$1</p>', array( 'importfailed', $result->getMessage() ) );
} elseif( WikiError::isError( $resultCount ) ) {
# Zero revisions
- $wgOut->addWikiText( '<p class="error">' . wfMsg( "importfailed", wfEscapeWikiText( $resultCount->getMessage() ) ) . '</p>' );
+ $wgOut->wrapWikiMsg( '<p class="error">$1</p>', array( 'importfailed', $resultCount->getMessage() ) );
} else {
# Success!
- $wgOut->addWikiText( wfMsg( "importsuccess" ) );
+ $wgOut->addWikiMsg( 'importsuccess' );
}
$wgOut->addWikiText( '<hr />' );
}
}
- $action = $wgTitle->escapeLocalUrl( 'action=submit' );
+ $action = $wgTitle->getLocalUrl( 'action=submit' );
if( $wgUser->isAllowed( 'importupload' ) ) {
- $wgOut->addWikiText( wfMsg( "importtext" ) );
+ $wgOut->addWikiMsg( "importtext" );
$wgOut->addHTML(
Xml::openElement( 'fieldset' ).
Xml::element( 'legend', null, wfMsg( 'upload' ) ) .
Xml::openElement( 'form', array( 'enctype' => 'multipart/form-data', 'method' => 'post', 'action' => $action ) ) .
Xml::hidden( 'action', 'submit' ) .
Xml::hidden( 'source', 'upload' ) .
- Xml::hidden( 'MAX_FILE_SIZE', '2000000' ) .
- "<input type='file' name='xmlimport' value='' size='30' />" . // No Xml function for type=file? Todo?
+ Xml::input( 'xmlimport', 50, '', array( 'type' => 'file' ) ) . ' ' .
Xml::submitButton( wfMsg( 'uploadbtn' ) ) .
Xml::closeElement( 'form' ) .
- Xml::closeElement( 'fieldset' ) );
+ Xml::closeElement( 'fieldset' )
+ );
} else {
if( empty( $wgImportSources ) ) {
- $wgOut->addWikiText( wfMsg( 'importnosources' ) );
+ $wgOut->addWikiMsg( 'importnosources' );
}
}
wfMsgExt( 'import-interwiki-text', array( 'parse' ) ) .
Xml::hidden( 'action', 'submit' ) .
Xml::hidden( 'source', 'interwiki' ) .
- Xml::openElement( 'table' ) .
+ Xml::openElement( 'table', array( 'id' => 'mw-import-table' ) ) .
"<tr>
<td>" .
- Xml::openElement( 'select', array( 'name' => 'interwiki' ) ) );
+ Xml::openElement( 'select', array( 'name' => 'interwiki' ) )
+ );
foreach( $wgImportSources as $prefix ) {
- $iw = htmlspecialchars( $prefix );
- $selected = ($interwiki === $prefix) ? ' selected="selected"' : '';
- $wgOut->addHTML( Xml::option( $iw, $iw, $selected ) );
+ $selected = ( $interwiki === $prefix ) ? ' selected="selected"' : '';
+ $wgOut->addHTML( Xml::option( $prefix, $prefix, $selected ) );
}
- $wgOut->addHTML(
+ $wgOut->addHTML(
Xml::closeElement( 'select' ) .
"</td>
<td>" .
"</td>
</tr>
<tr>
- <td></td>
+ <td>
+ </td>
<td>" .
Xml::checkLabel( wfMsg( 'import-interwiki-history' ), 'interwikiHistory', 'interwikiHistory', $history ) .
"</td>
</tr>
<tr>
- <td></td>
- <td>" .
- Xml::inputLabel( wfMsg( 'import-articlename' ), 'articlename', 'articlename', 50, $articleName ) .
- "</td>
- </tr>
- <tr>
- <td></td>
+ <td>
+ </td>
<td>" .
Xml::label( wfMsg( 'import-interwiki-namespace' ), 'namespace' ) .
Xml::namespaceSelector( $namespace, '' ) .
"</td>
</tr>
<tr>
- <td></td>
+ <td>
+ </td>
<td>" .
Xml::submitButton( wfMsg( 'import-interwiki-submit' ) ) .
"</td>
</tr>" .
Xml::closeElement( 'table' ).
Xml::closeElement( 'form' ) .
- Xml::closeElement( 'fieldset' ) );
+ Xml::closeElement( 'fieldset' )
+ );
}
}
$contentCount = $wgContLang->formatNum( $successCount );
if( $successCount > 0 ) {
- $wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) .
- " " .
+ $wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) . " " .
wfMsgExt( 'import-revision-count', array( 'parsemag', 'escape' ), $localCount ) .
- "</li>\n" );
+ "</li>\n"
+ );
$log = new LogPage( 'import' );
if( $this->mIsUpload ) {
- $detail = wfMsgForContent( 'import-logentry-upload-detail',
+ $detail = wfMsgExt( 'import-logentry-upload-detail', array( 'content', 'parsemag' ),
$contentCount );
$log->addEntry( 'upload', $title, $detail );
} else {
$interwiki = '[[:' . $this->mInterwiki . ':' .
$origTitle->getPrefixedText() . ']]';
- $detail = wfMsgForContent( 'import-logentry-interwiki-detail',
+ $detail = wfMsgExt( 'import-logentry-interwiki-detail', array( 'content', 'parsemag' ),
$contentCount, $interwiki );
$log->addEntry( 'interwiki', $title, $detail );
}
$nullRevision = Revision::newNullRevision(
$dbw, $title->getArticleId(), $comment, true );
$nullRevision->insertOn( $dbw );
+ # Update page record
+ $article = new Article( $title );
+ $article->updateRevisionOn( $dbw, $nullRevision );
} else {
- $wgOut->addHtml( '<li>' . wfMsgExt( 'import-nonewrevisions', array( 'parse', ) ) . '</li>' );
+ $wgOut->addHtml( '<li>' . wfMsgHtml( 'import-nonewrevisions' ) . '</li>' );
}
-
}
function close() {
function setMinor( $minor ) {
$this->minor = (bool)$minor;
}
+
+ function setSrc( $src ) {
+ $this->src = $src;
+ }
+
+ function setFilename( $filename ) {
+ $this->filename = $filename;
+ }
+
+ function setSize( $size ) {
+ $this->size = intval( $size );
+ }
function getTitle() {
return $this->title;
function getMinor() {
return $this->minor;
}
+
+ function getSrc() {
+ return $this->src;
+ }
+
+ function getFilename() {
+ return $this->filename;
+ }
+
+ function getSize() {
+ return $this->size;
+ }
function importOldRevision() {
$dbw = wfGetDB( DB_MASTER );
}
// avoid memory leak...?
- $linkCache =& LinkCache::singleton();
+ $linkCache = LinkCache::singleton();
$linkCache->clear();
$article = new Article( $this->title );
return true;
}
+
+ function importUpload() {
+ wfDebug( __METHOD__ . ": STUB\n" );
+
+ /**
+ // from file revert...
+ $source = $this->file->getArchiveVirtualUrl( $this->oldimage );
+ $comment = $wgRequest->getText( 'wpComment' );
+ // TODO: Preserve file properties from database instead of reloading from file
+ $status = $this->file->upload( $source, $comment, $comment );
+ if( $status->isGood() ) {
+ */
+
+ /**
+ // from file upload...
+ $this->mLocalFile = wfLocalFile( $nt );
+ $this->mDestName = $this->mLocalFile->getName();
+ //....
+ $status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText,
+ File::DELETE_SOURCE, $this->mFileProps );
+ if ( !$status->isGood() ) {
+ $resultDetails = array( 'internal' => $status->getWikiText() );
+ */
+
+ // @fixme upload() uses $wgUser, which is wrong here
+ // it may also create a page without our desire, also wrong potentially.
+ // and, it will record a *current* upload, but we might want an archive version here
+
+ $file = wfLocalFile( $this->getTitle() );
+ if( !$file ) {
+ var_dump( $file );
+ wfDebug( "IMPORT: Bad file. :(\n" );
+ return false;
+ }
+
+ $source = $this->downloadSource();
+ if( !$source ) {
+ wfDebug( "IMPORT: Could not fetch remote file. :(\n" );
+ return false;
+ }
+
+ $status = $file->upload( $source,
+ $this->getComment(),
+ $this->getComment(), // Initial page, if none present...
+ File::DELETE_SOURCE,
+ false, // props...
+ $this->getTimestamp() );
+
+ if( $status->isGood() ) {
+ // yay?
+ wfDebug( "IMPORT: is ok?\n" );
+ return true;
+ }
+
+ wfDebug( "IMPORT: is bad? " . $status->getXml() . "\n" );
+ return false;
+
+ }
+
+ function downloadSource() {
+ global $wgEnableUploads;
+ if( !$wgEnableUploads ) {
+ return false;
+ }
+
+ $tempo = tempnam( wfTempDir(), 'download' );
+ $f = fopen( $tempo, 'wb' );
+ if( !$f ) {
+ wfDebug( "IMPORT: couldn't write to temp file $tempo\n" );
+ return false;
+ }
+
+ // @fixme!
+ $src = $this->getSrc();
+ $data = Http::get( $src );
+ if( !$data ) {
+ wfDebug( "IMPORT: couldn't fetch source $src\n" );
+ fclose( $f );
+ unlink( $tempo );
+ return false;
+ }
+
+ fwrite( $f, $data );
+ fclose( $f );
+
+ return $tempo;
+ }
}
* @addtogroup SpecialPage
*/
class WikiImporter {
+ var $mDebug = false;
var $mSource = null;
var $mPageCallback = null;
var $mPageOutCallback = null;
var $mRevisionCallback = null;
+ var $mUploadCallback = null;
var $mTargetNamespace = null;
- var $mTargetArticleName = null;
var $lastfield;
+ var $tagStack = array();
- function WikiImporter( $source ) {
- $this->setRevisionCallback( array( &$this, "importRevision" ) );
+ function __construct( $source ) {
+ $this->setRevisionCallback( array( $this, "importRevision" ) );
+ $this->setUploadCallback( array( $this, "importUpload" ) );
$this->mSource = $source;
}
}
function debug( $data ) {
- #wfDebug( "IMPORT: $data\n" );
+ if( $this->mDebug ) {
+ wfDebug( "IMPORT: $data\n" );
+ }
}
function notice( $data ) {
$wgOut->addHTML( "<li>" . htmlspecialchars( $data ) . "</li>\n" );
}
}
+
+ /**
+ * Set debug mode...
+ */
+ function setDebug( $debug ) {
+ $this->mDebug = $debug;
+ }
/**
* Sets the action to perform as each new page in the stream is reached.
$this->mRevisionCallback = $callback;
return $previous;
}
+
+ /**
+ * Sets the action to perform as each file upload version is reached.
+ * @param callable callback
+ * @return callable
+ */
+ function setUploadCallback( $callback ) {
+ $previous = $this->mUploadCallback;
+ $this->mUploadCallback = $callback;
+ return $previous;
+ }
/**
* Set a target namespace to override the defaults
}
}
- /**
- * Set a target articlename to override the defaults
- */
- function setTargetArticleName( $articleName ) {
- $this->mTargetArticleName = is_null( $articleName ) ? null : $articleName;
- }
-
/**
* Default per-revision callback, performs the import.
* @param WikiRevision $revision
* @private
*/
- function importRevision( &$revision ) {
+ function importRevision( $revision ) {
$dbw = wfGetDB( DB_MASTER );
- return $dbw->deadlockLoop( array( &$revision, 'importOldRevision' ) );
+ return $dbw->deadlockLoop( array( $revision, 'importOldRevision' ) );
+ }
+
+ /**
+ * Dummy for now...
+ */
+ function importUpload( $revision ) {
+ //$dbw = wfGetDB( DB_MASTER );
+ //return $dbw->deadlockLoop( array( $revision, 'importUpload' ) );
+ return false;
}
/**
if( $name == 'siteinfo' ) {
xml_set_element_handler( $parser, "in_siteinfo", "out_siteinfo" );
} elseif( $name == 'page' ) {
+ $this->push( $name );
$this->workRevisionCount = 0;
$this->workSuccessCount = 0;
+ $this->uploadCount = 0;
+ $this->uploadSuccessCount = 0;
xml_set_element_handler( $parser, "in_page", "out_page" );
} else {
return $this->throwXMLerror( "Expected <page>, got <$name>" );
case "restrictions":
$this->appendfield = $name;
$this->appenddata = "";
- $this->parenttag = "page";
xml_set_element_handler( $parser, "in_nothing", "out_append" );
xml_set_character_data_handler( $parser, "char_append" );
break;
case "revision":
+ $this->push( "revision" );
if( is_object( $this->pageTitle ) ) {
$this->workRevision = new WikiRevision;
$this->workRevision->setTitle( $this->pageTitle );
}
xml_set_element_handler( $parser, "in_revision", "out_revision" );
break;
+ case "upload":
+ $this->push( "upload" );
+ if( is_object( $this->pageTitle ) ) {
+ $this->workRevision = new WikiRevision;
+ $this->workRevision->setTitle( $this->pageTitle );
+ $this->uploadCount++;
+ } else {
+ // Skipping items due to invalid page title
+ $this->workRevision = null;
+ }
+ xml_set_element_handler( $parser, "in_upload", "out_upload" );
+ break;
default:
return $this->throwXMLerror( "Element <$name> not allowed in a <page>." );
}
function out_page( $parser, $name ) {
$this->debug( "out_page $name" );
+ $this->pop();
if( $name != "page" ) {
return $this->throwXMLerror( "Expected </page>, got </$name>" );
}
if( $name != $this->appendfield ) {
return $this->throwXMLerror( "Expected </{$this->appendfield}>, got </$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;
-
- if( $this->mTargetArticleName != '' ) {
- // Import article with a different target article name
- $this->workTitle = $this->mTargetArticleName;
- }
$this->origTitle = Title::newFromText( $this->workTitle );
if( !is_null( $this->mTargetNamespace ) && !is_null( $this->origTitle ) ) {
$this->pageTitle = Title::makeTitle( $this->mTargetNamespace,
- $this->origTitle->getDbKey() );
+ $this->origTitle->getDBkey() );
} else {
$this->pageTitle = Title::newFromText( $this->workTitle );
}
}
break;
case "id":
- if ( $this->parenttag == 'revision' ) {
+ if ( $this->parentTag() == 'revision' ) {
if( $this->workRevision )
$this->workRevision->setID( $this->appenddata );
}
if( $this->workRevision )
$this->workRevision->setMinor( true );
break;
+ case "filename":
+ if( $this->workRevision )
+ $this->workRevision->setFilename( $this->appenddata );
+ break;
+ case "src":
+ if( $this->workRevision )
+ $this->workRevision->setSrc( $this->appenddata );
+ break;
+ case "size":
+ if( $this->workRevision )
+ $this->workRevision->setSize( intval( $this->appenddata ) );
+ break;
default:
$this->debug( "Bad append: {$this->appendfield}" );
}
$this->appendfield = "";
$this->appenddata = "";
+
+ $parent = $this->parentTag();
+ xml_set_element_handler( $parser, "in_$parent", "out_$parent" );
+ xml_set_character_data_handler( $parser, "donothing" );
}
function in_revision( $parser, $name, $attribs ) {
case "comment":
case "minor":
case "text":
- $this->parenttag = "revision";
$this->appendfield = $name;
xml_set_element_handler( $parser, "in_nothing", "out_append" );
xml_set_character_data_handler( $parser, "char_append" );
break;
case "contributor":
+ $this->push( "contributor" );
xml_set_element_handler( $parser, "in_contributor", "out_contributor" );
break;
default:
function out_revision( $parser, $name ) {
$this->debug( "out_revision $name" );
+ $this->pop();
if( $name != "revision" ) {
return $this->throwXMLerror( "Expected </revision>, got </$name>" );
}
if( $this->workRevision ) {
$ok = call_user_func_array( $this->mRevisionCallback,
- array( &$this->workRevision, &$this ) );
+ array( $this->workRevision, $this ) );
if( $ok ) {
$this->workSuccessCount++;
}
}
}
+
+ function in_upload( $parser, $name, $attribs ) {
+ $this->debug( "in_upload $name" );
+ switch( $name ) {
+ case "timestamp":
+ case "comment":
+ case "text":
+ case "filename":
+ case "src":
+ case "size":
+ $this->appendfield = $name;
+ xml_set_element_handler( $parser, "in_nothing", "out_append" );
+ xml_set_character_data_handler( $parser, "char_append" );
+ break;
+ case "contributor":
+ $this->push( "contributor" );
+ xml_set_element_handler( $parser, "in_contributor", "out_contributor" );
+ break;
+ default:
+ return $this->throwXMLerror( "Element <$name> not allowed in an <upload>." );
+ }
+ }
+
+ function out_upload( $parser, $name ) {
+ $this->debug( "out_revision $name" );
+ $this->pop();
+ if( $name != "upload" ) {
+ return $this->throwXMLerror( "Expected </upload>, got </$name>" );
+ }
+ xml_set_element_handler( $parser, "in_page", "out_page" );
+
+ if( $this->workRevision ) {
+ $ok = call_user_func_array( $this->mUploadCallback,
+ array( $this->workRevision, $this ) );
+ if( $ok ) {
+ $this->workUploadSuccessCount++;
+ }
+ }
+ }
function in_contributor( $parser, $name, $attribs ) {
$this->debug( "in_contributor $name" );
case "username":
case "ip":
case "id":
- $this->parenttag = "contributor";
$this->appendfield = $name;
xml_set_element_handler( $parser, "in_nothing", "out_append" );
xml_set_character_data_handler( $parser, "char_append" );
function out_contributor( $parser, $name ) {
$this->debug( "out_contributor $name" );
+ $this->pop();
if( $name != "contributor" ) {
return $this->throwXMLerror( "Expected </contributor>, got </$name>" );
}
- xml_set_element_handler( $parser, "in_revision", "out_revision" );
+ $parent = $this->parentTag();
+ xml_set_element_handler( $parser, "in_$parent", "out_$parent" );
+ }
+
+ private function push( $name ) {
+ array_push( $this->tagStack, $name );
+ $this->debug( "PUSH $name" );
+ }
+
+ private function pop() {
+ $name = array_pop( $this->tagStack );
+ $this->debug( "POP $name" );
+ return $name;
+ }
+
+ private function parentTag() {
+ $name = $this->tagStack[count( $this->tagStack ) - 1];
+ $this->debug( "PARENT $name" );
+ return $name;
}
}
* @addtogroup SpecialPage
*/
class ImportStringSource {
- function ImportStringSource( $string ) {
+ function __construct( $string ) {
$this->mString = $string;
$this->mRead = false;
}
* @addtogroup SpecialPage
*/
class ImportStreamSource {
- function ImportStreamSource( $handle ) {
+ function __construct( $handle ) {
$this->mHandle = $handle;
}
return new WikiErrorMsg( 'importnofile' );
}
if( !empty( $upload['error'] ) ) {
- return new WikiErrorMsg( 'importuploaderror', $upload['error'] );
+ switch($upload['error']){
+ case 1: # The uploaded file exceeds the upload_max_filesize directive in php.ini.
+ return new WikiErrorMsg( 'importuploaderrorsize' );
+ case 2: # The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.
+ return new WikiErrorMsg( 'importuploaderrorsize' );
+ case 3: # The uploaded file was only partially uploaded
+ return new WikiErrorMsg( 'importuploaderrorpartial' );
+ case 6: #Missing a temporary folder. Introduced in PHP 4.3.10 and PHP 5.0.3.
+ return new WikiErrorMsg( 'importuploaderrortemp' );
+ # case else: # Currently impossible
+ }
+
}
$fname = $upload['tmp_name'];
if( is_uploaded_file( $fname ) ) {
}
}
}
-
-
-
dépôts / lhc / web / wiklou.git / blobdiff