" );
+ }
+ }
- case UploadBase::UPLOAD_VERIFICATION_ERROR:
- $error = $details['error'];
- $this->uploadError( wfMsgExt( $error, 'parseinline' ) );
- break;
+ // Show the relevant lines from deletion log (for still deleted files only)
+ if( $title instanceof Title && $title->isDeletedQuick() && !$title->exists() ) {
+ $this->showDeletionLog( $wgOut, $title->getPrefixedText() );
+ }
+ }
- case UploadBase::UPLOAD_WARNING:
- unset( $details['status'] );
- $this->uploadWarning( $details );
- break;
+ /**
+ * Stashes the upload and shows the main upload form.
+ *
+ * Note: only errors that can be handled by changing the name or
+ * description should be redirected here. It should be assumed that the
+ * file itself is sane and has passed UploadBase::verifyFile. This
+ * essentially means that UploadBase::VERIFICATION_ERROR and
+ * UploadBase::EMPTY_FILE should not be passed here.
+ *
+ * @param $message String: HTML message to be passed to mainUploadForm
+ */
+ protected function showRecoverableUploadError( $message ) {
+ $sessionKey = $this->mUpload->stashSession();
+ $message = '
' . wfMsgHtml( 'uploadwarning' ) . "
\n" .
+ '
' . $message . "
\n";
+
+ $form = $this->getUploadForm( $message, $sessionKey );
+ $form->setSubmitText( wfMsg( 'upload-tryagain' ) );
+ $this->showUploadForm( $form );
+ }
+ /**
+ * Stashes the upload, shows the main form, but adds an "continue anyway button".
+ * Also checks whether there are actually warnings to display.
+ *
+ * @param $warnings Array
+ * @return boolean true if warnings were displayed, false if there are no
+ * warnings and the should continue processing like there was no warning
+ */
+ protected function showUploadWarning( $warnings ) {
+ # If there are no warnings, or warnings we can ignore, return early.
+ # mDestWarningAck is set when some javascript has shown the warning
+ # to the user. mForReUpload is set when the user clicks the "upload a
+ # new version" link.
+ if ( !$warnings || ( count( $warnings ) == 1 &&
+ isset( $warnings['exists'] ) &&
+ ( $this->mDestWarningAck || $this->mForReUpload ) ) )
+ {
+ return false;
+ }
- case UploadBase::INTERNAL_ERROR:
- $status = $details['internal'];
- $this->showError( $wgOut->parse( $status->getWikiText() ) );
- break;
+ $sessionKey = $this->mUpload->stashSession();
- default:
- throw new MWException( __METHOD__ . ": Unknown value `{$details['status']}`" );
+ $warningHtml = '
';
- } else {
- $dlink2 = '';
- }
+ /**
+ * Provides output to the user for a result of UploadBase::verifyUpload
+ *
+ * @param $details Array: result of UploadBase::verifyUpload
+ */
+ protected function processVerificationError( $details ) {
+ global $wgFileExtensions, $wgLang;
- $warning .= '
';
- break;
- }
+ /**
+ * Remove a temporarily kept file stashed by saveTempUploadedFile().
+ *
+ * @return Boolean: success
+ */
+ protected function unsaveUploadedFile() {
+ global $wgOut;
+ if ( !( $this->mUpload instanceof UploadFromStash ) ) {
+ return true;
}
+ $success = $this->mUpload->unsaveUploadedFile();
+ if ( !$success ) {
+ $wgOut->showFileDeleteError( $this->mUpload->getTempPath() );
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ /*** Functions for formatting warnings ***/
+
+ /**
+ * Formats a result of UploadBase::getExistsWarning as HTML
+ * This check is static and can be done pre-upload via AJAX
+ *
+ * @param $exists Array: the result of UploadBase::getExistsWarning
+ * @return String: empty string if there is no warning or an HTML fragment
+ */
+ public static function getExistsWarning( $exists ) {
+ global $wgUser, $wgContLang;
- if ( $file->wasDeleted() && !$file->exists() ) {
+ if ( !$exists ) {
+ return '';
+ }
+
+ $file = $exists['file'];
+ $filename = $file->getTitle()->getPrefixedText();
+ $warning = '';
+
+ $sk = $wgUser->getSkin();
+
+ if( $exists['warning'] == 'exists' ) {
+ // Exact match
+ $warning = wfMsgExt( 'fileexists', 'parseinline', $filename );
+ } elseif( $exists['warning'] == 'page-exists' ) {
+ // Page exists but file does not
+ $warning = wfMsgExt( 'filepageexists', 'parseinline', $filename );
+ } elseif ( $exists['warning'] == 'exists-normalized' ) {
+ $warning = wfMsgExt( 'fileexists-extension', 'parseinline', $filename,
+ $exists['normalizedFile']->getTitle()->getPrefixedText() );
+ } elseif ( $exists['warning'] == 'thumb' ) {
+ // Swapped argument order compared with other messages for backwards compatibility
+ $warning = wfMsgExt( 'fileexists-thumbnail-yes', 'parseinline',
+ $exists['thumbFile']->getTitle()->getPrefixedText(), $filename );
+ } elseif ( $exists['warning'] == 'thumb-name' ) {
+ // Image w/o '180px-' does not exists, but we do not like these filenames
+ $name = $file->getName();
+ $badPart = substr( $name, 0, strpos( $name, '-' ) + 1 );
+ $warning = wfMsgExt( 'file-thumbnail-no', 'parseinline', $badPart );
+ } elseif ( $exists['warning'] == 'bad-prefix' ) {
+ $warning = wfMsgExt( 'filename-bad-prefix', 'parseinline', $exists['prefix'] );
+ } elseif ( $exists['warning'] == 'was-deleted' ) {
# If the file existed before and was deleted, warn the user of this
- # Don't bother doing so if the file exists now, however
$ltitle = SpecialPage::getTitleFor( 'Log' );
$llink = $sk->linkKnown(
$ltitle,
@@ -424,21 +651,22 @@ class UploadForm extends SpecialPage {
array(),
array(
'type' => 'delete',
- 'page' => $file->getTitle()->getPrefixedText()
+ 'page' => $filename
)
);
- $warning .= '
' . wfMsgWikiHtml( 'filewasdeleted', $llink ) . '
';
+ $warning = wfMsgWikiHtml( 'filewasdeleted', $llink );
}
+
return $warning;
}
/**
* Get a list of warnings
*
- * @param string local filename, e.g. 'file exists', 'non-descriptive filename'
- * @return array list of warning messages
+ * @param $filename String: local filename, e.g. 'file exists', 'non-descriptive filename'
+ * @return Array: list of warning messages
*/
- static function ajaxGetExistsWarning( $filename ) {
+ public static function ajaxGetExistsWarning( $filename ) {
$file = wfFindFile( $filename );
if( !$file ) {
// Force local file so we have an object to do further checks against
@@ -449,48 +677,28 @@ class UploadForm extends SpecialPage {
if ( $file ) {
$exists = UploadBase::getExistsWarning( $file );
$warning = self::getExistsWarning( $exists );
- // FIXME: We probably also want the prefix blacklist and the wasdeleted check here
if ( $warning !== '' ) {
- $s = "
$warning
";
+ $s = "
$warning
";
}
}
return $s;
}
/**
- * Render a preview of a given license for the AJAX preview on upload
- *
- * @param string $license
- * @return string
- */
- public static function ajaxGetLicensePreview( $license ) {
- global $wgParser, $wgUser;
- $text = '{{' . $license . '}}';
- $title = Title::makeTitle( NS_FILE, 'Sample.jpg' );
- $options = ParserOptions::newFromUser( $wgUser );
-
- // Expand subst: first, then live templates...
- $text = $wgParser->preSaveTransform( $text, $title, $wgUser, $options );
- $output = $wgParser->parse( $text, $title, $options );
-
- return $output->getText();
- }
-
- /**
- * Construct the human readable warning message from an array of duplicate files
+ * Construct a warning and a gallery from an array of duplicate files.
*/
public static function getDupeWarning( $dupes ) {
if( $dupes ) {
global $wgOut;
- $msg = "";
+ $msg = '';
foreach( $dupes as $file ) {
$title = $file->getTitle();
$msg .= $title->getPrefixedText() .
- "|" . $title->getText() . "\n";
+ '|' . $title->getText() . "\n";
}
- $msg .= "";
- return "
\n" );
- $wgOut->addHTML( '' . $error . '' );
}
/**
- * There's something wrong with this file, not enough to reject it
- * totally but we require manual intervention to save it for real.
- * Stash it away, then present a form asking to confirm or cancel.
+ * Get the descriptor of the fieldset that contains the file source
+ * selection. The section is 'source'
*
- * @param string $warning as HTML
- * @access private
+ * @return Array: descriptor array
*/
- function uploadWarning( $warnings ) {
- global $wgOut, $wgUser;
- global $wgUseCopyrightUpload;
-
- $this->mSessionKey = $this->mUpload->stashSession();
-
- if( $sessionData === false ) {
- # Couldn't save file; an error has been displayed so let's go.
- return;
+ protected function getSourceSection() {
+ global $wgLang, $wgUser, $wgRequest;
+ global $wgMaxUploadSize;
+
+ if ( $this->mSessionKey ) {
+ return array(
+ 'wpSessionKey' => array(
+ 'type' => 'hidden',
+ 'default' => $this->mSessionKey,
+ ),
+ 'wpSourceType' => array(
+ 'type' => 'hidden',
+ 'default' => 'Stash',
+ ),
+ );
}
- $sk = $wgUser->getSkin();
-
- $wgOut->addHTML( '
' . wfMsgHtml( 'uploadwarning' ) . "
\n" );
- $wgOut->addHTML( '
' );
- foreach( $warnings as $warning => $args ) {
- $msg = null;
- if( $warning == 'exists' ) {
-
- //we should not have produced this warning if the user already acknowledged the destination warning
- //at any rate I don't see why we should hid this warning if mDestWarningAck has been checked
- //(it produces an empty warning page when no other warnings are fired)
- //if ( !$this->mDestWarningAck )
- $msg = self::getExistsWarning( $args );
-
- } elseif( $warning == 'duplicate' ) {
- $msg = $this->getDupeWarning( $args );
- } elseif( $warning == 'duplicate-archive' ) {
- $titleText = Title::makeTitle( NS_FILE, $args )->getPrefixedText();
- $msg = Xml::tags( 'li', null, wfMsgExt( 'file-deleted-duplicate', array( 'parseinline' ), array( $titleText ) ) );
- } elseif( $warning == 'filewasdeleted' ) {
- $ltitle = SpecialPage::getTitleFor( 'Log' );
- $llink = $sk->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ),
- 'type=delete&page=' . $args->getPrefixedUrl() );
- $msg = "\t
\n" );
-
+ protected function getExtensionsMessage() {
# Print a list of allowed file extensions, if so configured. We ignore
# MIME type here, it's incomprehensible to most people and too long.
- global $wgCheckFileExtensions, $wgStrictFileExtensions,
+ global $wgLang, $wgCheckFileExtensions, $wgStrictFileExtensions,
$wgFileExtensions, $wgFileBlacklist;
$allowedExtensions = '';
if( $wgCheckFileExtensions ) {
- $delim = wfMsgExt( 'comma-separator', array( 'escapenoentities' ) );
if( $wgStrictFileExtensions ) {
# Everything not permitted is banned
$extensionsList =
'