X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialUpload.php;h=7a789ae29c9fd03eb1cda81a01dfb6173382c88d;hb=1a450f99fb5fe56d79b90415003b9434240e9da5;hp=13bf30106da85fc965bff7c05167e9146dd966fc;hpb=bd7210698043d9fea07a9ea41734058513ab951b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 13bf30106d..7a789ae29c 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -5,14 +5,13 @@ * @ingroup Upload * * Form for handling uploads and special page. - * */ class SpecialUpload extends SpecialPage { /** * Constructor : initialise object * Get data POSTed through the form and assign them to the object - * @param WebRequest $request Data posted. + * @param $request WebRequest : data posted. */ public function __construct( $request = null ) { global $wgRequest; @@ -30,7 +29,7 @@ class SpecialUpload extends SpecialPage { protected $mUploadClicked; /** User input variables from the "description" section **/ - protected $mDesiredDestName; // The requested target file name + public $mDesiredDestName; // The requested target file name protected $mComment; protected $mLicense; @@ -41,14 +40,20 @@ class SpecialUpload extends SpecialPage { protected $mCopyrightSource; /** Hidden variables **/ + protected $mDestWarningAck; protected $mForReUpload; // The user followed an "overwrite this file" link protected $mCancelUpload; // The user clicked "Cancel and return to upload form" button protected $mTokenOk; + protected $mUploadSuccessful = false; // Subclasses can use this to determine whether a file was uploaded + + /** Text injection points for hooks not using HTMLForm **/ + public $uploadFormTextTop; + public $uploadFormTextAfterSummary; /** * Initialize instance variables from request and create an Upload handler * - * @param WebRequest $request The request to extract variables from + * @param $request WebRequest: the request to extract variables from */ protected function loadRequest( $request ) { global $wgUser; @@ -56,21 +61,23 @@ class SpecialUpload extends SpecialPage { $this->mRequest = $request; $this->mSourceType = $request->getVal( 'wpSourceType', 'file' ); $this->mUpload = UploadBase::createFromRequest( $request ); - $this->mUploadClicked = $request->wasPosted() - && ( $request->getCheck( 'wpUpload' ) + $this->mUploadClicked = $request->wasPosted() + && ( $request->getCheck( 'wpUpload' ) || $request->getCheck( 'wpUploadIgnoreWarning' ) ); // Guess the desired name from the filename if not provided $this->mDesiredDestName = $request->getText( 'wpDestFile' ); - if( !$this->mDesiredDestName ) + if( !$this->mDesiredDestName ) { $this->mDesiredDestName = $request->getText( 'wpUploadFile' ); + } $this->mComment = $request->getText( 'wpUploadDescription' ); $this->mLicense = $request->getText( 'wpLicense' ); + $this->mDestWarningAck = $request->getText( 'wpDestFileWarningAck' ); $this->mIgnoreWarning = $request->getCheck( 'wpIgnoreWarning' ) || $request->getCheck( 'wpUploadIgnoreWarning' ); - $this->mWatchthis = $request->getBool( 'wpWatchthis' ); + $this->mWatchthis = $request->getBool( 'wpWatchthis' ) && $wgUser->isLoggedIn(); $this->mCopyrightStatus = $request->getText( 'wpUploadCopyStatus' ); $this->mCopyrightSource = $request->getText( 'wpUploadSource' ); @@ -89,6 +96,9 @@ class SpecialUpload extends SpecialPage { } else { $this->mTokenOk = $wgUser->matchEditToken( $token ); } + + $this->uploadFormTextTop = ''; + $this->uploadFormTextAfterSummary = ''; } /** @@ -96,8 +106,8 @@ class SpecialUpload extends SpecialPage { * Handle permission checking elsewhere in order to be able to show * custom error messages. * - * @param User $user - * @return bool + * @param $user User object + * @return Boolean */ public function userCanExecute( $user ) { return UploadBase::isEnabled() && parent::userCanExecute( $user ); @@ -145,76 +155,118 @@ class SpecialUpload extends SpecialPage { # Unsave the temporary file in case this was a cancelled upload if ( $this->mCancelUpload ) { - if ( !$this->unsaveUploadedFile() ) + if ( !$this->unsaveUploadedFile() ) { # Something went wrong, so unsaveUploadedFile showed a warning return; + } } # Process upload or show a form - if ( $this->mTokenOk && !$this->mCancelUpload - && ( $this->mUpload && $this->mUploadClicked ) ) { + if ( + $this->mTokenOk && !$this->mCancelUpload && + ( $this->mUpload && $this->mUploadClicked ) + ) + { $this->processUpload(); } else { + # Backwards compatibility hook + if( !wfRunHooks( 'UploadForm:initial', array( &$this ) ) ) { + wfDebug( "Hook 'UploadForm:initial' broke output of the upload form" ); + return; + } + $this->showUploadForm( $this->getUploadForm() ); } # Cleanup - if ( $this->mUpload ) + if ( $this->mUpload ) { $this->mUpload->cleanupTempFile(); + } } /** - * Show the main upload form and optionally add the session key to the - * output. This hides the source selection. + * Show the main upload form * - * @param string $message HTML message to be shown at top of form - * @param string $sessionKey Session key of the stashed upload + * @param $form Mixed: an HTMLForm instance or HTML string to show */ protected function showUploadForm( $form ) { # Add links if file was previously deleted - if ( !$this->mDesiredDestName ) + if ( !$this->mDesiredDestName ) { $this->showViewDeletedLinks(); + } + + if ( $form instanceof HTMLForm ) { + $form->show(); + } else { + global $wgOut; + $wgOut->addHTML( $form ); + } - $form->show(); } /** * Get an UploadForm instance with title and text properly set. * - * @param string $message HTML string to add to the form - * @param string $sessionKey Session key in case this is a stashed upload + * @param $message String: HTML string to add to the form + * @param $sessionKey String: session key in case this is a stashed upload + * @param $hideIgnoreWarning Boolean: whether to hide "ignore warning" check box * @return UploadForm */ protected function getUploadForm( $message = '', $sessionKey = '', $hideIgnoreWarning = false ) { global $wgOut; - + # Initialize form $form = new UploadForm( array( - 'watch' => $this->watchCheck(), - 'forreupload' => $this->mForReUpload, + 'watch' => $this->getWatchCheck(), + 'forreupload' => $this->mForReUpload, 'sessionkey' => $sessionKey, 'hideignorewarning' => $hideIgnoreWarning, + 'destwarningack' => (bool)$this->mDestWarningAck, + + 'texttop' => $this->uploadFormTextTop, + 'textaftersummary' => $this->uploadFormTextAfterSummary, ) ); $form->setTitle( $this->getTitle() ); # Check the token, but only if necessary - if( !$this->mTokenOk && !$this->mCancelUpload - && ( $this->mUpload && $this->mUploadClicked ) ) + if( + !$this->mTokenOk && !$this->mCancelUpload && + ( $this->mUpload && $this->mUploadClicked ) + ) + { $form->addPreText( wfMsgExt( 'session_fail_preview', 'parseinline' ) ); + } + + # Give a notice if the user is uploading a file that has been deleted or moved + # Note that this is independent from the message 'filewasdeleted' that requires JS + $desiredTitleObj = Title::newFromText( $this->mDesiredDestName, NS_FILE ); + $delNotice = ''; // empty by default + if ( $desiredTitleObj instanceof Title && !$desiredTitleObj->exists() ) { + LogEventsList::showLogExtract( &$delNotice, array( 'delete', 'move' ), + $desiredTitleObj->getPrefixedText(), + '', array( 'lim' => 10, + 'conds' => array( "log_action != 'revision'" ), + 'showIfEmpty' => false, + 'msgKey' => array( 'upload-recreate-warning' ) ) + ); + } + $form->addPreText( $delNotice ); # Add text to form - $form->addPreText( '
' . wfMsgExt( 'uploadtext', 'parse' ) . '
'); + $form->addPreText( '
' . + wfMsgExt( 'uploadtext', 'parse', array( $this->mDesiredDestName ) ) . + '
' ); # Add upload error message $form->addPreText( $message ); - + # Add footer to form $uploadFooter = wfMsgNoTrans( 'uploadfooter' ); if ( $uploadFooter != '-' && !wfEmptyMsg( 'uploadfooter', $uploadFooter ) ) { $form->addPostText( '\n" ); } - - return $form; + + return $form; } @@ -226,16 +278,19 @@ class SpecialUpload extends SpecialPage { $title = Title::makeTitleSafe( NS_FILE, $this->mDesiredDestName ); // Show a subtitle link to deleted revisions (to sysops et al only) - if( $title instanceof Title && ( $count = $title->isDeleted() ) > 0 && $wgUser->isAllowed( 'deletedhistory' ) ) { - $link = wfMsgExt( - $wgUser->isAllowed( 'delete' ) ? 'thisisdeleted' : 'viewdeleted', - array( 'parse', 'replaceafter' ), - $wgUser->getSkin()->linkKnown( - SpecialPage::getTitleFor( 'Undelete', $title->getPrefixedText() ), - wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $count ) - ) - ); - $wgOut->addHTML( "
{$link}
" ); + if( $title instanceof Title ) { + $count = $title->isDeleted(); + if ( $count > 0 && $wgUser->isAllowed( 'deletedhistory' ) ) { + $link = wfMsgExt( + $wgUser->isAllowed( 'delete' ) ? 'thisisdeleted' : 'viewdeleted', + array( 'parse', 'replaceafter' ), + $wgUser->getSkin()->linkKnown( + SpecialPage::getTitleFor( 'Undelete', $title->getPrefixedText() ), + wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $count ) + ) + ); + $wgOut->addHTML( "
{$link}
" ); + } } // Show the relevant lines from deletion log (for still deleted files only) @@ -253,49 +308,60 @@ class SpecialUpload extends SpecialPage { * essentially means that UploadBase::VERIFICATION_ERROR and * UploadBase::EMPTY_FILE should not be passed here. * - * @param string $message HTML message to be passed to mainUploadForm + * @param $message String: HTML message to be passed to mainUploadForm */ - protected function recoverableUploadError( $message ) { + 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" + * Stashes the upload, shows the main form, but adds an "continue anyway button". + * Also checks whether there are actually warnings to display. * - * @param array $warnings + * @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 uploadWarning( $warnings ) { - global $wgUser; + 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; + } $sessionKey = $this->mUpload->stashSession(); - $sk = $wgUser->getSkin(); - $warningHtml = '

' . wfMsgHtml( 'uploadwarning' ) . "

\n" . '\n"; $warningHtml .= wfMsgExt( 'uploadwarning-text', 'parse' ); @@ -306,14 +372,17 @@ class SpecialUpload extends SpecialPage { $form->addButton( 'wpCancelUpload', wfMsg( 'reuploaddesc' ) ); $this->showUploadForm( $form ); + + # Indicate that we showed a form + return true; } /** * Show the upload form with error message, but do not stash the file. * - * @param string $message + * @param $message HTML string */ - protected function uploadError( $message ) { + protected function showUploadError( $message ) { $message = '

' . wfMsgHtml( 'uploadwarning' ) . "

\n" . '
' . $message . "
\n"; $this->showUploadForm( $this->getUploadForm( $message ) ); @@ -328,26 +397,44 @@ class SpecialUpload extends SpecialPage { // Verify permissions $permErrors = $this->mUpload->verifyPermissions( $wgUser ); - if( $permErrors !== true ) - return $wgOut->showPermissionsErrorPage( $permErrors ); + if( $permErrors !== true ) { + $wgOut->showPermissionsErrorPage( $permErrors ); + return; + } + + if( $this->mUpload instanceOf UploadFromUrl ) { + return $this->showUploadError( wfMsg( 'uploadfromurl-queued' ) ); + } // Fetch the file if required $status = $this->mUpload->fetchFile(); - if( !$status->isOK() ) - return $this->showUploadForm( $this->getUploadForm( $wgOut->parse( $status->getWikiText() ) ) ); + if( !$status->isOK() ) { + $this->showUploadError( $wgOut->parse( $status->getWikiText() ) ); + return; + } + + // Deprecated backwards compatibility hook + if( !wfRunHooks( 'UploadForm:BeforeProcessing', array( &$this ) ) ) { + wfDebug( "Hook 'UploadForm:BeforeProcessing' broke processing the file.\n" ); + return array( 'status' => UploadBase::BEFORE_PROCESSING ); + } + // Upload verification $details = $this->mUpload->verifyUpload(); - if ( $details['status'] != UploadBase::OK ) - return $this->processVerificationError( $details ); + if ( $details['status'] != UploadBase::OK ) { + $this->processVerificationError( $details ); + return; + } $this->mLocalFile = $this->mUpload->getLocalFile(); // Check warnings if necessary if( !$this->mIgnoreWarning ) { $warnings = $this->mUpload->checkWarnings(); - if( count( $warnings ) ) - return $this->uploadWarning( $warnings ); + if( $this->showUploadWarning( $warnings ) ) { + return; + } } // Get the page text if this is not a reupload @@ -358,13 +445,15 @@ class SpecialUpload extends SpecialPage { $pageText = false; } $status = $this->mUpload->performUpload( $this->mComment, $pageText, $this->mWatchthis, $wgUser ); - if ( !$status->isGood() ) - return $this->uploadError( $wgOut->parse( $status->getWikiText() ) ); + if ( !$status->isGood() ) { + $this->showUploadError( $wgOut->parse( $status->getWikiText() ) ); + return; + } // Success, redirect to description page + $this->mUploadSuccessful = true; wfRunHooks( 'SpecialUploadComplete', array( &$this ) ); $wgOut->redirect( $this->mLocalFile->getTitle()->getFullURL() ); - } /** @@ -377,15 +466,15 @@ class SpecialUpload extends SpecialPage { if ( $license != '' ) { $licensetxt = '== ' . wfMsgForContent( 'license-header' ) . " ==\n" . '{{' . $license . '}}' . "\n"; } - $pageText = '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n" . - '== ' . wfMsgForContent ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" . - "$licensetxt" . - '== ' . wfMsgForContent ( 'filesource' ) . " ==\n" . $source ; + $pageText = '== ' . wfMsgForContent( 'filedesc' ) . " ==\n" . $comment . "\n" . + '== ' . wfMsgForContent( 'filestatus' ) . " ==\n" . $copyStatus . "\n" . + "$licensetxt" . + '== ' . wfMsgForContent( 'filesource' ) . " ==\n" . $source; } else { if ( $license != '' ) { - $filedesc = $comment == '' ? '' : '== ' . wfMsgForContent ( 'filedesc' ) . " ==\n" . $comment . "\n"; - $pageText = $filedesc . - '== ' . wfMsgForContent ( 'license-header' ) . " ==\n" . '{{' . $license . '}}' . "\n"; + $filedesc = $comment == '' ? '' : '== ' . wfMsgForContent( 'filedesc' ) . " ==\n" . $comment . "\n"; + $pageText = $filedesc . + '== ' . wfMsgForContent( 'license-header' ) . " ==\n" . '{{' . $license . '}}' . "\n"; } else { $pageText = $comment; } @@ -404,7 +493,7 @@ class SpecialUpload extends SpecialPage { * Note that the page target can be changed *on the form*, so our check * state can get out of sync. */ - protected function watchCheck() { + protected function getWatchCheck() { global $wgUser; if( $wgUser->getOption( 'watchdefault' ) ) { // Watch all edits! @@ -426,7 +515,7 @@ class SpecialUpload extends SpecialPage { /** * Provides output to the user for a result of UploadBase::verifyUpload * - * @param array $details Result of UploadBase::verifyUpload + * @param $details Array: result of UploadBase::verifyUpload */ protected function processVerificationError( $details ) { global $wgFileExtensions, $wgLang; @@ -435,28 +524,31 @@ class SpecialUpload extends SpecialPage { /** Statuses that only require name changing **/ case UploadBase::MIN_LENGTH_PARTNAME: - $this->recoverableUploadError( wfMsgHtml( 'minlength1' ) ); + $this->showRecoverableUploadError( wfMsgHtml( 'minlength1' ) ); break; case UploadBase::ILLEGAL_FILENAME: - $this->recoverableUploadError( wfMsgExt( 'illegalfilename', + $this->showRecoverableUploadError( wfMsgExt( 'illegalfilename', 'parseinline', $details['filtered'] ) ); break; case UploadBase::OVERWRITE_EXISTING_FILE: - $this->recoverableUploadError( wfMsgExt( $details['overwrite'], + $this->showRecoverableUploadError( wfMsgExt( $details['overwrite'], 'parseinline' ) ); break; case UploadBase::FILETYPE_MISSING: - $this->recoverableUploadError( wfMsgExt( 'filetype-missing', + $this->showRecoverableUploadError( wfMsgExt( 'filetype-missing', 'parseinline' ) ); break; /** Statuses that require reuploading **/ case UploadBase::EMPTY_FILE: - $this->showUploadForm( $this->getUploadForm( wfMsgHtml( 'emptyfile' ) ) ); + $this->showUploadError( wfMsgHtml( 'emptyfile' ) ); + break; + case UploadBase::FILE_TOO_LARGE: + $this->showUploadError( wfMsgHtml( 'largefileserver' ) ); break; case UploadBase::FILETYPE_BADTYPE: $finalExt = $details['finalExt']; - $this->uploadError( + $this->showUploadError( wfMsgExt( 'filetype-banned-type', array( 'parseinline' ), htmlspecialchars( $finalExt ), @@ -471,11 +563,18 @@ class SpecialUpload extends SpecialPage { case UploadBase::VERIFICATION_ERROR: unset( $details['status'] ); $code = array_shift( $details['details'] ); - $this->uploadError( wfMsgExt( $code, 'parseinline', $details['details'] ) ); + $this->showUploadError( wfMsgExt( $code, 'parseinline', $details['details'] ) ); break; case UploadBase::HOOK_ABORTED: - $error = $details['error']; - $this->uploadError( wfMsgExt( $error, 'parseinline' ) ); + if ( is_array( $details['error'] ) ) { # allow hooks to return error details in an array + $args = $details['error']; + $error = array_shift( $args ); + } else { + $error = $details['error']; + $args = null; + } + + $this->showUploadError( wfMsgExt( $error, 'parseinline', $args ) ); break; default: throw new MWException( __METHOD__ . ": Unknown value `{$details['status']}`" ); @@ -484,15 +583,16 @@ class SpecialUpload extends SpecialPage { /** * Remove a temporarily kept file stashed by saveTempUploadedFile(). - * @access private - * @return success + * + * @return Boolean: success */ protected function unsaveUploadedFile() { global $wgOut; - if ( !( $this->mUpload instanceof UploadFromStash ) ) + if ( !( $this->mUpload instanceof UploadFromStash ) ) { return true; + } $success = $this->mUpload->unsaveUploadedFile(); - if ( ! $success ) { + if ( !$success ) { $wgOut->showFileDeleteError( $this->mUpload->getTempPath() ); return false; } else { @@ -506,42 +606,42 @@ class SpecialUpload extends SpecialPage { * Formats a result of UploadBase::getExistsWarning as HTML * This check is static and can be done pre-upload via AJAX * - * @param array $exists The result of UploadBase::getExistsWarning - * @return string Empty string if there is no warning or an HTML fragment - * consisting of one or more
  • elements if there is a warning. + * @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 ( !$exists ) + if ( !$exists ) { return ''; + } $file = $exists['file']; $filename = $file->getTitle()->getPrefixedText(); - $warning = array(); + $warning = ''; $sk = $wgUser->getSkin(); if( $exists['warning'] == 'exists' ) { // Exact match - $warning[] = '
  • ' . wfMsgExt( 'fileexists', 'parseinline', $filename ) . '
    • '; + $warning = wfMsgExt( 'fileexists', 'parseinline', $filename ); } elseif( $exists['warning'] == 'page-exists' ) { // Page exists but file does not - $warning[] = '
  • ' . wfMsgExt( 'filepageexists', 'parseinline', $filename ) . '
    • '; + $warning = wfMsgExt( 'filepageexists', 'parseinline', $filename ); } elseif ( $exists['warning'] == 'exists-normalized' ) { - $warning[] = '
  • ' . wfMsgExt( 'fileexists-extension', 'parseinline', $filename, - $exists['normalizedFile']->getTitle()->getPrefixedText() ) . '
    • '; + $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 ) . '
    • '; + $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 ) . '
    • '; + $warning = wfMsgExt( 'file-thumbnail-no', 'parseinline', $badPart ); } elseif ( $exists['warning'] == 'bad-prefix' ) { - $warning[] = '
  • ' . wfMsgExt( 'filename-bad-prefix', 'parseinline', $exists['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 $ltitle = SpecialPage::getTitleFor( 'Log' ); @@ -554,17 +654,17 @@ class SpecialUpload extends SpecialPage { 'page' => $filename ) ); - $warning[] = '
  • ' . wfMsgWikiHtml( 'filewasdeleted', $llink ) . '
    • '; + $warning = wfMsgWikiHtml( 'filewasdeleted', $llink ); } - return implode( "\n", $warning ); + 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 */ public static function ajaxGetExistsWarning( $filename ) { $file = wfFindFile( $filename ); @@ -578,46 +678,27 @@ class SpecialUpload extends SpecialPage { $exists = UploadBase::getExistsWarning( $file ); $warning = self::getExistsWarning( $exists ); if ( $warning !== '' ) { - $s = ""; + $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 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 "
  • " . - wfMsgExt( "file-exists-duplicate", array( "parse" ), count( $dupes ) ) . + $msg .= ''; + return '
  • ' . + wfMsgExt( 'file-exists-duplicate', array( 'parse' ), count( $dupes ) ) . $wgOut->parse( $msg ) . "
    • \n"; } else { @@ -635,49 +716,58 @@ class UploadForm extends HTMLForm { protected $mForReUpload; protected $mSessionKey; protected $mHideIgnoreWarning; - + protected $mDestWarningAck; + + protected $mTextTop; + protected $mTextAfterSummary; + protected $mSourceIds; public function __construct( $options = array() ) { - global $wgLang; - $this->mWatch = !empty( $options['watch'] ); $this->mForReUpload = !empty( $options['forreupload'] ); - $this->mSessionKey = isset( $options['sessionkey'] ) + $this->mSessionKey = isset( $options['sessionkey'] ) ? $options['sessionkey'] : ''; $this->mHideIgnoreWarning = !empty( $options['hideignorewarning'] ); + $this->mDestWarningAck = !empty( $options['destwarningack'] ); + + $this->mTextTop = $options['texttop']; + $this->mTextAfterSummary = $options['textaftersummary']; $sourceDescriptor = $this->getSourceSection(); $descriptor = $sourceDescriptor + $this->getDescriptionSection() + $this->getOptionsSection(); - wfRunHooks( 'UploadFormInitDescriptor', array( $descriptor ) ); + wfRunHooks( 'UploadFormInitDescriptor', array( &$descriptor ) ); parent::__construct( $descriptor, 'upload' ); # Set some form properties $this->setSubmitText( wfMsg( 'uploadbtn' ) ); $this->setSubmitName( 'wpUpload' ); + # Used message keys: 'accesskey-upload', 'tooltip-upload' $this->setSubmitTooltip( 'upload' ); $this->setId( 'mw-upload-form' ); # Build a list of IDs for javascript insertion $this->mSourceIds = array(); foreach ( $sourceDescriptor as $key => $field ) { - if ( !empty( $field['id'] ) ) + if ( !empty( $field['id'] ) ) { $this->mSourceIds[] = $field['id']; + } } } /** - * Get the descriptor of the fieldset that contains the file source + * Get the descriptor of the fieldset that contains the file source * selection. The section is 'source' - * - * @return array Descriptor array + * + * @return Array: descriptor array */ protected function getSourceSection() { global $wgLang, $wgUser, $wgRequest; + global $wgMaxUploadSize; if ( $this->mSessionKey ) { return array( @@ -697,30 +787,42 @@ class UploadForm extends HTMLForm { $selectedSourceType = strtolower( $wgRequest->getText( 'wpSourceType', 'File' ) ); $descriptor = array(); - $descriptor['UploadFile'] = array( - 'class' => 'UploadSourceField', + if ( $this->mTextTop ) { + $descriptor['UploadFormTextTop'] = array( + 'type' => 'info', 'section' => 'source', - 'type' => 'file', - 'id' => 'wpUploadFile', - 'label-message' => 'sourcefilename', - 'upload-type' => 'File', - 'radio' => &$radio, - 'help' => wfMsgExt( 'upload-maxfilesize', - array( 'parseinline', 'escapenoentities' ), - $wgLang->formatSize( - wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ) - ) - ) . ' ' . wfMsgHtml( 'upload_source_file' ), - 'checked' => $selectedSourceType == 'file', + 'default' => $this->mTextTop, + 'raw' => true, + ); + } + + $descriptor['UploadFile'] = array( + 'class' => 'UploadSourceField', + 'section' => 'source', + 'type' => 'file', + 'id' => 'wpUploadFile', + 'label-message' => 'sourcefilename', + 'upload-type' => 'File', + 'radio' => &$radio, + 'help' => wfMsgExt( 'upload-maxfilesize', + array( 'parseinline', 'escapenoentities' ), + $wgLang->formatSize( + wfShorthandToInteger( min( + wfShorthandToInteger( + ini_get( 'upload_max_filesize' ) + ), $wgMaxUploadSize + ) ) + ) + ) . ' ' . wfMsgHtml( 'upload_source_file' ), + 'checked' => $selectedSourceType == 'file', ); if ( $canUploadByUrl ) { - global $wgMaxUploadSize; $descriptor['UploadFileURL'] = array( 'class' => 'UploadSourceField', 'section' => 'source', 'id' => 'wpUploadFileURL', 'label-message' => 'sourceurl', - 'upload-type' => 'Url', + 'upload-type' => 'url', 'radio' => &$radio, 'help' => wfMsgExt( 'upload-maxfilesize', array( 'parseinline', 'escapenoentities' ), @@ -740,11 +842,10 @@ class UploadForm extends HTMLForm { return $descriptor; } - /** * Get the messages indicating which extensions are preferred and prohibitted. - * - * @return string HTML string containing the message + * + * @return String: HTML string containing the message */ protected function getExtensionsMessage() { # Print a list of allowed file extensions, if so configured. We ignore @@ -780,8 +881,8 @@ class UploadForm extends HTMLForm { /** * Get the descriptor of the fieldset that contains the file description * input. The section is 'description' - * - * @return array Descriptor array + * + * @return Array: descriptor array */ protected function getDescriptionSection() { global $wgUser, $wgOut; @@ -808,7 +909,18 @@ class UploadForm extends HTMLForm { : 'fileuploadsummary', 'cols' => $cols, 'rows' => 8, - ), + ) + ); + if ( $this->mTextAfterSummary ) { + $descriptor['UploadFormTextAfterSummary'] = array( + 'type' => 'info', + 'section' => 'description', + 'default' => $this->mTextAfterSummary, + 'raw' => true, + ); + } + + $descriptor += array( 'EditTools' => array( 'type' => 'edittools', 'section' => 'description', @@ -821,8 +933,9 @@ class UploadForm extends HTMLForm { 'label-message' => 'license', ), ); - if ( $this->mForReUpload ) + if ( $this->mForReUpload ) { $descriptor['DestFile']['readonly'] = true; + } global $wgUseCopyrightUpload; if ( $wgUseCopyrightUpload ) { @@ -844,22 +957,25 @@ class UploadForm extends HTMLForm { } /** - * Get the descriptor of the fieldset that contains the upload options, + * Get the descriptor of the fieldset that contains the upload options, * such as "watch this file". The section is 'options' - * - * @return array Descriptor array + * + * @return Array: descriptor array */ protected function getOptionsSection() { - global $wgOut; + global $wgUser; - $descriptor = array( - 'Watchthis' => array( - 'type' => 'check', - 'id' => 'wpWatchthis', - 'label-message' => 'watchthisupload', - 'section' => 'options', - ) - ); + if ( $wgUser->isLoggedIn() ) { + $descriptor = array( + 'Watchthis' => array( + 'type' => 'check', + 'id' => 'wpWatchthis', + 'label-message' => 'watchthisupload', + 'section' => 'options', + 'default' => $wgUser->getOption( 'watchcreations' ), + ) + ); + } if ( !$this->mHideIgnoreWarning ) { $descriptor['IgnoreWarning'] = array( 'type' => 'check', @@ -869,8 +985,21 @@ class UploadForm extends HTMLForm { ); } - return $descriptor; + $descriptor['wpDestFileWarningAck'] = array( + 'type' => 'hidden', + 'id' => 'wpDestFileWarningAck', + 'default' => $this->mDestWarningAck ? '1' : '', + ); + + if ( $this->mForReUpload ) { + $descriptor['wpForReUpload'] = array( + 'type' => 'hidden', + 'id' => 'wpForReUpload', + 'default' => '1', + ); + } + return $descriptor; } /** @@ -883,43 +1012,31 @@ class UploadForm extends HTMLForm { /** * Add upload JS to $wgOut - * - * @param bool $autofill Whether or not to autofill the destination - * filename text box */ - protected function addUploadJS( $autofill = true ) { - global $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview; - global $wgEnableFirefogg, $wgEnableJS2system; + protected function addUploadJS() { + global $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview, $wgEnableAPI; global $wgOut; $useAjaxDestCheck = $wgUseAjax && $wgAjaxUploadDestCheck; - $useAjaxLicensePreview = $wgUseAjax && $wgAjaxLicensePreview; + $useAjaxLicensePreview = $wgUseAjax && $wgAjaxLicensePreview && $wgEnableAPI; $scriptVars = array( - 'wgAjaxUploadDestCheck' => $wgUseAjax && $wgAjaxUploadDestCheck, - 'wgAjaxLicensePreview' => $wgUseAjax && $wgAjaxLicensePreview, - 'wgEnableFirefogg' => (bool)$wgEnableFirefogg, - 'wgUploadAutoFill' => (bool)$autofill, + 'wgAjaxUploadDestCheck' => $useAjaxDestCheck, + 'wgAjaxLicensePreview' => $useAjaxLicensePreview, + 'wgUploadAutoFill' => !$this->mForReUpload, 'wgUploadSourceIds' => $this->mSourceIds, ); $wgOut->addScript( Skin::makeVariablesScript( $scriptVars ) ); - - // For support; not provided by js2 yet + + // For support $wgOut->addScriptFile( 'edit.js' ); - - if ( $wgEnableJS2system ) { - // JS2 upload scripts - $wgOut->addScriptClass( 'uploadPage' ); - } else { - // Legacy upload javascript - $wgOut->addScriptFile( 'upload.js' ); - } + $wgOut->addScriptFile( 'upload.js' ); } /** * Empty function; submission is handled elsewhere. - * + * * @return bool false */ function trySubmit() { @@ -934,7 +1051,7 @@ class UploadForm extends HTMLForm { class UploadSourceField extends HTMLTextField { function getLabelHtml() { $id = "wpSourceType{$this->mParams['upload-type']}"; - $label = Html::rawElement( 'label', array( 'for' => $id ), $this->mLabel ); + $label = Html::rawElement( 'label', array( 'for' => $id ), $this->mLabel ); if ( !empty( $this->mParams['radio'] ) ) { $attribs = array( @@ -943,13 +1060,15 @@ class UploadSourceField extends HTMLTextField { 'id' => $id, 'value' => $this->mParams['upload-type'], ); - if ( !empty( $this->mParams['checked'] ) ) + if ( !empty( $this->mParams['checked'] ) ) { $attribs['checked'] = 'checked'; + } $label .= Html::element( 'input', $attribs ); } return Html::rawElement( 'td', array( 'class' => 'mw-label' ), $label ); } + function getSize() { return isset( $this->mParams['size'] ) ? $this->mParams['size']