Call Linker methods statically

[lhc/web/wiklou.git] / includes / api / ApiUpload.php

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index b101ecc..30331bc 100644 (file)
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -58,7 +58,8 @@ class ApiUpload extends ApiBase {
                $request = $this->getMain()->getRequest();
                // Add the uploaded file to the params array
                $this->mParams['file'] = $request->getFileName( 'file' );
-               
+               $this->mParams['chunk'] = $request->getFileName( 'chunk' );
+
                // Copy the session key to the file key, for backward compatibility.
                if( !$this->mParams['filekey'] && $this->mParams['sessionkey'] ) {
                        $this->mParams['filekey'] = $this->mParams['sessionkey'];
@@ -85,7 +86,14 @@ class ApiUpload extends ApiBase {
                }
 
                // Check if the uploaded file is sane
-               $this->verifyUpload();
+               if ( $this->mParams['chunk'] ) {
+                       $maxSize = $this->mUpload->getMaxUploadSize( );
+                       if( $this->mParams['filesize'] > $maxSize ) {
+                               $this->dieUsage( 'The file you submitted was too large', 'file-too-large' );
+                       }
+               } else {
+                       $this->verifyUpload();
+               }
 
 
                // Check if the user has the rights to modify or overwrite the requested title
@@ -113,6 +121,26 @@ class ApiUpload extends ApiBase {
                        } catch ( MWException $e ) {
                                $result['warnings']['stashfailed'] = $e->getMessage();
                        }
+               } elseif ( $this->mParams['chunk'] ) {
+                       $result['result'] = 'Continue';
+                       $chunk = $request->getFileTempName( 'chunk' );
+                       $chunkSize = $request->getUpload( 'chunk' )->getSize();
+                       if ($this->mParams['offset'] == 0) {
+                               $result['filekey'] = $this->performStash();
+                       } else {
+                               $status = $this->mUpload->appendChunk($chunk, $chunkSize,
+                                                                                                         $this->mParams['offset']);
+                               if ( !$status->isGood() ) {
+                                       $this->dieUsage( $status->getWikiText(), 'stashfailed' );
+                               } else {
+                                       $result['filekey'] = $this->mParams['filekey'];
+                                       if($this->mParams['offset'] + $chunkSize == $this->mParams['filesize']) {
+                                               $this->mUpload->finalizeFile();
+                                               $result['result'] = 'Success';
+                                       }
+                               }
+                       }
+                       $result['offset'] = $this->mParams['offset'] + $chunkSize;
                } elseif ( $this->mParams['stash'] ) {
                        // Some uploads can request they be stashed, so as not to publish them immediately.
                        // In this case, a failure to stash ought to be fatal
@@ -147,7 +175,6 @@ class ApiUpload extends ApiBase {
         */
        function performStash() {
                try {
-                       xdebug_break();
                        $fileKey = $this->mUpload->stashFile()->getFileKey();
                } catch ( MWException $e ) {
                        $message = 'Stashing temporary file failed: ' . get_class( $e ) . ' ' . $e->getMessage();
@@ -189,9 +216,10 @@ class ApiUpload extends ApiBase {
        protected function selectUploadModule() {
                $request = $this->getMain()->getRequest();
 
-               // One and only one of the following parameters is needed
-               $this->requireOnlyOneParameter( $this->mParams,
-                       'filekey', 'file', 'url', 'statuskey' );
+               // chunk or one and only one of the following parameters is needed
+               if(!$this->mParams['chunk'])
+                       $this->requireOnlyOneParameter( $this->mParams,
+                                       'filekey', 'file', 'url', 'statuskey' );
 
                if ( $this->mParams['statuskey'] ) {
                        $this->checkAsyncDownloadEnabled();
@@ -221,11 +249,27 @@ class ApiUpload extends ApiBase {
                                $this->dieUsageMsg( 'invalid-file-key' );
                        }
 
-                       // context allows access to the current user without creating new $wgUser references
-                       $context = $this->createContext();
-                       $this->mUpload = new UploadFromStash( $context->getUser() );
+                       if( class_exists( 'RequestContext' ) ) {
+                               // context allows access to the current user without creating new $wgUser references
+                               $context = $this->createContext();
+                               $this->mUpload = new UploadFromStash( $context->getUser() );
+                       } else {
+                               // this is here to maintain 1.17 compatibility, so these changes can
+                               // be merged into production
+                               // remove this after we've moved to 1.18
+                               global $wgUser;
+                               $this->mUpload = new UploadFromStash( $wgUser );
+                       }
+
                        $this->mUpload->initialize( $this->mParams['filekey'], $this->mParams['filename'] );
 
+               } elseif ( isset( $this->mParams['chunk'] ) ) {
+                       // Start new Chunk upload
+                       $this->mUpload = new UploadFromFile();
+                       $this->mUpload->initialize(
+                               $this->mParams['filename'],
+                               $request->getUpload( 'chunk' )
+                       );
                } elseif ( isset( $this->mParams['file'] ) ) {
                        $this->mUpload = new UploadFromFile();
                        $this->mUpload->initialize(
@@ -480,6 +524,10 @@ class ApiUpload extends ApiBase {
                        ),
                        'stash' => false,
 
+                       'filesize' => null,
+                       'offset' => null,
+                       'chunk' => null,
+
                        'asyncdownload' => false,
                        'leavemessage' => false,
                        'statuskey' => null,
@@ -503,6 +551,10 @@ class ApiUpload extends ApiBase {
                        'sessionkey' => 'Same as filekey, maintained for backward compatibility.',
                        'stash' => 'If set, the server will not add the file to the repository and stash it temporarily.',
 
+                       'chunk' => 'Chunk contents',
+                       'offset' => 'Offset of chunk in bytes',
+                       'filesize' => 'Filesize of entire upload',
+
                        'asyncdownload' => 'Make fetching a URL asynchronous',
                        'leavemessage' => 'If asyncdownload is used, leave a message on the user talk page if finished',
                        'statuskey' => 'Fetch the upload status for this file key',
@@ -553,7 +605,7 @@ class ApiUpload extends ApiBase {
                return '';
        }
 
-       protected function getExamples() {
+       public function getExamples() {
                return array(
                        'Upload from a URL:',
                        '    api.php?action=upload&filename=Wiki.png&url=http%3A//upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png',
@@ -562,6 +614,10 @@ class ApiUpload extends ApiBase {
                );
        }
 
+       public function getHelpUrls() {
+               return 'http://www.mediawiki.org/wiki/API:Upload';
+       }
+
        public function getVersion() {
                return __CLASS__ . ': $Id$';
        }