Use static methods to check whether upload is enabled

diff --git a/includes/UploadFromBase.php b/includes/UploadFromBase.php
index 0c16063..4daeedf 100644 (file)
--- a/includes/UploadFromBase.php
+++ b/includes/UploadFromBase.php
@@ -24,6 +24,11 @@ class UploadFromBase {
        
        const SESSION_VERSION = 2;
        
+       static function isEnabled() {
+               global $wgEnableUploads;
+               return $wgEnableUploads;
+       }
+       
        function __construct( $name ) {
                $this->mDesiredDestName = $name;
        }

diff --git a/includes/UploadFromUrl.php b/includes/UploadFromUrl.php
index 84fd070..605b54f 100644 (file)
--- a/includes/UploadFromUrl.php
+++ b/includes/UploadFromUrl.php
@@ -2,6 +2,11 @@
 
 
 class UploadFromUrl extends UploadFromBase {
+       static function isEnabled() {
+               global $wgAllowCopyUploads;
+               return $wgAllowCopyUploads && parent::isEnabled();
+       }
+       
        function initialize( $url ) {
                global $wgTmpDirectory;
                $local_file = tempnam( $wgTmpDirectory, 'WEBUPLOAD' );

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index ff24433..ca4646d 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -42,7 +42,6 @@ class UploadForm {
         * @param $request Data posted.
         */
        function __construct( &$request ) {
-               global $wgAllowCopyUploads;
                $this->mDesiredDestName   = $request->getText( 'wpDestFile' );
                $this->mIgnoreWarning     = $request->getCheck( 'wpIgnoreWarning' );
                $this->mComment           = $request->getText( 'wpUploadDescription' );
@@ -93,7 +92,7 @@ class UploadForm {
                        /**
                         *Check for a newly uploaded file.
                         */
-                       if( $wgAllowCopyUploads && $this->mSourceType == 'web' ) {
+                       if( UploadFromUrl::isEnabled() && $this->mSourceType == 'web' ) {
                                $this->mUpload = new UploadFromUrl( $desiredDestName );
                                $this->mUpload->initialize( $request->getText( 'wpUploadFileURL' ) );
                        } else {
@@ -115,10 +114,9 @@ class UploadForm {
         */
        function execute() {
                global $wgUser, $wgOut;
-               global $wgEnableUploads;
 
                # Check uploading enabled
-               if( !$wgEnableUploads ) {
+               if( !UploadFromBase::isEnabled() ) {
                        $wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext', array( $this->mDesiredDestName ) );
                        return;
                }
@@ -579,7 +577,7 @@ class UploadForm {
        function mainUploadForm( $msg='' ) {
                global $wgOut, $wgUser, $wgLang, $wgMaxUploadSize;
                global $wgUseCopyrightUpload, $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview;
-               global $wgRequest, $wgAllowCopyUploads;
+               global $wgRequest;
                global $wgStylePath, $wgStyleVersion;
 
                $useAjaxDestCheck = $wgUseAjax && $wgAjaxUploadDestCheck;
@@ -687,7 +685,7 @@ wgUploadAutoFill = {$autofill};
                        default:
                                $val2 = $val;
                }
-               $val2 = $wgAllowCopyUploads ? min( $wgMaxUploadSize, $val2 ) : $val2;
+               $val2 = UploadFromUrl::isEnabled() ? min( $wgMaxUploadSize, $val2 ) : $val2;
                $maxUploadSize = '<div id="mw-upload-maxfilesize">' . 
                        wfMsgExt( 'upload-maxfilesize', array( 'parseinline', 'escapenoentities' ), 
                                $wgLang->formatSize( $val2 ) ) .
@@ -716,7 +714,7 @@ wgUploadAutoFill = {$autofill};
                $warningChecked = $this->mIgnoreWarning ? 'checked' : '';
 
                // Prepare form for upload or upload/copy
-               if( $wgAllowCopyUploads && $wgUser->isAllowed( 'upload_by_url' ) ) {
+               if( UploadFromUrl::isEnabled() && $wgUser->isAllowed( 'upload_by_url' ) ) {
                        $filename_form =
                                "<input type='radio' id='wpSourceTypeFile' name='wpSourceType' value='file' " .
                                   "onchange='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\")' checked='checked' />" .