* (bug 12553) Fixed invalid XHTML in edit conflict screen
[lhc/web/wiklou.git] / includes / SpecialUpload.php
index 3b37ba5..76f926f 100644 (file)
 <?php
+/**
+ *
+ * @addtogroup SpecialPage
+ */
 
-function wfSpecialUpload()
-{
+
+/**
+ * Entry point
+ */
+function wfSpecialUpload() {
        global $wgRequest;
        $form = new UploadForm( $wgRequest );
        $form->execute();
 }
 
+/**
+ * implements Special:Upload
+ * @addtogroup SpecialPage
+ */
 class UploadForm {
-       var $mUploadAffirm, $mUploadFile, $mUploadDescription, $mIgnoreWarning;
-       var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion;
-       var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload;
-       var $mOname, $mSessionKey;
+       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 $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;
+       /**#@-*/
+
+       /**
+        * Constructor : initialise object
+        * Get data POSTed through the form and assign them to the object
+        * @param $request Data posted.
+        */
        function UploadForm( &$request ) {
-               $this->mUploadAffirm = $request->getVal( 'wpUploadAffirm' );
-               $this->mUploadFile = $request->getVal( 'wpUploadFile' );
-               $this->mUploadDescription = $request->getVal( 'wpUploadDescription');
-               $this->mIgnoreWarning = $request->getVal( 'wpIgnoreWarning');
-               $this->mUploadSaveName = $request->getVal( 'wpUploadSaveName');
-               $this->mUploadTempName = $request->getVal( 'wpUploadTempName');
-               $this->mUploadTempName = $request->getVal( 'wpUploadTempName');
-               $this->mUploadSize = $request->getVal( 'wpUploadSize');
-               $this->mUploadOldVersion = $request->getVal( 'wpUploadOldVersion');
-               $this->mUploadCopyStatus = $request->getVal( 'wpUploadCopyStatus');
-               $this->mUploadSource = $request->getVal( 'wpUploadSource');
-               $this->mReUpload = $request->getCheck( 'wpReUpload' );
-               $this->mAction = $request->getVal( 'action' );
-               $this->mUpload = $request->getCheck( 'wpUpload' );
-               $this->mSessionKey = $request->getVal( 'wpSessionKey' );
+               global $wgAllowCopyUploads;
+               $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 destination
+                       # filename and description
+                       return;
+               }
+
+               # Placeholders for text injection by hooks (empty per default)
+               $this->uploadFormTextTop = "";
+               $this->uploadFormTextAfterSummary = "";
+
+               $this->mReUpload          = $request->getCheck( 'wpReUpload' );
+               $this->mUploadClicked     = $request->getCheck( 'wpUpload' );
+
+               $this->mLicense           = $request->getText( 'wpLicense' );
+               $this->mCopyrightStatus   = $request->getText( 'wpUploadCopyStatus' );
+               $this->mCopyrightSource   = $request->getText( 'wpUploadSource' );
+               $this->mWatchthis         = $request->getBool( 'wpWatchthis' );
+               $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]['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
+                        * them in the session on the server and just give
+                        * an opaque key to the user agent.
+                        */
+                       $data = $_SESSION['wsUploadData'][$this->mSessionKey];
+                       $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 {
+                       /**
+                        *Check for a newly uploaded file.
+                        */
+                       if( $wgAllowCopyUploads && $this->mSourceType == 'web' ) {
+                               $this->initializeFromUrl( $request );
+                       } else {
+                               $this->initializeFromUpload( $request );
+                       }
+               }
+       }
+
+       /**
+        * Initialize the uploaded file from PHP data
+        * @access private
+        */
+       function initializeFromUpload( $request ) {
+               $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
+       }
+
+       /**
+        * Copy a web file to a temporary file
+        * @access private
+        */
+       function initializeFromUrl( $request ) {
+               global $wgTmpDirectory;
+               $url = $request->getText( 'wpUploadFileURL' );
+               $local_file = tempnam( $wgTmpDirectory, 'WEBUPLOAD' );
+
+               $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;
 
-               if ( ! $this->mUploadTempName ) {
-                       $this->mUploadTempName = @$_FILES['wpUploadFile']['tmp_name'];
+               // PHP won't auto-cleanup the file
+               $this->mRemoveTempFile = file_exists( $local_file );
+       }
+
+       /**
+        * Safe copy from URL
+        * Returns true if there was an error, false otherwise
+        */
+       private function curlCopy( $url, $dest ) {
+               global $wgUser, $wgOut;
+
+               if( !$wgUser->isAllowed( 'upload_by_url' ) ) {
+                       $wgOut->permissionRequired( 'upload_by_url' );
+                       return true;
+               }
+
+               # Maybe remove some pasting blanks :-)
+               $url =  trim( $url );
+               if( stripos($url, 'http://') !== 0 && stripos($url, 'ftp://') !== 0 ) {
+                       # Only HTTP or FTP URLs
+                       $wgOut->errorPage( 'upload-proto-error', 'upload-proto-error-text' );
+                       return true;
+               }
+
+               # Open temporary file
+               $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;
                }
-               if ( ! $this->mUploadSize ) {
-                       $this->mUploadSize = @$_FILES['wpUploadFile']['size'];
+
+               $ch = curl_init();
+               curl_setopt( $ch, CURLOPT_HTTP_VERSION, 1.0); # Probably not needed, but apparently can work around some bug
+               curl_setopt( $ch, CURLOPT_TIMEOUT, 10); # 10 seconds timeout
+               curl_setopt( $ch, CURLOPT_LOW_SPEED_LIMIT, 512); # 0.5KB per second minimum transfer speed
+               curl_setopt( $ch, CURLOPT_URL, $url);
+               curl_setopt( $ch, CURLOPT_WRITEFUNCTION, array( $this, 'uploadCurlCallback' ) );
+               curl_exec( $ch );
+               $error = curl_errno( $ch ) ? true : false;
+               $errornum =  curl_errno( $ch );
+               // if ( $error ) print curl_error ( $ch ) ; # Debugging output
+               curl_close( $ch );
+
+               fclose( $this->mCurlDestHandle );
+               unset( $this->mCurlDestHandle );
+               if( $error ) {
+                       unlink( $dest );
+                       if( wfEmptyMsg( "upload-curl-error$errornum", wfMsg("upload-curl-error$errornum") ) )
+                               $wgOut->errorPage( 'upload-misc-error', 'upload-misc-error-text' );
+                       else
+                               $wgOut->errorPage( "upload-curl-error$errornum", "upload-curl-error$errornum-text" );
                }
-               $this->mOname = $request->getGPCVal( $_FILES['wpUploadFile'], 'name', "" );
 
+               return $error;
        }
 
+       /**
+        * Callback function for CURL-based web transfer
+        * Write data to file unless we've passed the length limit;
+        * if so, abort immediately.
+        * @access private
+        */
+       function uploadCurlCallback( $ch, $data ) {
+               global $wgMaxUploadSize;
+               $length = strlen( $data );
+               $this->mFileSize += $length;
+               if( $this->mFileSize > $wgMaxUploadSize ) {
+                       return 0;
+               }
+               fwrite( $this->mCurlDestHandle, $data );
+               return $length;
+       }
+
+       /**
+        * Start doing stuff
+        * @access public
+        */
        function execute() {
                global $wgUser, $wgOut;
-               global $wgDisableUploads;
+               global $wgEnableUploads;
+
+               # Check uploading enabled
+               if( !$wgEnableUploads ) {
+                       $wgOut->showErrorPage( 'uploaddisabled', 'uploaddisabledtext', array( $this->mDesiredDestName ) );
+                       return;
+               }
 
-               if ( $wgDisableUploads ) {
-                       $wgOut->addWikiText( wfMsg( "uploaddisabled" ) );
+               # Check permissions
+               if( !$wgUser->isAllowed( 'upload' ) ) {
+                       if( !$wgUser->isLoggedIn() ) {
+                               $wgOut->showErrorPage( 'uploadnologin', 'uploadnologintext' );
+                       } else {
+                               $wgOut->permissionRequired( 'upload' );
+                       }
                        return;
                }
-               if ( ( 0 == $wgUser->getID() )
-                       or $wgUser->isBlocked() ) {
-                       $wgOut->errorpage( "uploadnologin", "uploadnologintext" );
+
+               # Check blocks
+               if( $wgUser->isBlocked() ) {
+                       $wgOut->blockedPage();
                        return;
                }
-               if ( wfReadOnly() ) {
+
+               if( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
                        return;
                }
-               if ( $this->mReUpload ) {
-                       $this->unsaveUploadedFile();
-                       $this->mainUploadForm( "" );
-               } else if ( "submit" == $this->mAction || $this->mUpload ) {
+
+               if( $this->mReUpload ) {
+                       if( !$this->unsaveUploadedFile() ) {
+                               return;
+                       }
+                       $this->mainUploadForm();
+               } else if( 'submit' == $this->mAction || $this->mUploadClicked ) {
                        $this->processUpload();
                } else {
-                       $this->mainUploadForm( "" );
+                       $this->mainUploadForm();
                }
+
+               $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;
 
-       function processUpload()
-       {
-               global $wgUser, $wgOut, $wgLang;
-               global $wgUploadDirectory;
-               global $wgSavedFile, $wgUploadOldVersion;
-               global $wgUseCopyrightUpload, $wgCheckCopyrightUpload;
-               global $wgCheckFileExtensions, $wgStrictFileExtensions;
-               global $wgFileExtensions, $wgFileBlacklist, $wgUploadSizeWarning;
+                       case self::BEFORE_PROCESSING:
+                               break;
 
-               if ( $wgUseCopyrightUpload ) {
-                       $this->mUploadAffirm = 1;
-                       if ($wgCheckCopyrightUpload && 
-                               (trim ( $this->mUploadCopyStatus ) == "" || trim ( $this->mUploadSource ) == "" )) {
-                               $this->mUploadAffirm = 0;
-                       }
+                       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 internalProcessUpload( &$resultDetails ) {
+               global $wgUser;
+
+               if( !wfRunHooks( 'UploadForm:BeforeProcessing', array( &$this ) ) )
+               {
+                       wfDebug( "Hook 'UploadForm:BeforeProcessing' broke processing the file." );
+                       return self::BEFORE_PROCESSING;
                }
 
-               if ( 1 != $this->mUploadAffirm ) {
-                       $this->mainUploadForm( WfMsg( "noaffirmation" ) );
-                       return;
+               /* Check for PHP error if any, requires php 4.2 or newer */
+               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->mSrcName ) == '' || empty( $this->mFileSize ) ) {
+                       return self::EMPTY_FILE;
                }
 
-               if ( "" != $this->mOname ) {
-                       $basename = strrchr( $this->mOname, "/" );
-                       if ( false === $basename ) { $basename = $this->mOname; }
-                       else ( $basename = substr( $basename, 1 ) );
+               # Chop off any directories in the given filename
+               if( $this->mDesiredDestName ) {
+                       $basename = $this->mDesiredDestName;
+               } else {
+                       $basename = $this->mSrcName;
+               }
+               $filtered = wfBaseName( $basename );
 
-                       $ext = strrchr( $basename, "." );
-                       if ( false === $ext ) { $ext = ""; }
-                       else { $ext = substr( $ext, 1 ); }
+               /**
+                * We'll want to blacklist against *any* 'extension', and use
+                * only the final one for the whitelist.
+                */
+               list( $partname, $ext ) = $this->splitExtensions( $filtered );
 
-                       if ( "" == $ext ) { $xl = 0; } else { $xl = strlen( $ext ) + 1; }
-                       $partname = substr( $basename, 0, strlen( $basename ) - $xl );
+               if( count( $ext ) ) {
+                       $finalExt = $ext[count( $ext ) - 1];
+               } else {
+                       $finalExt = '';
+               }
 
-                       if ( strlen( $partname ) < 3 ) {
-                               $this->mainUploadForm( WfMsg( "minlength" ) );
-                               return;
+               # If there was more than one "extension", reassemble the base
+               # filename to prevent bogus complaints about length
+               if( count( $ext ) > 1 ) {
+                       for( $i = 0; $i < count( $ext ) - 1; $i++ )
+                               $partname .= '.' . $ext[$i];
+               }
+
+               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()."]|:/", '-', $filtered );
+               $nt = Title::makeTitleSafe( NS_IMAGE, $filtered );
+               if( is_null( $nt ) ) {
+                       $resultDetails = array( 'filtered' => $filtered );
+                       return self::ILLEGAL_FILENAME;
+               }
+               $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 self::PROTECTED_PAGE;
+               }
+
+               /**
+                * In some cases we may forbid overwriting of existing files.
+                */
+               $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 ($finalExt == '') {
+                       return self::FILETYPE_MISSING;
+               } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) ||
+                               ($wgStrictFileExtensions && !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) {
+                       $resultDetails = array( 'finalExt' => $finalExt );
+                       return self::FILETYPE_BADTYPE;
+               }
+
+               /**
+                * Look at the contents of the file; if we can recognize the
+                * type but it's corrupt or data of the wrong type, we should
+                * probably not accept it.
+                */
+               if( !$this->mStashed ) {
+                       $this->mFileProps = File::getPropsFromPath( $this->mTempPath, $finalExt );
+                       $this->checkMacBinary();
+                       $veri = $this->verify( $this->mTempPath, $finalExt );
+
+                       if( $veri !== true ) { //it's a wiki error...
+                               $resultDetails = array( 'veri' => $veri );
+                               return self::VERIFICATION_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;
                        }
-                       $nt = Title::newFromText( $basename );
-                       $this->mUploadSaveName = $nt->getDBkey();
+               }
+
 
-                       /* Don't allow users to override the blacklist */
-                       if( $this->checkFileExtension( $ext, $wgFileBlacklist ) ||
-                               ($wgStrictFileExtensions && !$this->checkFileExtension( $ext, $wgFileExtensions ) ) ) {
-                               return $this->uploadError( wfMsg( "badfiletype", $ext ) );
+               /**
+                * Check for non-fatal conditions
+                */
+               if ( ! $this->mIgnoreWarning ) {
+                       $warning = '';
+
+                       global $wgCapitalLinks;
+                       if( $wgCapitalLinks ) {
+                               $filtered = ucfirst( $filtered );
                        }
-                       
-                       $this->saveUploadedFile( $this->mUploadSaveName, $this->mUploadTempName );
-                       if ( ( ! $this->mIgnoreWarning ) &&
-                         ( 0 != strcmp( ucfirst( $basename ), $this->mUploadSaveName ) ) ) {
-                               return $this->uploadWarning( wfMsg( "badfilename", $this->mUploadSaveName ) );
+                       if( $basename != $filtered ) {
+                               $warning .=  '<li>'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mDestName ) ).'</li>';
                        }
-                       
+
+                       global $wgCheckFileExtensions;
                        if ( $wgCheckFileExtensions ) {
-                               if ( ( ! $this->mIgnoreWarning ) &&
-                                        ( ! $this->checkFileExtension( $ext, $wgFileExtensions ) ) ) {
-                                       return $this->uploadWarning( wfMsg( "badfiletype", $ext ) );
+                               if ( !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) {
+                                       $warning .= '<li>' .
+                                       wfMsgExt( 'filetype-unwanted-type',
+                                               array( 'parseinline' ),
+                                               htmlspecialchars( $finalExt ),
+                                               implode(
+                                                       wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ),
+                                                       $wgFileExtensions
+                                               )
+                                       ) . '</li>';
                                }
                        }
-                       if ( $wgUploadSizeWarning && ( ! $this->mIgnoreWarning ) && 
-                         ( $this->mUploadSize > $wgUploadSizeWarning ) ) {
-                               return $this->uploadWarning( wfMsg( "largefile" ) );
+
+                       global $wgUploadSizeWarning;
+                       if ( $wgUploadSizeWarning && ( $this->mFileSize > $wgUploadSizeWarning ) ) {
+                               $skin = $wgUser->getSkin();
+                               $wsize = $skin->formatSize( $wgUploadSizeWarning );
+                               $asize = $skin->formatSize( $this->mFileSize );
+                               $warning .= '<li>' . wfMsgHtml( 'large-file', $wsize, $asize ) . '</li>';
+                       }
+                       if ( $this->mFileSize == 0 ) {
+                               $warning .= '<li>'.wfMsgHtml( 'emptyfile' ).'</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.
+                                */
+                               $resultDetails = array( 'warning' => $warning );
+                               return self::UPLOAD_WARNING;
                        }
                }
-               if ( !is_null( $this->mUploadOldVersion ) ) {
-                       $wgUploadOldVersion = $this->mUploadOldVersion;
+
+               /**
+                * Try actually saving the thing...
+                * It will show an error form on failure.
+                */
+               $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( &$img ) );
+                       return self::SUCCESS;
                }
-               wfRecordUpload( $this->mUploadSaveName, $wgUploadOldVersion, $this->mUploadSize, 
-                 $this->mUploadDescription, $this->mUploadCopyStatus, $this->mUploadSource );
+       }
 
+       /**
+        * 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
+        */
+       static function getExistsWarning( $file ) {
+               global $wgUser;
+               // Check for uppercase extension. We allow these filenames but check if an image
+               // with lowercase extension exists already
+               $warning = '';
+               
+               if( strpos( $file->getName(), '.' ) == false ) {
+                       $partname = $file->getName();
+                       $rawExtension = '';
+               } else {
+                       list( $partname, $rawExtension ) = explode( '.', $file->getName(), 2 );
+               }
                $sk = $wgUser->getSkin();
-               $ilink = $sk->makeMediaLink( $this->mUploadSaveName, Image::wfImageUrl( $this->mUploadSaveName ) );
-               $dname = $wgLang->getNsText( Namespace::getImage() ) . ":{$this->mUploadSaveName}";
-               $dlink = $sk->makeKnownLink( $dname, $dname );
 
-               $wgOut->addHTML( "<h2>" . wfMsg( "successfulupload" ) . "</h2>\n" );
-               $text = wfMsg( "fileuploaded", $ilink, $dlink );
-               $wgOut->addHTML( "<p>{$text}\n" );
-               $wgOut->returnToMain( false );
-       }
+               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;
+               }
 
-       function checkFileExtension( $ext, $list ) {
-               return in_array( strtolower( $ext ), $list );
-       }
+               if( $file->exists() ) {
+                       $dlink = $sk->makeKnownLinkObj( $file->getTitle() );
+                       if ( $file->allowInlineDisplay() ) {
+                               $dlink2 = $sk->makeImageLinkObj( $file->getTitle(), wfMsgExt( 'fileexists-thumb', 'parseinline', $dlink ), 
+                                       $file->getName(), 'right', array(), false, true );
+                       } elseif ( !$file->allowInlineDisplay() && $file->isSafeFile() ) {
+                               $icon = $file->iconThumb();
+                               $dlink2 = '<div style="float:right" id="mw-media-icon">' . 
+                                       $icon->toHtml( array( 'desc-link' => true ) ) . '<br />' . $dlink . '</div>';
+                       } else {
+                               $dlink2 = '';
+                       }
 
-       function saveUploadedFile( $saveName, $tempName )
-       {
-               global $wgSavedFile, $wgUploadOldVersion;
-               global $wgUploadDirectory, $wgOut;
+                       $warning .= '<li>' . wfMsgExt( 'fileexists', 'parseline', $dlink ) . '</li>' . $dlink2;
 
-               $dest = wfImageDir( $saveName );
-               $archive = wfImageArchiveDir( $saveName );
-               $wgSavedFile = "{$dest}/{$saveName}";
+               } 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', $dlink ), 
+                                       $nt_lc->getText(), 'right', array(), false, true );
+                       } elseif ( !$file_lc->allowInlineDisplay() && $file_lc->isSafeFile() ) {
+                               $icon = $file_lc->iconThumb();
+                               $dlink2 = '<div style="float:right" id="mw-media-icon">' . 
+                                       $icon->toHtml( array( 'desc-link' => true ) ) . '<br />' . $dlink . '</div>';
+                       } else {
+                               $dlink2 = '';
+                       }
 
-               if ( is_file( $wgSavedFile ) ) {
-                       $wgUploadOldVersion = gmdate( "YmdHis" ) . "!{$saveName}";
+                       $warning .= '<li>' . wfMsgExt( 'fileexists-extension', 'parsemag', $file->getName(), $dlink ) . '</li>' . $dlink2;                              
 
-                       if ( ! rename( $wgSavedFile, "${archive}/{$wgUploadOldVersion}" ) ) { 
-                               $wgOut->fileRenameError( $wgSavedFile,
-                                 "${archive}/{$wgUploadOldVersion}" );
-                               return;
+               } 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', $dlink ), 
+                                               $nt_thb->getText(), 'right', array(), false, true );
+                               } elseif ( !$file_thb->allowInlineDisplay() && $file_thb->isSafeFile() ) {
+                                       $icon = $file_thb->iconThumb();
+                                       $dlink2 = '<div style="float:right" id="mw-media-icon">' . 
+                                               $icon->toHtml( array( 'desc-link' => true ) ) . '<br />' . 
+                                               $dlink . '</div>';
+                               } else {
+                                       $dlink2 = '';
+                               }
+
+                               $warning .= '<li>' . wfMsgExt( 'fileexists-thumbnail-yes', 'parsemag', $dlink ) . 
+                                       '</li>' . $dlink2;      
+                       } else {
+                               # Image w/o '180px-' does not exists, but we do not like these filenames
+                               $warning .= '<li>' . wfMsgExt( 'file-thumbnail-no', 'parseinline' , 
+                                       substr( $partname , 0, strpos( $partname , '-' ) +1 ) ) . '</li>';
+                       }
+               }
+
+               $filenamePrefixBlacklist = self::getFilenamePrefixBlacklist();
+               # Do the match
+               foreach( $filenamePrefixBlacklist as $prefix ) {
+                       if ( substr( $partname, 0, strlen( $prefix ) ) == $prefix ) {
+                               $warning .= '<li>' . wfMsgExt( 'filename-bad-prefix', 'parseinline', $prefix ) . '</li>';
+                               break;
                        }
-               } else {
-                       $wgUploadOldVersion = "";
                }
-               if ( ! move_uploaded_file( $tempName, $wgSavedFile ) ) {
-                       $wgOut->fileCopyError( $tempName, $wgSavedFile );
+
+               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 .= '<li>' . wfMsgWikiHtml( 'filewasdeleted', $llink ) . '</li>';
                }
-               chmod( $wgSavedFile, 0644 );
+               return $warning;
        }
 
-       function unsaveUploadedFile()
-       {
-               global $wgUploadDirectory, $wgOut, $wgRequest;
+       /**
+        * 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 = '&nbsp;';
+               if ( $file ) {
+                       $warning = self::getExistsWarning( $file );
+                       if ( $warning !== '' ) {
+                               $s = "<ul>$warning</ul>";
+                       }
+               }
+               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 );
                
-               $wgSavedFile = $_SESSION['wsUploadFiles'][$this->mSessionKey];
-               $wgUploadOldVersion = $this->mUploadOldVersion;
+               // Expand subst: first, then live templates...
+               $text = $wgParser->preSaveTransform( $text, $title, $wgUser, $options );
+               $output = $wgParser->parse( $text, $title, $options );
+               
+               return $output->getText();
+       }
 
-               if ( ! @unlink( $wgSavedFile ) ) {
-                       $wgOut->fileDeleteError( $wgSavedFile );
-                       return;
+       /**
+        * 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 );
+                       }
                }
-               if ( "" != $wgUploadOldVersion ) {
-                       $hash = md5( substr( $wgUploadOldVersion, 15 ) );
-                       $archive = "{$wgUploadDirectory}/archive/" . $hash{0} .
-                       "/" . substr( $hash, 0, 2 );
+               return $blacklist;
+       }
 
-                       if ( ! rename( "{$archive}/{$wgUploadOldVersion}", $wgSavedFile ) ) {
-                               $wgOut->fileRenameError( "{$archive}/{$wgUploadOldVersion}",
-                                 $wgSavedFile );
-                       }
+       /**
+        * Stash a file in a temporary directory for later processing
+        * after the user has confirmed it.
+        *
+        * If the user doesn't explicitly cancel or accept, these files
+        * can accumulate in the temp directory.
+        *
+        * @param string $saveName - the destination filename
+        * @param string $tempName - the source temporary file to save
+        * @return string - full path the stashed file, or false on failure
+        * @access private
+        */
+       function saveTempUploadedFile( $saveName, $tempName ) {
+               global $wgOut;
+               $repo = RepoGroup::singleton()->getLocalRepo();
+               $status = $repo->storeTemp( $saveName, $tempName );
+               if ( !$status->isGood() ) {
+                       $this->showError( $status->getWikiText() );
+                       return false;
+               } else {
+                       return $status->value;
                }
        }
 
-       function uploadError( $error )
-       {
+       /**
+        * Stash a file in a temporary directory for later processing,
+        * and save the necessary descriptive info into the session.
+        * Returns a key value which will be passed through a form
+        * to pick up the path info on a later invocation.
+        *
+        * @return int
+        * @access private
+        */
+       function stashSession() {
+               $stash = $this->saveTempUploadedFile( $this->mDestName, $this->mTempPath );
+
+               if( !$stash ) {
+                       # Couldn't save the file.
+                       return false;
+               }
+
+               $key = mt_rand( 0, 0x7fffffff );
+               $_SESSION['wsUploadData'][$key] = array(
+                       'mTempPath'       => $stash,
+                       'mFileSize'       => $this->mFileSize,
+                       'mSrcName'        => $this->mSrcName,
+                       'mFileProps'      => $this->mFileProps,
+                       'version'         => self::SESSION_VERSION,
+               );
+               return $key;
+       }
+
+       /**
+        * Remove a temporarily kept file stashed by saveTempUploadedFile().
+        * @access private
+        * @return success
+        */
+       function unsaveUploadedFile() {
                global $wgOut;
-               $sub = wfMsg( "uploadwarning" );
-               $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
-               $wgOut->addHTML( "<h4><font color=red>{$error}</font></h4>\n" );
+               $repo = RepoGroup::singleton()->getLocalRepo();
+               $success = $repo->freeTemp( $this->mTempPath );
+               if ( ! $success ) {
+                       $wgOut->showFileDeleteError( $this->mTempPath );
+                       return false;
+               } else {
+                       return true;
+               }
+       }
+
+       /* -------------------------------------------------------------- */
+
+       /**
+        * @param string $error as HTML
+        * @access private
+        */
+       function uploadError( $error ) {
+               global $wgOut;
+               $wgOut->addHTML( "<h2>" . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" );
+               $wgOut->addHTML( "<span class='error'>{$error}</span>\n" );
        }
 
-       function uploadWarning( $warning )
-       {
-               global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest;
-               global $wgSavedFile, $wgUploadOldVersion;
+       /**
+        * 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.
+        *
+        * @param string $warning as HTML
+        * @access private
+        */
+       function uploadWarning( $warning ) {
+               global $wgOut, $wgContLang;
                global $wgUseCopyrightUpload;
 
-               # wgSavedFile is stored in the session not the form, for security
-               $this->mSessionKey = mt_rand( 0, 0x7fffffff );
-               $_SESSION['wsUploadFiles'][$this->mSessionKey] = $wgSavedFile;
+               $this->mSessionKey = $this->stashSession();
+               if( !$this->mSessionKey ) {
+                       # Couldn't save file; an error has been displayed so let's go.
+                       return;
+               }
 
-               $sub = wfMsg( "uploadwarning" );
-               $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
-               $wgOut->addHTML( "<h4><font color=red>{$warning}</font></h4>\n" );
+               $wgOut->addHTML( "<h2>" . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" );
+               $wgOut->addHTML( "<ul class='warning'>{$warning}</ul><br />\n" );
 
-               $save = wfMsg( "savefile" );
-               $reupload = wfMsg( "reupload" );
-               $iw = wfMsg( "ignorewarning" );
-               $reup = wfMsg( "reuploaddesc" );
-               $titleObj = Title::makeTitle( NS_SPECIAL, "Upload" );
-               $action = $titleObj->escapeLocalURL( "action=submit" );
+               $save = wfMsgHtml( 'savefile' );
+               $reupload = wfMsgHtml( 'reupload' );
+               $iw = wfMsgWikiHtml( 'ignorewarning' );
+               $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 =  "
-       <input type=hidden name=\"wpUploadCopyStatus\" value=\"" . htmlspecialchars( $this->mUploadCopyStatus ) . "\">
-       <input type=hidden name=\"wpUploadSource\" value=\"" . htmlspecialchars( $this->mUploadSource ) . "\">
+       <input type='hidden' name='wpUploadCopyStatus' value=\"" . htmlspecialchars( $this->mCopyrightStatus ) . "\" />
+       <input type='hidden' name='wpUploadSource' value=\"" . htmlspecialchars( $this->mCopyrightSource ) . "\" />
        ";
                } else {
                        $copyright = "";
                }
 
                $wgOut->addHTML( "
-       <form id=\"uploadwarning\" method=\"post\" enctype=\"multipart/form-data\"
-       action=\"{$action}\">
-       <input type=hidden name=\"wpUploadAffirm\" value=\"1\">
-       <input type=hidden name=\"wpIgnoreWarning\" value=\"1\">
-       <input type=hidden name=\"wpUploadDescription\" value=\"" . htmlspecialchars( $this->mUploadDescription ) . "\">
+       <form id='uploadwarning' method='post' enctype='multipart/form-data' action='$action'>
+               <input type='hidden' name='wpIgnoreWarning' value='1' />
+               <input type='hidden' name='wpSessionKey' value=\"" . htmlspecialchars( $this->mSessionKey ) . "\" />
+               <input type='hidden' name='wpUploadDescription' value=\"" . htmlspecialchars( $this->mComment ) . "\" />
+               <input type='hidden' name='wpLicense' value=\"" . htmlspecialchars( $this->mLicense ) . "\" />
+               <input type='hidden' name='wpDestFile' value=\"" . htmlspecialchars( $this->mDesiredDestName ) . "\" />
+               <input type='hidden' name='wpWatchthis' value=\"" . htmlspecialchars( intval( $this->mWatchthis ) ) . "\" />
        {$copyright}
-       <input type=hidden name=\"wpUploadSaveName\" value=\"" . htmlspecialchars( $this->mUploadSaveName ) . "\">
-       <input type=hidden name=\"wpUploadTempName\" value=\"" . htmlspecialchars( $this->mUploadTempName ) . "\">
-       <input type=hidden name=\"wpUploadSize\" value=\"" . htmlspecialchars( $this->mUploadSize ) . "\">
-       <input type=hidden name=\"wpSessionKey\" value=\"" . htmlspecialchars( $this->mSessionKey ) . "\">
-       <input type=hidden name=\"wpUploadOldVersion\" value=\"" . htmlspecialchars( $wgUploadOldVersion) . "\">
-       <table border=0><tr>
-       <tr><td align=right>
-       <input tabindex=2 type=submit name=\"wpUpload\" value=\"{$save}\">
-       </td><td align=left>{$iw}</td></tr>
-       <tr><td align=right>
-       <input tabindex=2 type=submit name=\"wpReUpload\" value=\"{$reupload}\">
-       </td><td align=left>{$reup}</td></tr></table></form>\n" );
-       }
-
-       function mainUploadForm( $msg )
-       {
-               global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest;
-               global $wgUseCopyrightUpload;
+       <table border='0'>
+               <tr>
+                       <tr>
+                               <td align='$align1'>
+                                       <input tabindex='2' type='submit' name='wpUpload' value=\"$save\" />
+                               </td>
+                               <td align='$align2'>$iw</td>
+                       </tr>
+                       <tr>
+                               <td align='$align1'>
+                                       <input tabindex='2' type='submit' name='wpReUpload' value=\"{$reupload}\" />
+                               </td>
+                               <td align='$align2'>$reup</td>
+                       </tr>
+               </tr>
+       </table></form>\n" );
+       }
 
-               if ( "" != $msg ) {
-                       $sub = wfMsg( "uploaderror" );
-                       $wgOut->addHTML( "<h2>{$sub}</h2>\n" .
-                         "<h4><font color=red>{$msg}</font></h4>\n" );
+       /**
+        * Displays the main upload form, optionally with a highlighted
+        * error message up at the top.
+        *
+        * @param string $msg as HTML
+        * @access private
+        */
+       function mainUploadForm( $msg='' ) {
+               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( "<script type=\"text/javascript\">
+wgAjaxUploadDestCheck = {$adc};
+wgAjaxLicensePreview = {$alp};
+</script>
+<script type=\"text/javascript\" src=\"{$wgStylePath}/common/upload.js?{$wgStyleVersion}\"></script>
+               " );
+
+               if( !wfRunHooks( 'UploadForm:initial', array( &$this ) ) )
+               {
+                       wfDebug( "Hook 'UploadForm:initial' broke output of the upload form" );
+                       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( "<div id=\"contentSub2\">{$link}</div>" );
+                       }
+
+                       // 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' ));
+
+               if( $wgUser->getOption( 'editwidth' ) ) {
+                       $width = " style=\"width:100%\"";
                } else {
-                       $sub = wfMsg( "uploadfile" );
-                       $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
+                       $width = '';
                }
-               $wgOut->addHTML( "<p>" . wfMsg( "uploadtext" ) );
-               $sk = $wgUser->getSkin();
 
-               $fn = wfMsg( "filename" );
-               $fd = wfMsg( "filedesc" );
-               $ulb = wfMsg( "uploadbtn" );
+               if ( '' != $msg ) {
+                       $sub = wfMsgHtml( 'uploaderror' );
+                       $wgOut->addHTML( "<h2>{$sub}</h2>\n" .
+                         "<span class='error'>{$msg}</span>\n" );
+               }
+               $wgOut->addHTML( '<div id="uploadtext">' );
+               $wgOut->addWikiText( wfMsgNoTrans( 'uploadtext', $this->mDesiredDestName ) );
+               $wgOut->addHTML( "</div>\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(
+                                       '<div id="mw-upload-permitted">' .
+                                       wfMsgWikiHtml( 'upload-permitted', implode( $wgFileExtensions, $delim ) ) .
+                                       "</div>\n"
+                               );
+                       } else {
+                               # We have to list both preferred and prohibited
+                               $wgOut->addHTML(
+                                       '<div id="mw-upload-preferred">' .
+                                       wfMsgWikiHtml( 'upload-preferred', implode( $wgFileExtensions, $delim ) ) .
+                                       "</div>\n" .
+                                       '<div id="mw-upload-prohibited">' .
+                                       wfMsgWikiHtml( 'upload-prohibited', implode( $wgFileBlacklist, $delim ) ) .
+                                       "</div>\n"
+                               );
+                       }
+               }
+
+               $sourcefilename = wfMsgHtml( 'sourcefilename' );
+               $destfilename = wfMsgHtml( 'destfilename' );
+               $summary = wfMsgExt( 'fileuploadsummary', 'parseinline' );
+
+               $licenses = new Licenses();
+               $license = wfMsgExt( 'license', array( 'parseinline' ) );
+               $nolicense = wfMsgHtml( 'nolicense' );
+               $licenseshtml = $licenses->getHtml();
 
-               $clink = $sk->makeKnownLink( wfMsg( "copyrightpage" ),
-                 wfMsg( "copyrightpagename" ) );
-               $ca = wfMsg( "affirmation", $clink );
-               $iw = wfMsg( "ignorewarning" );
+               $ulb = wfMsgHtml( 'uploadbtn' );
 
-               $titleObj = Title::makeTitle( NS_SPECIAL, "Upload" );
+
+               $titleObj = SpecialPage::getTitleFor( 'Upload' );
                $action = $titleObj->escapeLocalURL();
 
-               $source = "
-       <td align=right>
-       <input tabindex=3 type=checkbox name=\"wpUploadAffirm\" value=\"1\" id=\"wpUploadAffirm\">
-       </td><td align=left><label for=\"wpUploadAffirm\">{$ca}</label></td>
-       " ;
-               if ( $wgUseCopyrightUpload )
-                 {
-                       $source = "
-       <td align=right nowrap>" . wfMsg ( "filestatus" ) . ":</td>
-       <td><input tabindex=3 type=text name=\"wpUploadCopyStatus\" value=\"" .
-       htmlspecialchars($this->mUploadCopyStatus). "\" size=40></td>
-       </tr><tr>
-       <td align=right>". wfMsg ( "filesource" ) . ":</td>
-       <td><input tabindex=4 type=text name=\"wpUploadSource\" value=\"" .
-       htmlspecialchars($this->mUploadSource). "\" size=40></td>
-       " ;
-                 }
+               $encDestName = htmlspecialchars( $this->mDesiredDestName );
 
+               $watchChecked =
+                       ( $wgUser->getOption( 'watchdefault' ) ||
+                               ( $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 =
+                               "<input type='radio' id='wpSourceTypeFile' name='wpSourceType' value='file' " .
+                                  "onchange='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\")' checked />" .
+                                "<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' " .
+                                  "onfocus='" . 
+                                    "toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\");" .
+                                    "toggle_element_check(\"wpSourceTypeFile\",\"wpSourceTypeURL\")'" .
+                               ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . "size='40' />" .
+                               wfMsgHTML( 'upload_source_file' ) . "<br/>" .
+                               "<input type='radio' id='wpSourceTypeURL' name='wpSourceType' value='web' " .
+                                 "onchange='toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\")' />" .
+                               "<input tabindex='1' type='text' name='wpUploadFileURL' id='wpUploadFileURL' " .
+                                 "onfocus='" .
+                                   "toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\");" .
+                                   "toggle_element_check(\"wpSourceTypeURL\",\"wpSourceTypeFile\")'" .
+                               ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='40' DISABLED />" .
+                               wfMsgHtml( 'upload_source_url' ) ;
+               } else {
+                       $filename_form =
+                               "<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' " .
+                               ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") .
+                               "size='40' />" .
+                               "<input type='hidden' name='wpSourceType' value='file' />" ;
+               }
+               if ( $useAjaxDestCheck ) {
+                       $warningRow = "<tr><td colspan='2' id='wpDestFile-warning'>&nbsp;</td></tr>";
+                       $destOnkeyup = 'onkeyup="wgUploadWarningObj.keypress();"';
+               } else {
+                       $warningRow = '';
+                       $destOnkeyup = '';
+               }
+
+               $encComment = htmlspecialchars( $this->mComment );
+               $align1 = $wgContLang->isRTL() ? 'left' : 'right';
+               $align2 = $wgContLang->isRTL() ? 'right' : 'left';
+
+               $wgOut->addHTML( <<<EOT
+       <form id='upload' method='post' enctype='multipart/form-data' action="$action">
+               <table border='0'>
+               <tr>
+         {$this->uploadFormTextTop}
+                       <td align='$align1' valign='top'><label for='wpUploadFile'>{$sourcefilename}:</label></td>
+                       <td align='$align2'>
+                               {$filename_form}
+                       </td>
+               </tr>
+               <tr>
+                       <td align='$align1'><label for='wpDestFile'>{$destfilename}:</label></td>
+                       <td align='$align2'>
+                               <input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='40' 
+                                       value="$encDestName" $destOnkeyup />
+                       </td>
+               </tr>
+               <tr>
+                       <td align='$align1'><label for='wpUploadDescription'>{$summary}</label></td>
+                       <td align='$align2'>
+                               <textarea tabindex='3' name='wpUploadDescription' id='wpUploadDescription' rows='6' 
+                                       cols='{$cols}'{$width}>$encComment</textarea>
+          {$this->uploadFormTextAfterSummary}
+                       </td>
+               </tr>
+               <tr>
+EOT
+               );
+
+               if ( $licenseshtml != '' ) {
+                       global $wgStylePath;
+                       $wgOut->addHTML( "
+                       <td align='$align1'><label for='wpLicense'>$license:</label></td>
+                       <td align='$align2'>
+                               <select name='wpLicense' id='wpLicense' tabindex='4'
+                                       onchange='licenseSelectorCheck()'>
+                                       <option value=''>$nolicense</option>
+                                       $licenseshtml
+                               </select>
+                       </td>
+                       </tr>
+                       <tr>" );
+                       if( $useAjaxLicensePreview ) {
+                               $wgOut->addHtml( "
+                                       <td></td>
+                                       <td id=\"mw-license-preview\"></td>
+                               </tr>
+                               <tr>" );
+                       }
+               }
+
+               if ( $wgUseCopyrightUpload ) {
+                       $filestatus = wfMsgHtml ( 'filestatus' );
+                       $copystatus =  htmlspecialchars( $this->mCopyrightStatus );
+                       $filesource = wfMsgHtml ( 'filesource' );
+                       $uploadsource = htmlspecialchars( $this->mCopyrightSource );
+
+                       $wgOut->addHTML( "
+                               <td align='$align1' nowrap='nowrap'><label for='wpUploadCopyStatus'>$filestatus:</label></td>
+                                       <td><input tabindex='5' type='text' name='wpUploadCopyStatus' id='wpUploadCopyStatus' 
+                                         value=\"$copystatus\" size='40' /></td>
+                       </tr>
+                       <tr>
+                               <td align='$align1'><label for='wpUploadCopyStatus'>$filesource:</label></td>
+                                       <td><input tabindex='6' type='text' name='wpUploadSource' id='wpUploadCopyStatus' 
+                                         value=\"$uploadsource\" size='40' /></td>
+                       </tr>
+                       <tr>
+               ");
+               }
+
+               $wgOut->addHtml( "
+               <td></td>
+               <td>
+                       <input tabindex='7' type='checkbox' name='wpWatchthis' id='wpWatchthis' $watchChecked value='true' />
+                       <label for='wpWatchthis'>" . wfMsgHtml( 'watchthisupload' ) . "</label>
+                       <input tabindex='8' type='checkbox' name='wpIgnoreWarning' id='wpIgnoreWarning' value='true' $warningChecked/>
+                       <label for='wpIgnoreWarning'>" . wfMsgHtml( 'ignorewarnings' ) . "</label>
+               </td>
+       </tr>
+       $warningRow
+       <tr>
+               <td></td>
+               <td align='$align2'><input tabindex='9' type='submit' name='wpUpload' value=\"{$ulb}\"" . $wgUser->getSkin()->tooltipAndAccesskey( 'upload' ) . " /></td>
+       </tr>
+       <tr>
+               <td></td>
+               <td align='$align2'>
+               " );
+               $wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
                $wgOut->addHTML( "
-       <form id=\"upload\" method=\"post\" enctype=\"multipart/form-data\"
-       action=\"{$action}\">
-       <table border=0><tr>
-       <td align=right>{$fn}:</td><td align=left>
-       <input tabindex=1 type=file name=\"wpUploadFile\" value=\""
-         . htmlspecialchars( $this->mUploadFile ) . "\" size=40>
-       </td></tr><tr>
-       <td align=right>{$fd}:</td><td align=left>
-       <input tabindex=2 type=text name=\"wpUploadDescription\" value=\""
-         . htmlspecialchars( $this->mUploadDescription ) . "\" size=40>
-       </td></tr><tr>
-       {$source}
+               </td>
        </tr>
-       <tr><td>&nbsp;</td><td align=left>
-       <input tabindex=5 type=submit name=\"wpUpload\" value=\"{$ulb}\">
-       </td></tr></table></form>\n" );
+
+       </table>
+       <input type='hidden' name='wpDestFileWarningAck' id='wpDestFileWarningAck' value=''/>
+       </form>" );
+       }
+
+       /* -------------------------------------------------------------- */
+
+       /**
+        * Split a file into a base name and all dot-delimited 'extensions'
+        * on the end. Some web server configurations will fall back to
+        * earlier pseudo-'extensions' to determine type and execute
+        * scripts, so the blacklist needs to check them all.
+        *
+        * @return array
+        */
+       function splitExtensions( $filename ) {
+               $bits = explode( '.', $filename );
+               $basename = array_shift( $bits );
+               return array( $basename, $bits );
+       }
+
+       /**
+        * Perform case-insensitive match against a list of file extensions.
+        * Returns true if the extension is in the list.
+        *
+        * @param string $ext
+        * @param array $list
+        * @return bool
+        */
+       function checkFileExtension( $ext, $list ) {
+               return in_array( strtolower( $ext ), $list );
+       }
+
+       /**
+        * Perform case-insensitive match against a list of file extensions.
+        * Returns true if any of the extensions are in the list.
+        *
+        * @param array $ext
+        * @param array $list
+        * @return bool
+        */
+       function checkFileExtensionList( $ext, $list ) {
+               foreach( $ext as $e ) {
+                       if( in_array( strtolower( $e ), $list ) ) {
+                               return true;
+                       }
+               }
+               return false;
+       }
+
+       /**
+        * Verifies that it's ok to include the uploaded file
+        *
+        * @param string $tmpfile the full path of the temporary file to verify
+        * @param string $extension The filename extension that the file is to be served with
+        * @return mixed true of the file is verified, a WikiError object otherwise.
+        */
+       function verify( $tmpfile, $extension ) {
+               #magically determine mime type
+               $magic=& MimeMagic::singleton();
+               $mime= $magic->guessMimeType($tmpfile,false);
+
+               #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' );
+                       }
+
+                       #check mime type blacklist
+                       global $wgMimeTypeBlacklist;
+                       if( isset($wgMimeTypeBlacklist) && !is_null($wgMimeTypeBlacklist)
+                               && $this->checkFileExtension( $mime, $wgMimeTypeBlacklist ) ) {
+                               return new WikiErrorMsg( 'filetype-badmime', htmlspecialchars( $mime ) );
+                       }
+               }
+
+               #check for htmlish code and javascript
+               if( $this->detectScript ( $tmpfile, $mime, $extension ) ) {
+                       return new WikiErrorMsg( 'uploadscripted' );
+               }
+
+               /**
+               * Scan the uploaded file for viruses
+               */
+               $virus= $this->detectVirus($tmpfile);
+               if ( $virus ) {
+                       return new WikiErrorMsg( 'uploadvirus', htmlspecialchars($virus) );
+               }
+
+               wfDebug( __METHOD__.": all clear; passing.\n" );
+               return true;
+       }
+
+       /**
+        * Checks if the mime type of the uploaded file matches the file extension.
+        *
+        * @param string $mime the mime type of the uploaded file
+        * @param string $extension The filename extension that the file is to be served with
+        * @return bool
+        */
+       function verifyExtension( $mime, $extension ) {
+               $magic =& MimeMagic::singleton();
+
+               if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' )
+                       if ( ! $magic->isRecognizableExtension( $extension ) ) {
+                               wfDebug( __METHOD__.": passing file with unknown detected mime type; " .
+                                       "unrecognized extension '$extension', can't verify\n" );
+                               return true;
+                       } else {
+                               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( __METHOD__.": no file extension known for mime type $mime, passing file\n" );
+                       return true;
+               } elseif ($match===true) {
+                       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( __METHOD__.": mime type $mime mismatches file extension $extension, rejecting file\n" );
+                       return false;
+               }
+       }
+
+       /** 
+        * 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;
+
+               #ugly hack: for text files, always look at the entire file.
+               #For binarie field, just check the first K.
+
+               if (strpos($mime,'text/')===0) $chunk = file_get_contents( $file );
+               else {
+                       $fp = fopen( $file, 'rb' );
+                       $chunk = fread( $fp, 1024 );
+                       fclose( $fp );
+               }
+
+               $chunk= strtolower( $chunk );
+
+               if (!$chunk) return false;
+
+               #decode from UTF-16 if needed (could be used for obfuscation).
+               if (substr($chunk,0,2)=="\xfe\xff") $enc= "UTF-16BE";
+               elseif (substr($chunk,0,2)=="\xff\xfe") $enc= "UTF-16LE";
+               else $enc= NULL;
+
+               if ($enc) $chunk= iconv($enc,"ASCII//IGNORE",$chunk);
+
+               $chunk= trim($chunk);
+
+               #FIXME: convert from UTF-16 if necessarry!
+
+               wfDebug("SpecialUpload::detectScript: checking for embedded scripts and HTML stuff\n");
+
+               #check for HTML doctype
+               if (eregi("<!DOCTYPE *X?HTML",$chunk)) return true;
+
+               /**
+               * Internet Explorer for Windows performs some really stupid file type
+               * autodetection which can cause it to interpret valid image files as HTML
+               * and potentially execute JavaScript, creating a cross-site scripting
+               * attack vectors.
+               *
+               * Apple's Safari browser also performs some unsafe file type autodetection
+               * which can cause legitimate files to be interpreted as HTML if the
+               * web server is not correctly configured to send the right content-type
+               * (or if you're really uploading plain text and octet streams!)
+               *
+               * Returns true if IE is likely to mistake the given file for HTML.
+               * Also returns true if Safari would mistake the given file for HTML
+               * when served with a generic content-type.
+               */
+
+               $tags = array(
+                       '<body',
+                       '<head',
+                       '<html',   #also in safari
+                       '<img',
+                       '<pre',
+                       '<script', #also in safari
+                       '<table'
+                       );
+               if( ! $wgAllowTitlesInSVG && $extension !== 'svg' && $mime !== 'image/svg' ) {
+                       $tags[] = '<title';
+               }
+
+               foreach( $tags as $tag ) {
+                       if( false !== strpos( $chunk, $tag ) ) {
+                               return true;
+                       }
+               }
+
+               /*
+               * look for javascript
+               */
+
+               #resolve entity-refs to look at attributes. may be harsh on big files... cache result?
+               $chunk = Sanitizer::decodeCharReferences( $chunk );
+
+               #look for script-types
+               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;
+
+               #look for css-style script-urls
+               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.
+        */
+       function detectVirus($file) {
+               global $wgAntivirus, $wgAntivirusSetup, $wgAntivirusRequired, $wgOut;
+
+               if ( !$wgAntivirus ) {
+                       wfDebug( __METHOD__.": virus scanner disabled\n");
+                       return NULL;
+               }
+
+               if ( !$wgAntivirusSetup[$wgAntivirus] ) {
+                       wfDebug( __METHOD__.": unknown virus scanner: $wgAntivirus\n" );
+                       # @TODO: localise
+                       $wgOut->addHTML( "<div class='error'>Bad configuration: unknown virus scanner: <i>$wgAntivirus</i></div>\n" ); 
+                       return "unknown antivirus: $wgAntivirus";
+               }
+
+               # look up scanner configuration
+               $command = $wgAntivirusSetup[$wgAntivirus]["command"];
+               $exitCodeMap = $wgAntivirusSetup[$wgAntivirus]["codemap"];
+               $msgPattern = isset( $wgAntivirusSetup[$wgAntivirus]["messagepattern"] ) ?
+                       $wgAntivirusSetup[$wgAntivirus]["messagepattern"] : null;
+
+               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( __METHOD__.": running virus scan: $command \n" );
+
+               # 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( "$command", $output, $exitCode );
+               } else {
+                       exec( "$command 2>&1", $output, $exitCode );
+               }
+
+               # map exit code to AV_xxx constants.
+               $mappedCode = $exitCode;
+               if ( $exitCodeMap ) { 
+                       if ( isset( $exitCodeMap[$exitCode] ) ) {
+                               $mappedCode = $exitCodeMap[$exitCode];
+                       } elseif ( isset( $exitCodeMap["*"] ) ) {
+                               $mappedCode = $exitCodeMap["*"];
+                       }
+               }
+
+               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 $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 ( $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( __METHOD__.": FOUND VIRUS! scanner feedback: $output" );
+                       return $output;
+               }
+       }
+
+       /**
+        * Check if the temporary file is MacBinary-encoded, as some uploads
+        * from Internet Explorer on Mac OS Classic and Mac OS X will be.
+        * If so, the data fork will be extracted to a second temporary file,
+        * which will then be checked for validity and either kept or discarded.
+        *
+        * @access private
+        */
+       function checkMacBinary() {
+               $macbin = new MacBinary( $this->mTempPath );
+               if( $macbin->isValid() ) {
+                       $dataFile = tempnam( wfTempDir(), "WikiMacBinary" );
+                       $dataHandle = fopen( $dataFile, 'wb' );
+
+                       wfDebug( "SpecialUpload::checkMacBinary: Extracting MacBinary data fork to $dataFile\n" );
+                       $macbin->extractData( $dataHandle );
+
+                       $this->mTempPath = $dataFile;
+                       $this->mFileSize = $macbin->dataForkLength();
+
+                       // We'll have to manually remove the new file if it's not kept.
+                       $this->mRemoveTempFile = true;
+               }
+               $macbin->close();
+       }
+
+       /**
+        * If we've modified the upload file we need to manually remove it
+        * on exit to clean up.
+        * @access private
+        */
+       function cleanupTempFile() {
+               if ( $this->mRemoveTempFile && file_exists( $this->mTempPath ) ) {
+                       wfDebug( "SpecialUpload::cleanupTempFile: Removing temporary file {$this->mTempPath}\n" );
+                       unlink( $this->mTempPath );
+               }
+       }
+
+       /**
+        * Check if there's an overwrite conflict and, if so, if restrictions
+        * forbid this user from performing the upload.
+        *
+        * @return mixed true on success, WikiError on failure
+        * @access private
+        */
+       function checkOverwrite( $name ) {
+               $img = wfFindFile( $name );
+
+               $error = '';
+               if( $img ) {
+                       global $wgUser, $wgOut;
+                       if( $img->isLocal() ) {
+                               if( !self::userCanReUpload( $wgUser, $img->name ) ) {
+                                       $error = 'fileexists-forbidden';
+                               }
+                       } else {
+                               if( !$wgUser->isAllowed( 'reupload' ) ||
+                                   !$wgUser->isAllowed( 'reupload-shared' ) ) {
+                                       $error = "fileexists-shared-forbidden";
+                               }
+                       }
+               }
+
+               if( $error ) {
+                       $errorText = wfMsg( $error, wfEscapeWikiText( $img->getName() ) );
+                       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( '<div id="mw-upload-deleted-warn">' );
+                       $out->addWikiText( wfMsg( 'upload-wasdeleted' ) );
+                       $viewer = new LogViewer( $reader );
+                       $viewer->showList( $out );
+                       $out->addHtml( '</div>' );
+               }
        }
 }
-?>