From c39da5210af13b8870556bb9b01704986a2b72b4 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Mon, 1 Sep 2008 08:09:16 +0000 Subject: [PATCH] Rename UploadFromBase to UploadBase. It's best to use English rather than inventing our own language. --- includes/AutoLoader.php | 2 +- .../{UploadFromBase.php => UploadBase.php} | 2 +- includes/UploadFromStash.php | 2 +- includes/UploadFromUpload.php | 2 +- includes/UploadFromUrl.php | 2 +- includes/specials/SpecialUpload.php | 50 +++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) rename includes/{UploadFromBase.php => UploadBase.php} (99%) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 50e9276879..6ae1045a97 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -188,7 +188,7 @@ $wgAutoloadLocalClasses = array( 'TransformParameterError' => 'includes/MediaTransformOutput.php', 'TurckBagOStuff' => 'includes/BagOStuff.php', 'UnlistedSpecialPage' => 'includes/SpecialPage.php', - 'UploadFromBase' => 'includes/UploadFromBase.php', + 'UploadBase' => 'includes/UploadBase.php', 'UploadFromStash' => 'includes/UploadFromStash.php', 'UploadFromUpload' => 'includes/UploadFromUpload.php', 'UploadFromUrl' => 'includes/UploadFromUrl.php', diff --git a/includes/UploadFromBase.php b/includes/UploadBase.php similarity index 99% rename from includes/UploadFromBase.php rename to includes/UploadBase.php index b0fa6cb9ad..58f78cc171 100644 --- a/includes/UploadFromBase.php +++ b/includes/UploadBase.php @@ -1,6 +1,6 @@ mTempPath = $tempPath; $this->mFileSize = $fileSize; diff --git a/includes/UploadFromUrl.php b/includes/UploadFromUrl.php index fc40d3a37e..dd9010dd95 100644 --- a/includes/UploadFromUrl.php +++ b/includes/UploadFromUrl.php @@ -1,7 +1,7 @@ isAllowed( 'upload_by_url' ) ) return 'upload_by_url'; diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index c5769acaec..44fa6a3ae6 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -27,7 +27,7 @@ class UploadForm { var $mDestWarningAck; var $mLocalFile; - var $mUpload; // Instance of UploadFromBase or derivative + var $mUpload; // Instance of UploadBase or derivative # Placeholders for text injection by hooks (must be HTML) # extensions should take care to _append_ to the present value @@ -76,7 +76,7 @@ class UploadForm { if( !empty( $this->mSessionKey ) && isset( $_SESSION['wsUploadData'][$this->mSessionKey]['version'] ) && $_SESSION['wsUploadData'][$this->mSessionKey]['version'] == - UploadFromBase::SESSION_VERSION ) { + UploadBase::SESSION_VERSION ) { /** * Confirming a temporarily stashed upload. * We don't want path names to be forged, so we keep @@ -116,7 +116,7 @@ class UploadForm { global $wgUser, $wgOut; # Check uploading enabled - if( !UploadFromBase::isEnabled() ) { + if( !UploadBase::isEnabled() ) { $wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext', array( $this->mDesiredDestName ) ); return; } @@ -182,45 +182,45 @@ class UploadForm { $value = $this->internalProcessUpload( $details ); switch($value) { - case UploadFromBase::SUCCESS: + case UploadBase::SUCCESS: $wgOut->redirect( $this->mLocalFile->getTitle()->getFullURL() ); break; - case UploadFromBase::BEFORE_PROCESSING: + case UploadBase::BEFORE_PROCESSING: // Do... nothing? Why? break; - case UploadFromBase::LARGE_FILE_SERVER: + case UploadBase::LARGE_FILE_SERVER: $this->mainUploadForm( wfMsgHtml( 'largefileserver' ) ); break; - case UploadFromBase::EMPTY_FILE: + case UploadBase::EMPTY_FILE: $this->mainUploadForm( wfMsgHtml( 'emptyfile' ) ); break; - case UploadFromBase::MIN_LENGTH_PARTNAME: + case UploadBase::MIN_LENGTH_PARTNAME: $this->mainUploadForm( wfMsgHtml( 'minlength1' ) ); break; - case UploadFromBase::ILLEGAL_FILENAME: + case UploadBase::ILLEGAL_FILENAME: $this->uploadError( wfMsgExt( 'illegalfilename', 'parseinline', $details['filtered'] ) ); break; - case UploadFromBase::PROTECTED_PAGE: + case UploadBase::PROTECTED_PAGE: $wgOut->showPermissionsErrorPage( $details['permissionserrors'] ); break; - case UploadFromBase::OVERWRITE_EXISTING_FILE: + case UploadBase::OVERWRITE_EXISTING_FILE: $this->uploadError( wfMsgExt( $details['overwrite'], 'parseinline' ) ); break; - case UploadFromBase::FILETYPE_MISSING: + case UploadBase::FILETYPE_MISSING: $this->uploadError( wfMsgExt( 'filetype-missing', array ( 'parseinline' ) ) ); break; - case UploadFromBase::FILETYPE_BADTYPE: + case UploadBase::FILETYPE_BADTYPE: $finalExt = $details['finalExt']; $this->uploadError( wfMsgExt( 'filetype-banned-type', @@ -235,23 +235,23 @@ class UploadForm { ); break; - case UploadFromBase::VERIFICATION_ERROR: + case UploadBase::VERIFICATION_ERROR: $args = $details['veri']; $code = array_shift( $args ); $this->uploadError( wfMsgExt( $code, 'parseinline', $args ) ); break; - case UploadFromBase::UPLOAD_VERIFICATION_ERROR: + case UploadBase::UPLOAD_VERIFICATION_ERROR: $error = $details['error']; $this->uploadError( wfMsgExt( $error, 'parseinline' ) ); break; - case UploadFromBase::UPLOAD_WARNING: + case UploadBase::UPLOAD_WARNING: $warning = $details['warning']; $this->uploadWarning( $warning ); break; - case UploadFromBase::INTERNAL_ERROR: + case UploadBase::INTERNAL_ERROR: $status = $details['internal']; $this->showError( $wgOut->parse( $status->getWikiText() ) ); break; @@ -275,7 +275,7 @@ class UploadForm { if( !wfRunHooks( 'UploadForm:BeforeProcessing', array( &$this ) ) ) { wfDebug( "Hook 'UploadForm:BeforeProcessing' broke processing the file." ); - return UploadFromBase::BEFORE_PROCESSING; + return UploadBase::BEFORE_PROCESSING; } /** @@ -285,12 +285,12 @@ class UploadForm { $permErrors = $this->mUpload->verifyPermissions( $wgUser ); if( $permErrors !== true ) { $resultDetails = array( 'permissionserrors' => $permErrors ); - return UploadFromBase::PROTECTED_PAGE; + return UploadBase::PROTECTED_PAGE; } // Check whether this is a sane upload $result = $this->mUpload->verifyUpload( $resultDetails ); - if( $result != UploadFromBase::OK ) + if( $result != UploadBase::OK ) return $result; $this->mLocalFile = $this->mUpload->getLocalFile(); @@ -300,7 +300,7 @@ class UploadForm { if( count( $warnings ) ) { $resultDetails = array( 'warning' => $warnings ); - return UploadFromBase::UPLOAD_WARNING; + return UploadBase::UPLOAD_WARNING; } } @@ -316,13 +316,13 @@ class UploadForm { if ( !$status->isGood() ) { $resultDetails = array( 'internal' => $status ); - return UploadFromBase::INTERNAL_ERROR; + return UploadBase::INTERNAL_ERROR; } else { // Success, redirect to description page // WTF WTF WTF? $img = null; // @todo: added to avoid passing a ref to null - should this be defined somewhere? wfRunHooks( 'SpecialUploadComplete', array( &$this ) ); - return UploadFromBase::SUCCESS; + return UploadBase::SUCCESS; } } @@ -420,7 +420,7 @@ class UploadForm { } $s = ' '; if ( $file ) { - $exists = UploadFromBase::getExistsWarning( $file ); + $exists = UploadBase::getExistsWarning( $file ); $warning = self::getExistsWarning( $exists ); // FIXME: We probably also want the prefix blacklist and the wasdeleted check here if ( $warning !== '' ) { @@ -921,7 +921,7 @@ wgUploadAutoFill = {$autofill}; * @param User $user * @param string $img, image name * @return bool - * @deprecated Use UploadFromBase::userCanReUpload + * @deprecated Use UploadBase::userCanReUpload */ public static function userCanReUpload( User $user, $img ) { wfDeprecated( __METHOD__ ); -- 2.20.1