* Rollback should not work if the wiki is read-only

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

diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index 8dee732..d22e2a5 100644 (file)
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -34,6 +34,11 @@ function wfSpecialImport( $page = '' ) {
        $frompage = '';
        $history = true;
 
+       if ( wfReadOnly() ) {
+               $wgOut->readOnlyPage();
+               return;
+       }
+
        if( $wgRequest->wasPosted() && $wgRequest->getVal( 'action' ) == 'submit') {
                $isUpload = false;
                $namespace = $wgRequest->getIntOrNull( 'namespace' );
@@ -95,7 +100,6 @@ function wfSpecialImport( $page = '' ) {
        <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=\"" . wfMsgHtml( "uploadbtn" ) . "\" />
        </form>
@@ -193,13 +197,13 @@ class ImportReporter {
                if( $successCount > 0 ) {
                        $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 );
                        }
@@ -209,6 +213,9 @@ class ImportReporter {
                        $nullRevision = Revision::newNullRevision(
                                $dbw, $title->getArticleId(), $comment, true );
                        $nullRevision->insertOn( $dbw );
+                       # Update page record
+                       $article = new Article( $title );
+                       $article->updateRevisionOn( $dbw, $nullRevision );
                }
        }
 
@@ -680,7 +687,7 @@ class WikiImporter {
                        $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 );
                        }
@@ -847,7 +854,18 @@ class ImportStreamSource {
                        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 ) ) {