X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialUpload.php;h=1227b93106b733f9a26ce28891159d9b7bf7fbca;hb=6b4990498b6c5b5ab2f86f53e3c2fa23a48c2b46;hp=a27d7b789ac1388a099c7a7190f6ee55589dbb3b;hpb=dec16a90a494ab906c364e6bc1ae2476af04a754;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php index a27d7b789a..1227b93106 100644 --- a/includes/SpecialUpload.php +++ b/includes/SpecialUpload.php @@ -15,24 +15,41 @@ function wfSpecialUpload() { } /** - * + * implements Special:Upload * @addtogroup SpecialPage */ class UploadForm { + const SUCCESS = 0; + const BEFORE_PROCESSING = 1; + const LARGE_FILE_SERVER = 2; + const EMPTY_FILE = 3; + const MIN_LENGHT_PARTNAME = 4; + const ILLEGAL_FILENAME = 5; + const PROTECTED_PAGE = 6; + const OVERWRITE_EXISTING_FILE = 7; + const FILETYPE_MISSING = 8; + const FILETYPE_BADTYPE = 9; + const VERIFICATION_ERROR = 10; + const UPLOAD_VERIFICATION_ERROR = 11; + const UPLOAD_WARNING = 12; + const INTERNAL_ERROR = 13; + /**#@+ * @access private */ - var $mUploadFile, $mUploadDescription, $mLicense ,$mIgnoreWarning, $mUploadError; - var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion; - var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload; - var $mOname, $mSessionKey, $mStashed, $mDestFile, $mRemoveTempFile, $mSourceType; - var $mUploadTempFileSize = 0; + var $mComment, $mLicense, $mIgnoreWarning, $mCurlError; + var $mDestName, $mTempPath, $mFileSize, $mFileProps; + var $mCopyrightStatus, $mCopyrightSource, $mReUpload, $mAction, $mUploadClicked; + var $mSrcName, $mSessionKey, $mStashed, $mDesiredDestName, $mRemoveTempFile, $mSourceType; + var $mDestWarningAck, $mCurlDestHandle; + var $mLocalFile; # Placeholders for text injection by hooks (must be HTML) # extensions should take care to _append_ to the present value var $uploadFormTextTop; var $uploadFormTextAfterSummary; + const SESSION_VERSION = 1; /**#@-*/ /** @@ -42,10 +59,13 @@ class UploadForm { */ function UploadForm( &$request ) { global $wgAllowCopyUploads; - $this->mDestFile = $request->getText( 'wpDestFile' ); + $this->mDesiredDestName = $request->getText( 'wpDestFile' ); + $this->mIgnoreWarning = $request->getCheck( 'wpIgnoreWarning' ); + $this->mComment = $request->getText( 'wpUploadDescription' ); if( !$request->wasPosted() ) { - # GET requests just give the main form; no data except wpDestfile. + # GET requests just give the main form; no data except destination + # filename and description return; } @@ -53,23 +73,22 @@ class UploadForm { $this->uploadFormTextTop = ""; $this->uploadFormTextAfterSummary = ""; - $this->mIgnoreWarning = $request->getCheck( 'wpIgnoreWarning' ); $this->mReUpload = $request->getCheck( 'wpReUpload' ); - $this->mUpload = $request->getCheck( 'wpUpload' ); + $this->mUploadClicked = $request->getCheck( 'wpUpload' ); - $this->mUploadDescription = $request->getText( 'wpUploadDescription' ); $this->mLicense = $request->getText( 'wpLicense' ); - $this->mUploadCopyStatus = $request->getText( 'wpUploadCopyStatus' ); - $this->mUploadSource = $request->getText( 'wpUploadSource' ); + $this->mCopyrightStatus = $request->getText( 'wpUploadCopyStatus' ); + $this->mCopyrightSource = $request->getText( 'wpUploadSource' ); $this->mWatchthis = $request->getBool( 'wpWatchthis' ); - $this->mSourceType = $request->getText( 'wpSourceType' ); - wfDebug( "UploadForm: watchthis is: '$this->mWatchthis'\n" ); + $this->mSourceType = $request->getText( 'wpSourceType' ); + $this->mDestWarningAck = $request->getText( 'wpDestFileWarningAck' ); $this->mAction = $request->getVal( 'action' ); $this->mSessionKey = $request->getInt( 'wpSessionKey' ); if( !empty( $this->mSessionKey ) && - isset( $_SESSION['wsUploadData'][$this->mSessionKey] ) ) { + isset( $_SESSION['wsUploadData'][$this->mSessionKey]['version'] ) && + $_SESSION['wsUploadData'][$this->mSessionKey]['version'] == self::SESSION_VERSION ) { /** * Confirming a temporarily stashed upload. * We don't want path names to be forged, so we keep @@ -77,10 +96,11 @@ class UploadForm { * an opaque key to the user agent. */ $data = $_SESSION['wsUploadData'][$this->mSessionKey]; - $this->mUploadTempName = $data['mUploadTempName']; - $this->mUploadSize = $data['mUploadSize']; - $this->mOname = $data['mOname']; - $this->mUploadError = 0/*UPLOAD_ERR_OK*/; + $this->mTempPath = $data['mTempPath']; + $this->mFileSize = $data['mFileSize']; + $this->mSrcName = $data['mSrcName']; + $this->mFileProps = $data['mFileProps']; + $this->mCurlError = 0/*UPLOAD_ERR_OK*/; $this->mStashed = true; $this->mRemoveTempFile = false; } else { @@ -100,10 +120,10 @@ class UploadForm { * @access private */ function initializeFromUpload( $request ) { - $this->mUploadTempName = $request->getFileTempName( 'wpUploadFile' ); - $this->mUploadSize = $request->getFileSize( 'wpUploadFile' ); - $this->mOname = $request->getFileName( 'wpUploadFile' ); - $this->mUploadError = $request->getUploadError( 'wpUploadFile' ); + $this->mTempPath = $request->getFileTempName( 'wpUploadFile' ); + $this->mFileSize = $request->getFileSize( 'wpUploadFile' ); + $this->mSrcName = $request->getFileName( 'wpUploadFile' ); + $this->mCurlError = $request->getUploadError( 'wpUploadFile' ); $this->mSessionKey = false; $this->mStashed = false; $this->mRemoveTempFile = false; // PHP will handle this @@ -118,10 +138,10 @@ class UploadForm { $url = $request->getText( 'wpUploadFileURL' ); $local_file = tempnam( $wgTmpDirectory, 'WEBUPLOAD' ); - $this->mUploadTempName = $local_file; - $this->mUploadError = $this->curlCopy( $url, $local_file ); - $this->mUploadSize = $this->mUploadTempFileSize; - $this->mOname = array_pop( explode( '/', $url ) ); + $this->mTempPath = $local_file; + $this->mFileSize = 0; # Will be set by curlCopy + $this->mCurlError = $this->curlCopy( $url, $local_file ); + $this->mSrcName = array_pop( explode( '/', $url ) ); $this->mSessionKey = false; $this->mStashed = false; @@ -150,8 +170,8 @@ class UploadForm { } # Open temporary file - $this->mUploadTempFile = @fopen( $this->mUploadTempName, "wb" ); - if( $this->mUploadTempFile === false ) { + $this->mCurlDestHandle = @fopen( $this->mTempPath, "wb" ); + if( $this->mCurlDestHandle === false ) { # Could not open temporary file to write in $wgOut->errorPage( 'upload-file-error', 'upload-file-error-text'); return true; @@ -169,8 +189,8 @@ class UploadForm { // if ( $error ) print curl_error ( $ch ) ; # Debugging output curl_close( $ch ); - fclose( $this->mUploadTempFile ); - unset( $this->mUploadTempFile ); + fclose( $this->mCurlDestHandle ); + unset( $this->mCurlDestHandle ); if( $error ) { unlink( $dest ); if( wfEmptyMsg( "upload-curl-error$errornum", wfMsg("upload-curl-error$errornum") ) ) @@ -191,11 +211,11 @@ class UploadForm { function uploadCurlCallback( $ch, $data ) { global $wgMaxUploadSize; $length = strlen( $data ); - $this->mUploadTempFileSize += $length; - if( $this->mUploadTempFileSize > $wgMaxUploadSize ) { + $this->mFileSize += $length; + if( $this->mFileSize > $wgMaxUploadSize ) { return 0; } - fwrite( $this->mUploadTempFile, $data ); + fwrite( $this->mCurlDestHandle, $data ); return $length; } @@ -205,11 +225,11 @@ class UploadForm { */ function execute() { global $wgUser, $wgOut; - global $wgEnableUploads, $wgUploadDirectory; + global $wgEnableUploads; # Check uploading enabled if( !$wgEnableUploads ) { - $wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext' ); + $wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext', array( $this->mDesiredDestName ) ); return; } @@ -234,18 +254,12 @@ class UploadForm { return; } - /** Check if the image directory is writeable, this is a common mistake */ - if( !is_writeable( $wgUploadDirectory ) ) { - $wgOut->addWikiText( wfMsg( 'upload_directory_read_only', $wgUploadDirectory ) ); - return; - } - if( $this->mReUpload ) { if( !$this->unsaveUploadedFile() ) { return; } $this->mainUploadForm(); - } else if( 'submit' == $this->mAction || $this->mUpload ) { + } else if( 'submit' == $this->mAction || $this->mUploadClicked ) { $this->processUpload(); } else { $this->mainUploadForm(); @@ -254,48 +268,138 @@ class UploadForm { $this->cleanupTempFile(); } - /* -------------------------------------------------------------- */ + /** + * Do the upload + * Checks are made in SpecialUpload::execute() + * + * @access private + */ + function processUpload(){ + global $wgUser, $wgOut, $wgFileExtensions; + $details = null; + $value = null; + $value = $this->internalProcessUpload( $details ); + + switch($value) { + case self::SUCCESS: + $wgOut->redirect( $this->mLocalFile->getTitle()->getFullURL() ); + break; + + case self::BEFORE_PROCESSING: + break; + + case self::LARGE_FILE_SERVER: + $this->mainUploadForm( wfMsgHtml( 'largefileserver' ) ); + break; + + case self::EMPTY_FILE: + $this->mainUploadForm( wfMsgHtml( 'emptyfile' ) ); + break; + + case self::MIN_LENGHT_PARTNAME: + $this->mainUploadForm( wfMsgHtml( 'minlength1' ) ); + break; + + case self::ILLEGAL_FILENAME: + $filtered = $details['filtered']; + $this->uploadError( wfMsgWikiHtml( 'illegalfilename', htmlspecialchars( $filtered ) ) ); + break; + + case self::PROTECTED_PAGE: + $this->uploadError( wfMsgWikiHtml( 'protectedpage' ) ); + break; + + case self::OVERWRITE_EXISTING_FILE: + $errorText = $details['overwrite']; + $overwrite = new WikiError( $wgOut->parse( $errorText ) ); + $this->uploadError( $overwrite->toString() ); + break; + + case self::FILETYPE_MISSING: + $this->uploadError( wfMsgExt( 'filetype-missing', array ( 'parseinline' ) ) ); + break; + + case self::FILETYPE_BADTYPE: + $finalExt = $details['finalExt']; + $this->uploadError( + wfMsgExt( 'filetype-banned-type', + array( 'parseinline' ), + htmlspecialchars( $finalExt ), + implode( + wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ), + $wgFileExtensions + ) + ) + ); + break; + + case self::VERIFICATION_ERROR: + $veri = $details['veri']; + $this->uploadError( $veri->toString() ); + break; + + case self::UPLOAD_VERIFICATION_ERROR: + $error = $details['error']; + $this->uploadError( $error ); + break; + + case self::UPLOAD_WARNING: + $warning = $details['warning']; + $this->uploadWarning( $warning ); + break; + + case self::INTERNAL_ERROR: + $internal = $details['internal']; + $this->showError( $internal ); + break; + + default: + throw new MWException( __METHOD__ . ": Unknown value `{$value}`" ); + } + } /** * Really do the upload * Checks are made in SpecialUpload::execute() + * + * @param array $resultDetails contains result-specific dict of additional values + * * @access private */ - function processUpload() { - global $wgUser, $wgOut; + function internalProcessUpload( &$resultDetails ) { + global $wgUser; if( !wfRunHooks( 'UploadForm:BeforeProcessing', array( &$this ) ) ) { wfDebug( "Hook 'UploadForm:BeforeProcessing' broke processing the file." ); - return false; + return self::BEFORE_PROCESSING; } /* Check for PHP error if any, requires php 4.2 or newer */ - if( $this->mUploadError == 1/*UPLOAD_ERR_INI_SIZE*/ ) { - $this->mainUploadForm( wfMsgHtml( 'largefileserver' ) ); - return; + if( $this->mCurlError == 1/*UPLOAD_ERR_INI_SIZE*/ ) { + return self::LARGE_FILE_SERVER; } /** * If there was no filename or a zero size given, give up quick. */ - if( trim( $this->mOname ) == '' || empty( $this->mUploadSize ) ) { - $this->mainUploadForm( wfMsgHtml( 'emptyfile' ) ); - return; + if( trim( $this->mSrcName ) == '' || empty( $this->mFileSize ) ) { + return self::EMPTY_FILE; } # Chop off any directories in the given filename - if( $this->mDestFile ) { - $basename = wfBaseName( $this->mDestFile ); + if( $this->mDesiredDestName ) { + $basename = $this->mDesiredDestName; } else { - $basename = wfBaseName( $this->mOname ); + $basename = $this->mSrcName; } + $filtered = wfBaseName( $basename ); /** * We'll want to blacklist against *any* 'extension', and use * only the final one for the whitelist. */ - list( $partname, $ext ) = $this->splitExtensions( $basename ); + list( $partname, $ext ) = $this->splitExtensions( $filtered ); if( count( $ext ) ) { $finalExt = $ext[count( $ext ) - 1]; @@ -310,47 +414,49 @@ class UploadForm { $partname .= '.' . $ext[$i]; } - if( strlen( $partname ) < 3 ) { - $this->mainUploadForm( wfMsgHtml( 'minlength' ) ); - return; + if( strlen( $partname ) < 1 ) { + return self::MIN_LENGHT_PARTNAME; } /** * Filter out illegal characters, and try to make a legible name * out of it. We'll strip some silently that Title would die on. */ - $filtered = preg_replace ( "/[^".Title::legalChars()."]|:/", '-', $basename ); - $nt = Title::newFromText( $filtered ); + $filtered = preg_replace ( "/[^".Title::legalChars()."]|:/", '-', $filtered ); + $nt = Title::makeTitleSafe( NS_IMAGE, $filtered ); if( is_null( $nt ) ) { - $this->uploadError( wfMsgWikiHtml( 'illegalfilename', htmlspecialchars( $filtered ) ) ); - return; + $resultDetails = array( 'filtered' => $filtered ); + return self::ILLEGAL_FILENAME; } - $nt =& Title::makeTitle( NS_IMAGE, $nt->getDBkey() ); - $this->mUploadSaveName = $nt->getDBkey(); + $this->mLocalFile = wfLocalFile( $nt ); + $this->mDestName = $this->mLocalFile->getName(); /** * If the image is protected, non-sysop users won't be able * to modify it by uploading a new revision. */ - if( !$nt->userCan( 'edit' ) ) { - return $this->uploadError( wfMsgWikiHtml( 'protectedpage' ) ); + if( !$nt->userCan( 'edit' ) || !$nt->userCan( 'create' ) ) { + return self::PROTECTED_PAGE; } /** * In some cases we may forbid overwriting of existing files. */ - $overwrite = $this->checkOverwrite( $this->mUploadSaveName ); - if( WikiError::isError( $overwrite ) ) { - return $this->uploadError( $overwrite->toString() ); + $overwrite = $this->checkOverwrite( $this->mDestName ); + if( $overwrite !== true ) { + $resultDetails = array( 'overwrite' => $overwrite ); + return self::OVERWRITE_EXISTING_FILE; } /* Don't allow users to override the blacklist (check file extension) */ global $wgStrictFileExtensions; global $wgFileExtensions, $wgFileBlacklist; - if( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) || - ($wgStrictFileExtensions && - !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) { - return $this->uploadError( wfMsgHtml( 'badfiletype', htmlspecialchars( $finalExt ) ) ); + if ($finalExt == '') { + return self::FILETYPE_MISSING; + } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) || + ($wgStrictFileExtensions && !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) { + $resultDetails = array( 'finalExt' => $finalExt ); + return self::FILETYPE_BADTYPE; } /** @@ -359,23 +465,27 @@ class UploadForm { * probably not accept it. */ if( !$this->mStashed ) { + $this->mFileProps = File::getPropsFromPath( $this->mTempPath, $finalExt ); $this->checkMacBinary(); - $veri = $this->verify( $this->mUploadTempName, $finalExt ); + $veri = $this->verify( $this->mTempPath, $finalExt ); if( $veri !== true ) { //it's a wiki error... - return $this->uploadError( $veri->toString() ); + $resultDetails = array( 'veri' => $veri ); + return self::VERIFICATION_ERROR; } - } - /** - * Provide an opportunity for extensions to add futher checks - */ - $error = ''; - if( !wfRunHooks( 'UploadVerification', - array( $this->mUploadSaveName, $this->mUploadTempName, &$error ) ) ) { - return $this->uploadError( $error ); + /** + * Provide an opportunity for extensions to add further checks + */ + $error = ''; + if( !wfRunHooks( 'UploadVerification', + array( $this->mDestName, $this->mTempPath, &$error ) ) ) { + $resultDetails = array( 'error' => $error ); + return self::UPLOAD_VERIFICATION_ERROR; + } } + /** * Check for non-fatal conditions */ @@ -386,51 +496,46 @@ class UploadForm { if( $wgCapitalLinks ) { $filtered = ucfirst( $filtered ); } - if( $this->mUploadSaveName != $filtered ) { - $warning .= '
  • '.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'
    • '; + if( $basename != $filtered ) { + $warning .= '
  • '.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mDestName ) ).'
    • '; } global $wgCheckFileExtensions; if ( $wgCheckFileExtensions ) { - if ( ! $this->checkFileExtension( $finalExt, $wgFileExtensions ) ) { - $warning .= '
  • '.wfMsgHtml( 'badfiletype', htmlspecialchars( $finalExt ) ).'
    • '; + if ( !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) { + $warning .= '
  • ' . + wfMsgExt( 'filetype-unwanted-type', + array( 'parseinline' ), + htmlspecialchars( $finalExt ), + implode( + wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ), + $wgFileExtensions + ) + ) . '
    • '; } } global $wgUploadSizeWarning; - if ( $wgUploadSizeWarning && ( $this->mUploadSize > $wgUploadSizeWarning ) ) { - $skin =& $wgUser->getSkin(); + if ( $wgUploadSizeWarning && ( $this->mFileSize > $wgUploadSizeWarning ) ) { + $skin = $wgUser->getSkin(); $wsize = $skin->formatSize( $wgUploadSizeWarning ); - $asize = $skin->formatSize( $this->mUploadSize ); + $asize = $skin->formatSize( $this->mFileSize ); $warning .= '
  • ' . wfMsgHtml( 'large-file', $wsize, $asize ) . '
    • '; } - if ( $this->mUploadSize == 0 ) { + if ( $this->mFileSize == 0 ) { $warning .= '
  • '.wfMsgHtml( 'emptyfile' ).'
    • '; } - if( $nt->getArticleID() ) { - global $wgUser; - $sk = $wgUser->getSkin(); - $dlink = $sk->makeKnownLinkObj( $nt ); - $warning .= '
  • '.wfMsgHtml( 'fileexists', $dlink ).'
    • '; - } else { - # If the file existed before and was deleted, warn the user of this - # Don't bother doing so if the image exists now, however - $image = new Image( $nt ); - if( $image->wasDeleted() ) { - $skin = $wgUser->getSkin(); - $ltitle = SpecialPage::getTitleFor( 'Log' ); - $llink = $skin->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ), 'type=delete&page=' . $nt->getPrefixedUrl() ); - $warning .= wfOpenElement( 'li' ) . wfMsgWikiHtml( 'filewasdeleted', $llink ) . wfCloseElement( 'li' ); - } + if ( !$this->mDestWarningAck ) { + $warning .= self::getExistsWarning( $this->mLocalFile ); } - if( $warning != '' ) { /** * Stash the file in a temporary location; the user can choose * to let it through and we'll complete the upload then. */ - return $this->uploadWarning( $warning ); + $resultDetails = array( 'warning' => $warning ); + return self::UPLOAD_WARNING; } } @@ -438,91 +543,215 @@ class UploadForm { * Try actually saving the thing... * It will show an error form on failure. */ - $hasBeenMunged = !empty( $this->mSessionKey ) || $this->mRemoveTempFile; - if( $this->saveUploadedFile( $this->mUploadSaveName, - $this->mUploadTempName, - $hasBeenMunged ) ) { - /** - * Update the upload log and create the description page - * if it's a new file. - */ - $img = Image::newFromName( $this->mUploadSaveName ); - $success = $img->recordUpload( $this->mUploadOldVersion, - $this->mUploadDescription, - $this->mLicense, - $this->mUploadCopyStatus, - $this->mUploadSource, - $this->mWatchthis ); - - if ( $success ) { - $this->showSuccess(); - wfRunHooks( 'UploadComplete', array( &$img ) ); - } else { - // Image::recordUpload() fails if the image went missing, which is - // unlikely, hence the lack of a specialised message - $wgOut->showFileNotFoundError( $this->mUploadSaveName ); + $pageText = self::getInitialPageText( $this->mComment, $this->mLicense, + $this->mCopyrightStatus, $this->mCopyrightSource ); + + $status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText, + File::DELETE_SOURCE, $this->mFileProps ); + if ( !$status->isGood() ) { + $resultDetails = array( 'internal' => $status->getWikiText() ); + return self::INTERNAL_ERROR; + } else { + if ( $this->mWatchthis ) { + global $wgUser; + $wgUser->addWatch( $this->mLocalFile->getTitle() ); } + // Success, redirect to description page + $img = null; // @todo: added to avoid passing a ref to null - should this be defined somewhere? + wfRunHooks( 'UploadComplete', array( &$this ) ); + return self::SUCCESS; } } /** - * Move the uploaded file from its temporary location to the final - * destination. If a previous version of the file exists, move - * it into the archive subdirectory. - * - * @todo If the later save fails, we may have disappeared the original file. - * - * @param string $saveName - * @param string $tempName full path to the temporary file - * @param bool $useRename if true, doesn't check that the source file - * is a PHP-managed upload temporary + * Do existence checks on a file and produce a warning + * This check is static and can be done pre-upload via AJAX + * Returns an HTML fragment consisting of one or more LI elements if there is a warning + * Returns an empty string if there is no warning */ - function saveUploadedFile( $saveName, $tempName, $useRename = false ) { - global $wgOut, $wgAllowCopyUploads; + static function getExistsWarning( $file ) { + global $wgUser, $wgContLang; + // Check for uppercase extension. We allow these filenames but check if an image + // with lowercase extension exists already + $warning = ''; + $align = $wgContLang->isRtl() ? 'left' : 'right'; + + if( strpos( $file->getName(), '.' ) == false ) { + $partname = $file->getName(); + $rawExtension = ''; + } else { + $n = strrpos( $file->getName(), '.' ); + $rawExtension = substr( $file->getName(), $n + 1 ); + $partname = substr( $file->getName(), 0, $n ); + } - if ( !$useRename AND $wgAllowCopyUploads AND $this->mSourceType == 'web' ) $useRename = true; + $sk = $wgUser->getSkin(); - $fname= "SpecialUpload::saveUploadedFile"; + if ( $rawExtension != $file->getExtension() ) { + // We're not using the normalized form of the extension. + // Normal form is lowercase, using most common of alternate + // extensions (eg 'jpg' rather than 'JPEG'). + // + // Check for another file using the normalized form... + $nt_lc = Title::newFromText( $partname . '.' . $file->getExtension() ); + $file_lc = wfLocalFile( $nt_lc ); + } else { + $file_lc = false; + } - $dest = wfImageDir( $saveName ); - $archive = wfImageArchiveDir( $saveName ); - if ( !is_dir( $dest ) ) wfMkdirParents( $dest ); - if ( !is_dir( $archive ) ) wfMkdirParents( $archive ); + if( $file->exists() ) { + $dlink = $sk->makeKnownLinkObj( $file->getTitle() ); + if ( $file->allowInlineDisplay() ) { + $dlink2 = $sk->makeImageLinkObj( $file->getTitle(), wfMsgExt( 'fileexists-thumb', 'parseinline' ), + $file->getName(), $align, array(), false, true ); + } elseif ( !$file->allowInlineDisplay() && $file->isSafeFile() ) { + $icon = $file->iconThumb(); + $dlink2 = '
    ' . + $icon->toHtml( array( 'desc-link' => true ) ) . '
    ' . $dlink . '
    '; + } else { + $dlink2 = ''; + } - $this->mSavedFile = "{$dest}/{$saveName}"; + $warning .= '
  • ' . wfMsgExt( 'fileexists', 'parseinline', $dlink ) . '
    • ' . $dlink2; + + } elseif( $file->getTitle()->getArticleID() ) { + $lnk = $sk->makeKnownLinkObj( $file->getTitle(), '', 'redirect=no' ); + $warning .= '
  • ' . wfMsgExt( 'filepageexists', array( 'parseinline', 'replaceafter' ), $lnk ) . '
    • '; + } elseif ( $file_lc && $file_lc->exists() ) { + # Check if image with lowercase extension exists. + # It's not forbidden but in 99% it makes no sense to upload the same filename with uppercase extension + $dlink = $sk->makeKnownLinkObj( $nt_lc ); + if ( $file_lc->allowInlineDisplay() ) { + $dlink2 = $sk->makeImageLinkObj( $nt_lc, wfMsgExt( 'fileexists-thumb', 'parseinline' ), + $nt_lc->getText(), $align, array(), false, true ); + } elseif ( !$file_lc->allowInlineDisplay() && $file_lc->isSafeFile() ) { + $icon = $file_lc->iconThumb(); + $dlink2 = '
    ' . + $icon->toHtml( array( 'desc-link' => true ) ) . '
    ' . $dlink . '
    '; + } else { + $dlink2 = ''; + } - if( is_file( $this->mSavedFile ) ) { - $this->mUploadOldVersion = gmdate( 'YmdHis' ) . "!{$saveName}"; - wfSuppressWarnings(); - $success = rename( $this->mSavedFile, "${archive}/{$this->mUploadOldVersion}" ); - wfRestoreWarnings(); + $warning .= '
  • ' . wfMsgExt( 'fileexists-extension', 'parsemag', $file->getName(), $dlink ) . '
    • ' . $dlink2; - if( ! $success ) { - $wgOut->showFileRenameError( $this->mSavedFile, - "${archive}/{$this->mUploadOldVersion}" ); - return false; + } elseif ( ( substr( $partname , 3, 3 ) == 'px-' || substr( $partname , 2, 3 ) == 'px-' ) + && ereg( "[0-9]{2}" , substr( $partname , 0, 2) ) ) + { + # Check for filenames like 50px- or 180px-, these are mostly thumbnails + $nt_thb = Title::newFromText( substr( $partname , strpos( $partname , '-' ) +1 ) . '.' . $rawExtension ); + $file_thb = wfLocalFile( $nt_thb ); + if ($file_thb->exists() ) { + # Check if an image without leading '180px-' (or similiar) exists + $dlink = $sk->makeKnownLinkObj( $nt_thb); + if ( $file_thb->allowInlineDisplay() ) { + $dlink2 = $sk->makeImageLinkObj( $nt_thb, + wfMsgExt( 'fileexists-thumb', 'parseinline' ), + $nt_thb->getText(), $align, array(), false, true ); + } elseif ( !$file_thb->allowInlineDisplay() && $file_thb->isSafeFile() ) { + $icon = $file_thb->iconThumb(); + $dlink2 = '
    ' . + $icon->toHtml( array( 'desc-link' => true ) ) . '
    ' . + $dlink . '
    '; + } else { + $dlink2 = ''; + } + + $warning .= '
  • ' . wfMsgExt( 'fileexists-thumbnail-yes', 'parsemag', $dlink ) . + '
    • ' . $dlink2; + } else { + # Image w/o '180px-' does not exists, but we do not like these filenames + $warning .= '
  • ' . wfMsgExt( 'file-thumbnail-no', 'parseinline' , + substr( $partname , 0, strpos( $partname , '-' ) +1 ) ) . '
    • '; } - else wfDebug("$fname: moved file ".$this->mSavedFile." to ${archive}/{$this->mUploadOldVersion}\n"); } - else { - $this->mUploadOldVersion = ''; + + $filenamePrefixBlacklist = self::getFilenamePrefixBlacklist(); + # Do the match + foreach( $filenamePrefixBlacklist as $prefix ) { + if ( substr( $partname, 0, strlen( $prefix ) ) == $prefix ) { + $warning .= '
  • ' . wfMsgExt( 'filename-bad-prefix', 'parseinline', $prefix ) . '
    • '; + break; + } } - wfSuppressWarnings(); - $success = $useRename - ? rename( $tempName, $this->mSavedFile ) - : move_uploaded_file( $tempName, $this->mSavedFile ); - wfRestoreWarnings(); + if ( $file->wasDeleted() && !$file->exists() ) { + # 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->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ), + 'type=delete&page=' . $file->getTitle()->getPrefixedUrl() ); + $warning .= '
  • ' . wfMsgWikiHtml( 'filewasdeleted', $llink ) . '
    • '; + } + return $warning; + } - if( ! $success ) { - $wgOut->showFileCopyError( $tempName, $this->mSavedFile ); - return false; - } else { - wfDebug("$fname: wrote tempfile $tempName to ".$this->mSavedFile."\n"); + /** + * Get a list of warnings + * + * @param string local filename, e.g. 'file exists', 'non-descriptive filename' + * @return array list of warning messages + */ + static function ajaxGetExistsWarning( $filename ) { + $file = wfFindFile( $filename ); + if( !$file ) { + // Force local file so we have an object to do further checks against + // if there isn't an exact match... + $file = wfLocalFile( $filename ); + } + $s = ' '; + if ( $file ) { + $warning = self::getExistsWarning( $file ); + if ( $warning !== '' ) { + $s = ""; + } } + 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_IMAGE, '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(); + } - chmod( $this->mSavedFile, 0644 ); - return true; + /** + * Get a list of blacklisted filename prefixes from [[MediaWiki:filename-prefix-blacklist]] + * + * @return array list of prefixes + */ + public static function getFilenamePrefixBlacklist() { + $blacklist = array(); + $message = wfMsgForContent( 'filename-prefix-blacklist' ); + if( $message && !( wfEmptyMsg( 'filename-prefix-blacklist', $message ) || $message == '-' ) ) { + $lines = explode( "\n", $message ); + foreach( $lines as $line ) { + // Remove comment lines + $comment = substr( trim( $line ), 0, 1 ); + if ( $comment == '#' || $comment == '' ) { + continue; + } + // Remove additional comments after a prefix + $comment = strpos( $line, '#' ); + if ( $comment > 0 ) { + $line = substr( $line, 0, $comment-1 ); + } + $blacklist[] = trim( $line ); + } + } + return $blacklist; } /** @@ -539,19 +768,14 @@ class UploadForm { */ function saveTempUploadedFile( $saveName, $tempName ) { global $wgOut; - $archive = wfImageArchiveDir( $saveName, 'temp' ); - if ( !is_dir ( $archive ) ) wfMkdirParents( $archive ); - $stash = $archive . '/' . gmdate( "YmdHis" ) . '!' . $saveName; - - $success = $this->mRemoveTempFile - ? rename( $tempName, $stash ) - : move_uploaded_file( $tempName, $stash ); - if ( !$success ) { - $wgOut->showFileCopyError( $tempName, $stash ); + $repo = RepoGroup::singleton()->getLocalRepo(); + $status = $repo->storeTemp( $saveName, $tempName ); + if ( !$status->isGood() ) { + $this->showError( $status->getWikiText() ); return false; + } else { + return $status->value; } - - return $stash; } /** @@ -564,8 +788,7 @@ class UploadForm { * @access private */ function stashSession() { - $stash = $this->saveTempUploadedFile( - $this->mUploadSaveName, $this->mUploadTempName ); + $stash = $this->saveTempUploadedFile( $this->mDestName, $this->mTempPath ); if( !$stash ) { # Couldn't save the file. @@ -574,9 +797,12 @@ class UploadForm { $key = mt_rand( 0, 0x7fffffff ); $_SESSION['wsUploadData'][$key] = array( - 'mUploadTempName' => $stash, - 'mUploadSize' => $this->mUploadSize, - 'mOname' => $this->mOname ); + 'mTempPath' => $stash, + 'mFileSize' => $this->mFileSize, + 'mSrcName' => $this->mSrcName, + 'mFileProps' => $this->mFileProps, + 'version' => self::SESSION_VERSION, + ); return $key; } @@ -587,11 +813,10 @@ class UploadForm { */ function unsaveUploadedFile() { global $wgOut; - wfSuppressWarnings(); - $success = unlink( $this->mUploadTempName ); - wfRestoreWarnings(); + $repo = RepoGroup::singleton()->getLocalRepo(); + $success = $repo->freeTemp( $this->mTempPath ); if ( ! $success ) { - $wgOut->showFileDeleteError( $this->mUploadTempName ); + $wgOut->showFileDeleteError( $this->mTempPath ); return false; } else { return true; @@ -600,24 +825,6 @@ class UploadForm { /* -------------------------------------------------------------- */ - /** - * Show some text and linkage on successful upload. - * @access private - */ - function showSuccess() { - global $wgUser, $wgOut, $wgContLang; - - $sk = $wgUser->getSkin(); - $ilink = $sk->makeMediaLink( $this->mUploadSaveName, Image::imageUrl( $this->mUploadSaveName ) ); - $dname = $wgContLang->getNsText( NS_IMAGE ) . ':'.$this->mUploadSaveName; - $dlink = $sk->makeKnownLink( $dname, $dname ); - - $wgOut->addHTML( '

    ' . wfMsgHtml( 'successfulupload' ) . "

    \n" ); - $text = wfMsgWikiHtml( 'fileuploaded', $ilink, $dlink ); - $wgOut->addHTML( $text ); - $wgOut->returnToMain( false ); - } - /** * @param string $error as HTML * @access private @@ -637,7 +844,7 @@ class UploadForm { * @access private */ function uploadWarning( $warning ) { - global $wgOut; + global $wgOut, $wgContLang; global $wgUseCopyrightUpload; $this->mSessionKey = $this->stashSession(); @@ -655,12 +862,14 @@ class UploadForm { $reup = wfMsgWikiHtml( 'reuploaddesc' ); $titleObj = SpecialPage::getTitleFor( 'Upload' ); $action = $titleObj->escapeLocalURL( 'action=submit' ); + $align1 = $wgContLang->isRTL() ? 'left' : 'right'; + $align2 = $wgContLang->isRTL() ? 'right' : 'left'; if ( $wgUseCopyrightUpload ) { $copyright = " - mUploadCopyStatus ) . "\" /> - mUploadSource ) . "\" /> + mCopyrightStatus ) . "\" /> + mCopyrightSource ) . "\" /> "; } else { $copyright = ""; @@ -670,24 +879,24 @@ class UploadForm {
    mSessionKey ) . "\" /> - mUploadDescription ) . "\" /> + mComment ) . "\" /> mLicense ) . "\" /> - mDestFile ) . "\" /> + mDesiredDestName ) . "\" /> mWatchthis ) ) . "\" /> {$copyright} - - + - - +
    + $iw$iw
    + $reup$reup
    \n" ); @@ -701,9 +910,23 @@ class UploadForm { * @access private */ function mainUploadForm( $msg='' ) { - global $wgOut, $wgUser; - global $wgUseCopyrightUpload; + global $wgOut, $wgUser, $wgContLang; + global $wgUseCopyrightUpload, $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview; global $wgRequest, $wgAllowCopyUploads; + global $wgStylePath, $wgStyleVersion; + + $useAjaxDestCheck = $wgUseAjax && $wgAjaxUploadDestCheck; + $useAjaxLicensePreview = $wgUseAjax && $wgAjaxLicensePreview; + + $adc = wfBoolToStr( $useAjaxDestCheck ); + $alp = wfBoolToStr( $useAjaxLicensePreview ); + + $wgOut->addScript( " + + " ); if( !wfRunHooks( 'UploadForm:initial', array( &$this ) ) ) { @@ -711,10 +934,34 @@ class UploadForm { return false; } + if( $this->mDesiredDestName ) { + $title = Title::makeTitleSafe( NS_IMAGE, $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()->makeKnownLinkObj( + 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) + if( $title instanceof Title && $title->isDeleted() > 0 && !$title->exists() ) { + $this->showDeletionLog( $wgOut, $title->getPrefixedText() ); + } + } + $cols = intval($wgUser->getOption( 'cols' )); - $ew = $wgUser->getOption( 'editwidth' ); - if ( $ew ) $ew = " style=\"width:100%\""; - else $ew = ''; + + if( $wgUser->getOption( 'editwidth' ) ) { + $width = " style=\"width:100%\""; + } else { + $width = ''; + } if ( '' != $msg ) { $sub = wfMsgHtml( 'uploaderror' ); @@ -722,15 +969,41 @@ class UploadForm { "{$msg}\n" ); } $wgOut->addHTML( '
    ' ); - $wgOut->addWikiText( wfMsgNoTrans( 'uploadtext', $this->mDestFile ) ); - $wgOut->addHTML( '
    ' ); + $wgOut->addWikiMsg( 'uploadtext', $this->mDesiredDestName ); + $wgOut->addHTML( "\n" ); + + # 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, + $wgFileExtensions, $wgFileBlacklist; + if( $wgCheckFileExtensions ) { + $delim = wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ); + if( $wgStrictFileExtensions ) { + # Everything not permitted is banned + $wgOut->addHTML( + '
    ' . + wfMsgWikiHtml( 'upload-permitted', implode( $wgFileExtensions, $delim ) ) . + "
    \n" + ); + } else { + # We have to list both preferred and prohibited + $wgOut->addHTML( + '
    ' . + wfMsgWikiHtml( 'upload-preferred', implode( $wgFileExtensions, $delim ) ) . + "
    \n" . + '
    ' . + wfMsgWikiHtml( 'upload-prohibited', implode( $wgFileBlacklist, $delim ) ) . + "
    \n" + ); + } + } $sourcefilename = wfMsgHtml( 'sourcefilename' ); $destfilename = wfMsgHtml( 'destfilename' ); - $summary = wfMsgWikiHtml( 'fileuploadsummary' ); + $summary = wfMsgExt( 'fileuploadsummary', 'parseinline' ); $licenses = new Licenses(); - $license = wfMsgHtml( 'license' ); + $license = wfMsgExt( 'license', array( 'parseinline' ) ); $nolicense = wfMsgHtml( 'nolicense' ); $licenseshtml = $licenses->getHtml(); @@ -740,64 +1013,87 @@ class UploadForm { $titleObj = SpecialPage::getTitleFor( 'Upload' ); $action = $titleObj->escapeLocalURL(); - $encDestFile = htmlspecialchars( $this->mDestFile ); + $encDestName = htmlspecialchars( $this->mDesiredDestName ); $watchChecked = ( $wgUser->getOption( 'watchdefault' ) || - ( $wgUser->getOption( 'watchcreations' ) && $this->mDestFile == '' ) ) + ( $wgUser->getOption( 'watchcreations' ) && $this->mDesiredDestName == '' ) ) ? 'checked="checked"' : ''; + $warningChecked = $this->mIgnoreWarning ? 'checked' : ''; // Prepare form for upload or upload/copy if( $wgAllowCopyUploads && $wgUser->isAllowed( 'upload_by_url' ) ) { $filename_form = - "" . - "mDestFile?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . "size='40' />" . + "" . + "mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . "size='60' />" . wfMsgHTML( 'upload_source_file' ) . "
    " . - "" . - "mDestFile?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='40' DISABLED />" . + "" . + "mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='60' DISABLED />" . wfMsgHtml( 'upload_source_url' ) ; } else { $filename_form = "mDestFile?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . - "size='40' />" . + ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . + "size='60' />" . "" ; } + if ( $useAjaxDestCheck ) { + $warningRow = " "; + $destOnkeyup = 'onkeyup="wgUploadWarningObj.keypress();"'; + } else { + $warningRow = ''; + $destOnkeyup = ''; + } - $wgOut->addHTML( " -
    + $encComment = htmlspecialchars( $this->mComment ); + $align1 = $wgContLang->isRTL() ? 'left' : 'right'; + $align2 = $wgContLang->isRTL() ? 'right' : 'left'; + + $wgOut->addHTML( << {$this->uploadFormTextTop} - - + - - + - - + - " ); + +EOT + ); if ( $licenseshtml != '' ) { global $wgStylePath; $wgOut->addHTML( " - - + - - "); + " ); + if( $useAjaxLicensePreview ) { + $wgOut->addHtml( " + + + + " ); + } } if ( $wgUseCopyrightUpload ) { $filestatus = wfMsgHtml ( 'filestatus' ); - $copystatus = htmlspecialchars( $this->mUploadCopyStatus ); + $copystatus = htmlspecialchars( $this->mCopyrightStatus ); $filesource = wfMsgHtml ( 'filesource' ); - $uploadsource = htmlspecialchars( $this->mUploadSource ); + $uploadsource = htmlspecialchars( $this->mCopyrightSource ); $wgOut->addHTML( " - - + + - - + + "); } - $wgOut->addHtml( " + $warningRow - + - -
    + {$filename_form}
    - + +
    - + + {$this->uploadFormTextAfterSummary}
    - +
    - +
    getSkin()->tooltipAndAccesskey( 'upload' ) . " />
    + " ); $wgOut->addWikiText( wfMsgForContent( 'edittools' ) ); $wgOut->addHTML( " @@ -852,6 +1155,7 @@ class UploadForm {
    + " ); } @@ -912,12 +1216,11 @@ class UploadForm { $magic=& MimeMagic::singleton(); $mime= $magic->guessMimeType($tmpfile,false); - $fname= "SpecialUpload::verify"; - #check mime type, if desired global $wgVerifyMimeType; if ($wgVerifyMimeType) { + wfDebug ( "\n\nmime: <$mime> extension: <$extension>\n\n"); #check mime type against file extension if( !$this->verifyExtension( $mime, $extension ) ) { return new WikiErrorMsg( 'uploadcorrupt' ); @@ -927,7 +1230,7 @@ class UploadForm { global $wgMimeTypeBlacklist; if( isset($wgMimeTypeBlacklist) && !is_null($wgMimeTypeBlacklist) && $this->checkFileExtension( $mime, $wgMimeTypeBlacklist ) ) { - return new WikiErrorMsg( 'badfiletype', htmlspecialchars( $mime ) ); + return new WikiErrorMsg( 'filetype-badmime', htmlspecialchars( $mime ) ); } } @@ -944,7 +1247,7 @@ class UploadForm { return new WikiErrorMsg( 'uploadvirus', htmlspecialchars($virus) ); } - wfDebug( "$fname: all clear; passing.\n" ); + wfDebug( __METHOD__.": all clear; passing.\n" ); return true; } @@ -956,45 +1259,46 @@ class UploadForm { * @return bool */ function verifyExtension( $mime, $extension ) { - $fname = 'SpecialUpload::verifyExtension'; - $magic =& MimeMagic::singleton(); if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' ) if ( ! $magic->isRecognizableExtension( $extension ) ) { - wfDebug( "$fname: passing file with unknown detected mime type; unrecognized extension '$extension', can't verify\n" ); + wfDebug( __METHOD__.": passing file with unknown detected mime type; " . + "unrecognized extension '$extension', can't verify\n" ); return true; } else { - wfDebug( "$fname: rejecting file with unknown detected mime type; recognized extension '$extension', so probably invalid file\n" ); + wfDebug( __METHOD__.": rejecting file with unknown detected mime type; ". + "recognized extension '$extension', so probably invalid file\n" ); return false; } $match= $magic->isMatchingExtension($extension,$mime); if ($match===NULL) { - wfDebug( "$fname: no file extension known for mime type $mime, passing file\n" ); + wfDebug( __METHOD__.": no file extension known for mime type $mime, passing file\n" ); return true; } elseif ($match===true) { - wfDebug( "$fname: mime type $mime matches extension $extension, passing file\n" ); + wfDebug( __METHOD__.": mime type $mime matches extension $extension, passing file\n" ); #TODO: if it's a bitmap, make sure PHP or ImageMagic resp. can handle it! return true; } else { - wfDebug( "$fname: mime type $mime mismatches file extension $extension, rejecting file\n" ); + wfDebug( __METHOD__.": mime type $mime mismatches file extension $extension, rejecting file\n" ); return false; } } - /** Heuristig for detecting files that *could* contain JavaScript instructions or - * things that may look like HTML to a browser and are thus - * potentially harmful. The present implementation will produce false positives in some situations. - * - * @param string $file Pathname to the temporary upload file - * @param string $mime The mime type of the file - * @param string $extension The extension of the file - * @return bool true if the file contains something looking like embedded scripts - */ + /** + * Heuristic for detecting files that *could* contain JavaScript instructions or + * things that may look like HTML to a browser and are thus + * potentially harmful. The present implementation will produce false positives in some situations. + * + * @param string $file Pathname to the temporary upload file + * @param string $mime The mime type of the file + * @param string $extension The extension of the file + * @return bool true if the file contains something looking like embedded scripts + */ function detectScript($file, $mime, $extension) { global $wgAllowTitlesInSVG; @@ -1071,105 +1375,115 @@ class UploadForm { $chunk = Sanitizer::decodeCharReferences( $chunk ); #look for script-types - if (preg_match('!type\s*=\s*[\'"]?\s*(\w*/)?(ecma|java)!sim',$chunk)) return true; + if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim',$chunk)) return true; #look for html-style script-urls - if (preg_match('!(href|src|data)\s*=\s*[\'"]?\s*(ecma|java)script:!sim',$chunk)) return true; + if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) return true; #look for css-style script-urls - if (preg_match('!url\s*\(\s*[\'"]?\s*(ecma|java)script:!sim',$chunk)) return true; + if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim',$chunk)) return true; wfDebug("SpecialUpload::detectScript: no scripts found\n"); return false; } - /** Generic wrapper function for a virus scanner program. - * This relies on the $wgAntivirus and $wgAntivirusSetup variables. - * $wgAntivirusRequired may be used to deny upload if the scan fails. - * - * @param string $file Pathname to the temporary upload file - * @return mixed false if not virus is found, NULL if the scan fails or is disabled, - * or a string containing feedback from the virus scanner if a virus was found. - * If textual feedback is missing but a virus was found, this function returns true. - */ + /** + * Generic wrapper function for a virus scanner program. + * This relies on the $wgAntivirus and $wgAntivirusSetup variables. + * $wgAntivirusRequired may be used to deny upload if the scan fails. + * + * @param string $file Pathname to the temporary upload file + * @return mixed false if not virus is found, NULL if the scan fails or is disabled, + * or a string containing feedback from the virus scanner if a virus was found. + * If textual feedback is missing but a virus was found, this function returns true. + */ function detectVirus($file) { global $wgAntivirus, $wgAntivirusSetup, $wgAntivirusRequired, $wgOut; - $fname= "SpecialUpload::detectVirus"; - - if (!$wgAntivirus) { #disabled? - wfDebug("$fname: virus scanner disabled\n"); - + if ( !$wgAntivirus ) { + wfDebug( __METHOD__.": virus scanner disabled\n"); return NULL; } - if (!$wgAntivirusSetup[$wgAntivirus]) { - wfDebug("$fname: unknown virus scanner: $wgAntivirus\n"); - - $wgOut->addHTML( "
    Bad configuration: unknown virus scanner: $wgAntivirus
    \n" ); #LOCALIZE - + if ( !$wgAntivirusSetup[$wgAntivirus] ) { + wfDebug( __METHOD__.": unknown virus scanner: $wgAntivirus\n" ); + # @TODO: localise + $wgOut->addHTML( "
    Bad configuration: unknown virus scanner: $wgAntivirus
    \n" ); return "unknown antivirus: $wgAntivirus"; } - #look up scanner configuration - $virus_scanner= $wgAntivirusSetup[$wgAntivirus]["command"]; #command pattern - $virus_scanner_codes= $wgAntivirusSetup[$wgAntivirus]["codemap"]; #exit-code map - $msg_pattern= $wgAntivirusSetup[$wgAntivirus]["messagepattern"]; #message pattern + # look up scanner configuration + $command = $wgAntivirusSetup[$wgAntivirus]["command"]; + $exitCodeMap = $wgAntivirusSetup[$wgAntivirus]["codemap"]; + $msgPattern = isset( $wgAntivirusSetup[$wgAntivirus]["messagepattern"] ) ? + $wgAntivirusSetup[$wgAntivirus]["messagepattern"] : null; - $scanner= $virus_scanner; #copy, so we can resolve the pattern - - if (strpos($scanner,"%f")===false) $scanner.= " ".wfEscapeShellArg($file); #simple pattern: append file to scan - else $scanner= str_replace("%f",wfEscapeShellArg($file),$scanner); #complex pattern: replace "%f" with file to scan + if ( strpos( $command,"%f" ) === false ) { + # simple pattern: append file to scan + $command .= " " . wfEscapeShellArg( $file ); + } else { + # complex pattern: replace "%f" with file to scan + $command = str_replace( "%f", wfEscapeShellArg( $file ), $command ); + } - wfDebug("$fname: running virus scan: $scanner \n"); + wfDebug( __METHOD__.": running virus scan: $command \n" ); - #execute virus scanner - $code= false; + # execute virus scanner + $exitCode = false; #NOTE: there's a 50 line workaround to make stderr redirection work on windows, too. # that does not seem to be worth the pain. # Ask me (Duesentrieb) about it if it's ever needed. $output = array(); - if (wfIsWindows()) exec("$scanner",$output,$code); - else exec("$scanner 2>&1",$output,$code); - - $exit_code= $code; #remember for user feedback + if ( wfIsWindows() ) { + exec( "$command", $output, $exitCode ); + } else { + exec( "$command 2>&1", $output, $exitCode ); + } - if ($virus_scanner_codes) { #map exit code to AV_xxx constants. - if (isset($virus_scanner_codes[$code])) { - $code= $virus_scanner_codes[$code]; # explicit mapping - } else if (isset($virus_scanner_codes["*"])) { - $code= $virus_scanner_codes["*"]; # fallback mapping + # map exit code to AV_xxx constants. + $mappedCode = $exitCode; + if ( $exitCodeMap ) { + if ( isset( $exitCodeMap[$exitCode] ) ) { + $mappedCode = $exitCodeMap[$exitCode]; + } elseif ( isset( $exitCodeMap["*"] ) ) { + $mappedCode = $exitCodeMap["*"]; } } - if ($code===AV_SCAN_FAILED) { #scan failed (code was mapped to false by $virus_scanner_codes) - wfDebug("$fname: failed to scan $file (code $exit_code).\n"); + if ( $mappedCode === AV_SCAN_FAILED ) { + # scan failed (code was mapped to false by $exitCodeMap) + wfDebug( __METHOD__.": failed to scan $file (code $exitCode).\n" ); - if ($wgAntivirusRequired) { return "scan failed (code $exit_code)"; } - else { return NULL; } - } - else if ($code===AV_SCAN_ABORTED) { #scan failed because filetype is unknown (probably imune) - wfDebug("$fname: unsupported file type $file (code $exit_code).\n"); + if ( $wgAntivirusRequired ) { + return "scan failed (code $exitCode)"; + } else { + return NULL; + } + } else if ( $mappedCode === AV_SCAN_ABORTED ) { + # scan failed because filetype is unknown (probably imune) + wfDebug( __METHOD__.": unsupported file type $file (code $exitCode).\n" ); return NULL; - } - else if ($code===AV_NO_VIRUS) { - wfDebug("$fname: file passed virus scan.\n"); - return false; #no virus found - } - else { - $output= join("\n",$output); - $output= trim($output); - - if (!$output) $output= true; #if there's no output, return true - else if ($msg_pattern) { - $groups= array(); - if (preg_match($msg_pattern,$output,$groups)) { - if ($groups[1]) $output= $groups[1]; + } else if ( $mappedCode === AV_NO_VIRUS ) { + # no virus found + wfDebug( __METHOD__.": file passed virus scan.\n" ); + return false; + } else { + $output = join( "\n", $output ); + $output = trim( $output ); + + if ( !$output ) { + $output = true; #if there's no output, return true + } elseif ( $msgPattern ) { + $groups = array(); + if ( preg_match( $msgPattern, $output, $groups ) ) { + if ( $groups[1] ) { + $output = $groups[1]; + } } } - wfDebug("$fname: FOUND VIRUS! scanner feedback: $output"); + wfDebug( __METHOD__.": FOUND VIRUS! scanner feedback: $output" ); return $output; } } @@ -1183,7 +1497,7 @@ class UploadForm { * @access private */ function checkMacBinary() { - $macbin = new MacBinary( $this->mUploadTempName ); + $macbin = new MacBinary( $this->mTempPath ); if( $macbin->isValid() ) { $dataFile = tempnam( wfTempDir(), "WikiMacBinary" ); $dataHandle = fopen( $dataFile, 'wb' ); @@ -1191,8 +1505,8 @@ class UploadForm { wfDebug( "SpecialUpload::checkMacBinary: Extracting MacBinary data fork to $dataFile\n" ); $macbin->extractData( $dataHandle ); - $this->mUploadTempName = $dataFile; - $this->mUploadSize = $macbin->dataForkLength(); + $this->mTempPath = $dataFile; + $this->mFileSize = $macbin->dataForkLength(); // We'll have to manually remove the new file if it's not kept. $this->mRemoveTempFile = true; @@ -1206,9 +1520,9 @@ class UploadForm { * @access private */ function cleanupTempFile() { - if( $this->mRemoveTempFile && file_exists( $this->mUploadTempName ) ) { - wfDebug( "SpecialUpload::cleanupTempFile: Removing temporary file $this->mUploadTempName\n" ); - unlink( $this->mUploadTempName ); + if ( $this->mRemoveTempFile && file_exists( $this->mTempPath ) ) { + wfDebug( "SpecialUpload::cleanupTempFile: Removing temporary file {$this->mTempPath}\n" ); + unlink( $this->mTempPath ); } } @@ -1220,18 +1534,13 @@ class UploadForm { * @access private */ function checkOverwrite( $name ) { - $img = Image::newFromName( $name ); - if( is_null( $img ) ) { - // Uh... this shouldn't happen ;) - // But if it does, fall through to previous behavior - return false; - } + $img = wfFindFile( $name ); $error = ''; - if( $img->exists() ) { + if( $img ) { global $wgUser, $wgOut; if( $img->isLocal() ) { - if( !$wgUser->isAllowed( 'reupload' ) ) { + if( !self::userCanReUpload( $wgUser, $img->name ) ) { $error = 'fileexists-forbidden'; } } else { @@ -1244,12 +1553,96 @@ class UploadForm { if( $error ) { $errorText = wfMsg( $error, wfEscapeWikiText( $img->getName() ) ); - return new WikiError( $wgOut->parse( $errorText ) ); + return $errorText; } // Rockin', go ahead and upload return true; } + /** + * Check if a user is the last uploader + * + * @param User $user + * @param string $img, image name + * @return bool + */ + public static function userCanReUpload( User $user, $img ) { + if( $user->isAllowed( 'reupload' ) ) + return true; // non-conditional + if( !$user->isAllowed( 'reupload-own' ) ) + return false; + + $dbr = wfGetDB( DB_SLAVE ); + $row = $dbr->selectRow('image', + /* SELECT */ 'img_user', + /* WHERE */ array( 'img_name' => $img ) + ); + if ( !$row ) + return false; + + return $user->getID() == $row->img_user; + } + + /** + * Display an error with a wikitext description + */ + function showError( $description ) { + global $wgOut; + $wgOut->setPageTitle( wfMsg( "internalerror" ) ); + $wgOut->setRobotpolicy( "noindex,nofollow" ); + $wgOut->setArticleRelated( false ); + $wgOut->enableClientCache( false ); + $wgOut->addWikiText( $description ); + } + + /** + * Get the initial image page text based on a comment and optional file status information + */ + static function getInitialPageText( $comment, $license, $copyStatus, $source ) { + global $wgUseCopyrightUpload; + if ( $wgUseCopyrightUpload ) { + if ( $license != '' ) { + $licensetxt = '== ' . wfMsgForContent( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; + } + $pageText = '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n" . + '== ' . wfMsgForContent ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" . + "$licensetxt" . + '== ' . wfMsgForContent ( 'filesource' ) . " ==\n" . $source ; + } else { + if ( $license != '' ) { + $filedesc = $comment == '' ? '' : '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $comment . "\n"; + $pageText = $filedesc . + '== ' . wfMsgForContent ( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; + } else { + $pageText = $comment; + } + } + return $pageText; + } + + /** + * If there are rows in the deletion log for this file, show them, + * along with a nice little note for the user + * + * @param OutputPage $out + * @param string filename + */ + private function showDeletionLog( $out, $filename ) { + $reader = new LogReader( + new FauxRequest( + array( + 'page' => $filename, + 'type' => 'delete', + ) + ) + ); + if( $reader->hasRows() ) { + $out->addHtml( '
    ' ); + $out->addWikiMsg( 'upload-wasdeleted' ); + $viewer = new LogViewer( $reader ); + $viewer->showList( $out ); + $out->addHtml( '
    ' ); + } + } } -?>