Localisation updates for core from Betawiki

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

diff --git a/includes/UploadFromUrl.php b/includes/UploadFromUrl.php
index 84fd070..7e23b8c 100644 (file)
--- a/includes/UploadFromUrl.php
+++ b/includes/UploadFromUrl.php
@@ -1,76 +1,76 @@
 <?php
 
 
-class UploadFromUrl extends UploadFromBase {
-       function initialize( $url ) {
+class UploadFromUrl extends UploadBase {
+       static function isAllowed( $user ) {
+               if( !$user->isAllowed( 'upload_by_url' ) )
+                       return 'upload_by_url';
+               return parent::isAllowed( $user );
+       }
+       static function isEnabled() {
+               global $wgAllowCopyUploads;
+               return $wgAllowCopyUploads && parent::isEnabled();
+       }
+       
+       function initialize( $name, $url ) {
                global $wgTmpDirectory;
                $local_file = tempnam( $wgTmpDirectory, 'WEBUPLOAD' );
+               $this-initialize( $name, $local_file, 0, true );
 
-               $this->mTempPath       = $local_file;
-               $this->mFileSize       = 0; # Will be set by curlCopy
-               $this->mCurlError      = $this->curlCopy( $url, $local_file );
-               $pathParts             = explode( '/', $url );
-               $this->mSrcName        = array_pop( $pathParts );
-               $this->mSessionKey     = false;
-               $this->mStashed        = false;
-
-               // PHP won't auto-cleanup the file
-               $this->mRemoveTempFile = file_exists( $local_file );
+               $this->mUrl = trim( $url );
        }
        
+       /**
+        * Do the real fetching stuff
+        */
+       function fetchFile() {
+               if( stripos($this->mUrl, 'http://') !== 0 && stripos($this->mUrl, 'ftp://') !== 0 ) {
+                       return array(
+                               'status' => self::BEFORE_PROCESSING,
+                               'error' => 'upload-proto-error',
+                       );
+               }
+               $res = $this->curlCopy();
+               if( $res !== true ) {
+                       return array(
+                               'status' => self::BEFORE_PROCESSING,
+                               'error' => $res,
+                       );
+               }
+               return self::OK;
+       }
        
-               /**
+       /**
         * Safe copy from URL
         * Returns true if there was an error, false otherwise
         */
-       private function curlCopy( $url, $dest ) {
+       private function curlCopy() {
                global $wgUser, $wgOut;
 
-               // Bad bad bad!
-               if( !$wgUser->isAllowed( 'upload_by_url' ) ) {
-                       $wgOut->permissionRequired( 'upload_by_url' );
-                       return true;
-               }
-
-               # Maybe remove some pasting blanks :-)
-               $url =  trim( $url );
-               if( stripos($url, 'http://') !== 0 && stripos($url, 'ftp://') !== 0 ) {
-                       # Only HTTP or FTP URLs
-                       $wgOut->showErrorPage( 'upload-proto-error', 'upload-proto-error-text' );
-                       return true;
-               }
-
                # Open temporary file
                $this->mCurlDestHandle = @fopen( $this->mTempPath, "wb" );
                if( $this->mCurlDestHandle === false ) {
                        # Could not open temporary file to write in
-                       $wgOut->showErrorPage( 'upload-file-error', 'upload-file-error-text');
-                       return true;
+                       return 'upload-file-error';
                }
 
                $ch = curl_init();
                curl_setopt( $ch, CURLOPT_HTTP_VERSION, 1.0); # Probably not needed, but apparently can work around some bug
                curl_setopt( $ch, CURLOPT_TIMEOUT, 10); # 10 seconds timeout
                curl_setopt( $ch, CURLOPT_LOW_SPEED_LIMIT, 512); # 0.5KB per second minimum transfer speed
-               curl_setopt( $ch, CURLOPT_URL, $url);
+               curl_setopt( $ch, CURLOPT_URL, $this->mUrl);
                curl_setopt( $ch, CURLOPT_WRITEFUNCTION, array( $this, 'uploadCurlCallback' ) );
                curl_exec( $ch );
-               $error = curl_errno( $ch ) ? true : false;
-               $errornum =  curl_errno( $ch );
-               // if ( $error ) print curl_error ( $ch ) ; # Debugging output
+               $error =  curl_errno( $ch );
                curl_close( $ch );
 
                fclose( $this->mCurlDestHandle );
                unset( $this->mCurlDestHandle );
-               if( $error ) {
-                       unlink( $dest );
-                       if( wfEmptyMsg( "upload-curl-error$errornum", wfMsg("upload-curl-error$errornum") ) )
-                               $wgOut->showErrorPage( 'upload-misc-error', 'upload-misc-error-text' );
-                       else
-                               $wgOut->showErrorPage( "upload-curl-error$errornum", "upload-curl-error$errornum-text" );
-               }
+               
+               if( $error ) 
+                       return "upload-curl-error$errornum";
 
-               return $error;
+               return true;
        }
        
        /**
@@ -89,12 +89,4 @@ class UploadFromUrl extends UploadFromBase {
                fwrite( $this->mCurlDestHandle, $data );
                return $length;
        }
-       
-       function execute( &$resultDetails ) {
-               /* Check for curl error */
-               if( $this->mCurlError ) {
-                       return self::BEFORE_PROCESSING;
-               }
-               return parent::execute( $resultDetails );
-       }
 }