Revert feature out of r109562, r109564, r109570

Leaving typo/brace fixes and other minor code improvements

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index b678963..b7d1164 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -123,7 +123,6 @@ production.
 * (bug 29309) Allow CSS class per tooltip (tipsy).
 * (bug 33565) Add accesskey/tooltip to submit buttons on Special:EditWatchlist.
 * (bug 17959) Inline rendering/thumbnailing for Gimp XCF images.
-* (bug 32341) Add upload by URL domain limitation.
 
 === Bug fixes in 1.19 ===
 * $wgUploadNavigationUrl should be used for file redlinks if.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6bc3445..088a5f9 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -453,10 +453,6 @@ $wgAllowCopyUploads = false;
  * This feature is experimental and broken as of r81612.
  */
 $wgAllowAsyncCopyUploads = false;
-/**
- * A list of domains copy uploads can come from
- */
-$wgCopyUploadsDomains = array();
 
 /**
  * Max size for uploads, in bytes. If not set to an array, applies to all

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 6105dec..133339a 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1231,7 +1231,6 @@ abstract class ApiBase extends ContextSource {
                'nouploadmodule' => array( 'code' => 'nouploadmodule', 'info' => 'No upload module set' ),
                'uploaddisabled' => array( 'code' => 'uploaddisabled', 'info' => 'Uploads are not enabled.  Make sure $wgEnableUploads is set to true in LocalSettings.php and the PHP ini setting file_uploads is true' ),
                'copyuploaddisabled' => array( 'code' => 'copyuploaddisabled', 'info' => 'Uploads by URL is not enabled.  Make sure $wgAllowCopyUploads is set to true in LocalSettings.php.' ),
-               'copyuploadbaddomain' => array( 'code' => 'copyuploadbaddomain', 'info' => 'Uploads by URL are not allowed from this domain.' ),
 
                'filename-tooshort' => array( 'code' => 'filename-tooshort', 'info' => 'The filename is too short' ),
                'filename-toolong' => array( 'code' => 'filename-toolong', 'info' => 'The filename is too long' ),

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 6001651..fdc1eff 100644 (file)
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -318,10 +318,6 @@ class ApiUpload extends ApiBase {
                                $this->dieUsageMsg( 'copyuploaddisabled' );
                        }
 
-                       if ( !UploadFromUrl::isAllowedHost( $this->mParams['url'] ) ) {
-                               $this->dieUsageMsg( 'copyuploadbaddomain' );
-                       }
-
                        $async = false;
                        if ( $this->mParams['asyncdownload'] ) {
                                $this->checkAsyncDownloadEnabled();

diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 55a9c80..83f1bab 100644 (file)
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -37,28 +37,6 @@ class UploadFromUrl extends UploadBase {
                return $wgAllowCopyUploads && parent::isEnabled();
        }
 
-       /**
-        * Checks whether the URL is for an allowed host
-        *
-        * @param $url string
-        * @return bool
-        */
-       public static function isAllowedHost( $url ) {
-               global $wgCopyUploadsDomains;
-               if ( !count( $wgCopyUploadsDomains ) ) {
-                       return true;
-               }
-               $valid = false;
-               $parsedUrl = wfParseUrl( $url );
-               foreach( $wgCopyUploadsDomains as $domain ) {
-                       if ( $parsedUrl['host'] === $domain ) {
-                               $valid = true;
-                               break;
-                       }
-               }
-               return $valid;
-       }
-
        /**
         * Entry point for API upload
         *
@@ -124,9 +102,6 @@ class UploadFromUrl extends UploadBase {
                        return Status::newFatal( 'http-invalid-url' );
                }
 
-               if( !self::isAllowedHost( $this->mUrl ) ) {
-                       return Status::newFatal( 'upload-copy-upload-invalid-domain' );
-               }
                if ( !$this->mAsync ) {
                        return $this->reallyFetchFile();
                }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c93ce4e..a0c76d3 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2235,7 +2235,6 @@ If the problem persists, contact an [[Special:ListUsers/sysop|administrator]].',
 'upload-too-many-redirects'         => 'The URL contained too many redirects',
 'upload-unknown-size'               => 'Unknown size',
 'upload-http-error'                 => 'An HTTP error occured: $1',
-'upload-copy-upload-invalid-domain' => 'Copy uploads are not available from this domain.',
 
 # File backend
 'backend-fail-stream'        => 'Could not stream file $1.',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 6a7dd2e..02fe7ae 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1344,7 +1344,6 @@ $wgMessageStructure = array(
                'upload-too-many-redirects',
                'upload-unknown-size',
                'upload-http-error',
-               'upload-copy-upload-invalid-domain',
        ),
 
        'filebackend-errors' => array(