Arbitrary diff selection without javascript
[lhc/web/wiklou.git] / includes / SpecialUpload.php
index fc7093f..eeff398 100644 (file)
-<?
+<?php
 
 function wfSpecialUpload()
 {
-       global $wgUser, $wgOut, $wpUpload, $wpReUpload, $action;
+       global $wgRequest;
+       $form = new UploadForm( $wgRequest );
+       $form->execute();
+}
 
-       $fields = array( "wpUploadFile", "wpUploadDescription" );
-       wfCleanFormFields( $fields );
+class UploadForm {
+       var $mUploadAffirm, $mUploadFile, $mUploadDescription, $mIgnoreWarning;
+       var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion;
+       var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload;
+       var $mOname, $mSessionKey;
 
-       if ( 0 == $wgUser->getID() ) {
-               $wgOut->errorpage( "uploadnologin", "uploadnologintext" );
-               return;
-       }
-       if ( wfReadOnly() ) {
-               $wgOut->readOnlyPage();
-               return;
-       }
-       if ( isset( $wpReUpload) ) {
-               unsaveUploadedFile();
-               mainUploadForm( "" );
-       } else if ( "submit" == $action || isset( $wpUpload ) ) {
-               processUpload();
-       } else {
-               mainUploadForm( "" );
-       }
-}
+       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' );
+
+               if ( ! $this->mUploadTempName ) {
+                       $this->mUploadTempName = @$_FILES['wpUploadFile']['tmp_name'];
+               }
+               if ( ! $this->mUploadSize ) {
+                       $this->mUploadSize = @$_FILES['wpUploadFile']['size'];
+               }
+               $this->mOname = $request->getGPCVal( $_FILES['wpUploadFile'], 'name', "" );
 
-function processUpload()
-{
-       global $wgUser, $wgOut, $wgLang, $wpUploadAffirm, $wpUploadFile;
-       global $wpUploadDescription, $wpIgnoreWarning;
-       global $HTTP_POST_FILES, $wgUploadDirectory;
-       global $wpUploadSaveName, $wpUploadTempName, $wpUploadSize;
-       global $wgSavedFile, $wgUploadOldVersion, $wpUploadOldVersion;
-
-       if ( 1 != $wpUploadAffirm ) {
-               mainUploadForm( WfMsg( "noaffirmation" ) );
-               return;
-       }
-       if ( ! $wpUploadTempName ) {
-               $wpUploadTempName = $HTTP_POST_FILES['wpUploadFile']['tmp_name'];
        }
-       if ( ! $wpUploadSize ) {
-               $wpUploadSize = $HTTP_POST_FILES['wpUploadFile']['size'];
+
+       function execute() {
+               global $wgUser, $wgOut;
+               global $wgDisableUploads;
+
+               if ( $wgDisableUploads ) {
+                       $wgOut->addWikiText( wfMsg( "uploaddisabled" ) );
+                       return;
+               }
+               if ( ( 0 == $wgUser->getID() )
+                       or $wgUser->isBlocked() ) {
+                       $wgOut->errorpage( "uploadnologin", "uploadnologintext" );
+                       return;
+               }
+               if ( wfReadOnly() ) {
+                       $wgOut->readOnlyPage();
+                       return;
+               }
+               if ( $this->mReUpload ) {
+                       $this->unsaveUploadedFile();
+                       $this->mainUploadForm( "" );
+               } else if ( "submit" == $this->mAction || $this->mUpload ) {
+                       $this->processUpload();
+               } else {
+                       $this->mainUploadForm( "" );
+               }
        }
-       $prev = error_reporting( E_ALL & ~( E_NOTICE | E_WARNING ) );
-       $oname = wfCleanQueryVar( $HTTP_POST_FILES['wpUploadFile']['name'] );
-       if ( $wpUploadSaveName != "" ) $wpUploadSaveName = wfCleanQueryVar( $wpUploadSaveName );
-       error_reporting( $prev );
 
-       if ( "" != $oname ) {
-               $basename = strrchr( $oname, "/" );
-               if ( false === $basename ) { $basename = $oname; }
-               else ( $basename = substr( $basename, 1 ) );
 
-               $ext = strrchr( $basename, "." );
-               if ( false === $ext ) { $ext = ""; }
-               else { $ext = substr( $ext, 1 ); }
+       function processUpload()
+       {
+               global $wgUser, $wgOut, $wgLang;
+               global $wgUploadDirectory;
+               global $wgSavedFile, $wgUploadOldVersion;
+               global $wgUseCopyrightUpload;
+               global $wgCheckFileExtensions, $wgStrictFileExtensions;
+               global $wgFileExtensions, $wgFileBlacklist;
 
-               if ( "" == $ext ) { $xl = 0; } else { $xl = strlen( $ext ) + 1; }
-               $partname = substr( $basename, 0, strlen( $basename ) - $xl );
+               if ( $wgUseCopyrightUpload ) {
+                       $this->mUploadAffirm = 1;
+                       if ( trim ( $this->mUploadCopyStatus ) == "" || trim ( $this->mUploadSource ) == "" ) {
+                               $this->mUploadAffirm = 0;
+                       }
+               }
 
-               if ( strlen( $partname ) < 3 ) {
-                       mainUploadForm( WfMsg( "minlength" ) );
+               if ( 1 != $this->mUploadAffirm ) {
+                       $this->mainUploadForm( WfMsg( "noaffirmation" ) );
                        return;
                }
-               $nt = Title::newFromText( $basename );
-               $wpUploadSaveName = $nt->getDBkey();
 
-               saveUploadedFile();
-               if ( ( ! $wpIgnoreWarning ) &&
-                 ( 0 != strcmp( ucfirst( $basename ), $wpUploadSaveName ) ) ) {
-                       $warn = str_replace( "$1", $wpUploadSaveName,
-                         wfMsg( "badfilename" ) );
-                       return uploadWarning( $warn );
-               }
-               $extensions = array( "png", "jpg", "jpeg", "ogg" ); 
-               if ( ( ! $wpIgnoreWarning ) &&
-                 ( ! in_array( strtolower( $ext ), $extensions ) ) ) {
-                       $warn = str_replace( "$1", $ext, wfMsg( "badfiletype" ) );
-                       return uploadWarning( $warn );
+               if ( "" != $this->mOname ) {
+                       $basename = strrchr( $this->mOname, "/" );
+                       if ( false === $basename ) { $basename = $this->mOname; }
+                       else ( $basename = substr( $basename, 1 ) );
+
+                       $ext = strrchr( $basename, "." );
+                       if ( false === $ext ) { $ext = ""; }
+                       else { $ext = substr( $ext, 1 ); }
+
+                       if ( "" == $ext ) { $xl = 0; } else { $xl = strlen( $ext ) + 1; }
+                       $partname = substr( $basename, 0, strlen( $basename ) - $xl );
+
+                       if ( strlen( $partname ) < 3 ) {
+                               $this->mainUploadForm( WfMsg( "minlength" ) );
+                               return;
+                       }
+                       $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 ) );
+                       }
+                       
+                       $this->saveUploadedFile( $this->mUploadSaveName, $this->mUploadTempName );
+                       if ( ( ! $this->mIgnoreWarning ) &&
+                         ( 0 != strcmp( ucfirst( $basename ), $this->mUploadSaveName ) ) ) {
+                               return $this->uploadWarning( wfMsg( "badfilename", $this->mUploadSaveName ) );
+                       }
+                       
+                       if ( $wgCheckFileExtensions ) {
+                               if ( ( ! $this->mIgnoreWarning ) &&
+                                        ( ! $this->checkFileExtension( $ext, $wgFileExtensions ) ) ) {
+                                       return $this->uploadWarning( wfMsg( "badfiletype", $ext ) );
+                               }
+                       }
+                       if ( ( ! $this->mIgnoreWarning ) && ( $this->mUploadSize > 150000 ) ) {
+                               return $this->uploadWarning( wfMsg( "largefile" ) );
+                       }
                }
-               if ( ( ! $wpIgnoreWarning ) && ( $wpUploadSize > 150000 ) ) {
-                       return uploadWarning( WfMsg( "largefile" ) );
+               if ( !is_null( $this->mUploadOldVersion ) ) {
+                       $wgUploadOldVersion = $this->mUploadOldVersion;
                }
+               wfRecordUpload( $this->mUploadSaveName, $wgUploadOldVersion, $this->mUploadSize, 
+                 $this->mUploadDescription, $this->mUploadCopyStatus, $this->mUploadSource );
+
+               $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 ( isset( $wpUploadOldVersion ) ) {
-               $wgUploadOldVersion = $wpUploadOldVersion;
+
+       function checkFileExtension( $ext, $list ) {
+               return in_array( strtolower( $ext ), $list );
        }
-       wfRecordUpload( $wpUploadSaveName, $wgUploadOldVersion,
-         $wpUploadSize, $wpUploadDescription );
-
-       $sk = $wgUser->getSkin();
-       $ilink = $sk->makeMediaLink( $wpUploadSaveName, wfImageUrl(
-         $wpUploadSaveName ) );
-       $dname = $wgLang->getNsText( Namespace::getImage() ) . ":{$wpUploadSaveName}";
-       $dlink = $sk->makeKnownLink( $dname, $dname );
-
-       $wgOut->addHTML( "<h2>" . wfMsg( "successfulupload" ) . "</h2>\n" );
-       $text = str_replace( "$1", $ilink, wfMsg( "fileuploaded" ) );
-       $text = str_replace( "$2", $dlink, $text );
-       $wgOut->addHTML( "<p>{$text}\n" );
-       $wgOut->returnToMain( false );
-}
 
-function saveUploadedFile()
-{
-       global $wpUploadSaveName, $wpUploadTempName;
-       global $wgSavedFile, $wgUploadOldVersion;
-       global $wgUploadDirectory, $wgOut;
+       function saveUploadedFile( $saveName, $tempName )
+       {
+               global $wgSavedFile, $wgUploadOldVersion;
+               global $wgUploadDirectory, $wgOut;
 
-       $dest = wfImageDir( $wpUploadSaveName );
-       $archive = wfImageArchiveDir( $wpUploadSaveName );
-       $wgSavedFile = "{$dest}/{$wpUploadSaveName}";
+               $dest = wfImageDir( $saveName );
+               $archive = wfImageArchiveDir( $saveName );
+               $wgSavedFile = "{$dest}/{$saveName}";
 
-       if ( is_file( $wgSavedFile ) ) {
-               $wgUploadOldVersion = date( "YmdHis" ) . "!{$wpUploadSaveName}";
+               if ( is_file( $wgSavedFile ) ) {
+                       $wgUploadOldVersion = gmdate( "YmdHis" ) . "!{$saveName}";
 
-               if ( ! rename( $wgSavedFile, "${archive}/{$wgUploadOldVersion}" ) ) { 
-                       $wgOut->fileRenameError( $wgSavedFile,
-                         "${archive}/{$wgUploadOldVersion}" );
+                       if ( ! rename( $wgSavedFile, "${archive}/{$wgUploadOldVersion}" ) ) { 
+                               $wgOut->fileRenameError( $wgSavedFile,
+                                 "${archive}/{$wgUploadOldVersion}" );
+                               return;
+                       }
+               } else {
+                       $wgUploadOldVersion = "";
+               }
+               if ( ! move_uploaded_file( $tempName, $wgSavedFile ) ) {
+                       $wgOut->fileCopyError( $tempName, $wgSavedFile );
+               }
+               chmod( $wgSavedFile, 0644 );
+       }
+
+       function unsaveUploadedFile()
+       {
+               global $wgUploadDirectory, $wgOut, $wgRequest;
+               
+               $wgSavedFile = $_SESSION['wsUploadFiles'][$this->mSessionKey];
+               $wgUploadOldVersion = $this->mUploadOldVersion;
+
+               if ( ! @unlink( $wgSavedFile ) ) {
+                       $wgOut->fileDeleteError( $wgSavedFile );
                        return;
                }
-       } else {
-               $wgUploadOldVersion = "";
+               if ( "" != $wgUploadOldVersion ) {
+                       $hash = md5( substr( $wgUploadOldVersion, 15 ) );
+                       $archive = "{$wgUploadDirectory}/archive/" . $hash{0} .
+                       "/" . substr( $hash, 0, 2 );
+
+                       if ( ! rename( "{$archive}/{$wgUploadOldVersion}", $wgSavedFile ) ) {
+                               $wgOut->fileRenameError( "{$archive}/{$wgUploadOldVersion}",
+                                 $wgSavedFile );
+                       }
+               }
        }
-       if ( ! move_uploaded_file( $wpUploadTempName, $wgSavedFile ) ) {
-               $wgOut->fileCopyError( $wpUploadTempName, $wgSavedFile );
+
+       function uploadError( $error )
+       {
+               global $wgOut;
+               $sub = wfMsg( "uploadwarning" );
+               $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
+               $wgOut->addHTML( "<h4><font color=red>{$error}</font></h4>\n" );
        }
-       chmod( $wgSavedFile, 0644 );
-}
 
-function unsaveUploadedFile()
-{
-       global $wgSavedFile, $wgUploadOldVersion;
-       global $wpSavedFile, $wpUploadOldVersion;
-       global $wgUploadDirectory, $wgOut;
+       function uploadWarning( $warning )
+       {
+               global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest;
+               global $wgSavedFile, $wgUploadOldVersion;
+               global $wgUseCopyrightUpload;
 
-       $wgSavedFile = $wpSavedFile;
-       $wgUploadOldVersion = $wpUploadOldVersion;
+               # wgSavedFile is stored in the session not the form, for security
+               $this->mSessionKey = mt_rand( 0, 0x7fffffff );
+               $_SESSION['wsUploadFiles'][$this->mSessionKey] = $wgSavedFile;
 
-       if ( ! unlink( $wgSavedFile ) ) {
-               $wgOut->fileDeleteError( $wgSavedFile );
-               return;
-       }
-       if ( "" != $wgUploadOldVersion ) {
-               $hash = md5( substr( $wgUploadOldVersion, 15 ) );
-               $archive = "{$wgUploadDirectory}/archive/" . $hash{0} .
-               "/" . substr( $hash, 0, 2 );
+               $sub = wfMsg( "uploadwarning" );
+               $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
+               $wgOut->addHTML( "<h4><font color=red>{$warning}</font></h4>\n" );
 
-               if ( ! rename( "{$archive}/{$wgUploadOldVersion}", $wgSavedFile ) ) {
-                       $wgOut->fileRenameError( "{$archive}/{$wgUploadOldVersion}",
-                         $wgSavedFile );
+               $save = wfMsg( "savefile" );
+               $reupload = wfMsg( "reupload" );
+               $iw = wfMsg( "ignorewarning" );
+               $reup = wfMsg( "reuploaddesc" );
+               $titleObj = Title::makeTitle( NS_SPECIAL, "Upload" );
+               $action = $titleObj->escapeLocalURL( "action=submit" );
+
+               if ( $wgUseCopyrightUpload )
+               {
+                       $copyright =  "
+       <input type=hidden name=\"wpUploadCopyStatus\" value=\"" . htmlspecialchars( $this->mUploadCopyStatus ) . "\">
+       <input type=hidden name=\"wpUploadSource\" value=\"" . htmlspecialchars( $this->mUploadSource ) . "\">
+       ";
+               } 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 ) . "\">
+       {$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 uploadWarning( $warning )
-{
-       global $wgOut, $wgUser, $wgLang, $wgUploadDirectory;
-       global $wpUpload, $wpReUpload, $wpUploadAffirm, $wpUploadFile;
-       global $wpUploadDescription, $wpIgnoreWarning;
-       global $wpUploadSaveName, $wpUploadTempName, $wpUploadSize;
-       global $wgSavedFile, $wgUploadOldVersion;
-       global $wpSavedFile, $wpUploadOldVersion;
-
-       $sub = wfMsg( "uploadwarning" );
-       $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
-       $wgOut->addHTML( "<h4><font color=red>{$warning}</font></h4>\n" );
-
-       $save = wfMsg( "savefile" );
-       $reupload = wfMsg( "reupload" );
-       $iw = wfMsg( "ignorewarning" );
-       $reup = wfMsg( "reuploaddesc" );
-       $action = wfLocalUrlE( $wgLang->specialPage( "Upload" ),
-         "action=submit" );
-
-       $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( $wpUploadDescription ) . "\">
-<input type=hidden name=\"wpUploadSaveName\" value=\"" . htmlspecialchars( $wpUploadSaveName ) . "\">
-<input type=hidden name=\"wpUploadTempName\" value=\"" . htmlspecialchars( $wpUploadTempName ) . "\">
-<input type=hidden name=\"wpUploadSize\" value=\"" . htmlspecialchars( $wpUploadSize ) . "\">
-<input type=hidden name=\"wpSavedFile\" value=\"" . htmlspecialchars( $wgSavedFile ) . "\">
-<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;
 
-function mainUploadForm( $msg )
-{
-       global $wgOut, $wgUser, $wgLang, $wgUploadDirectory;
-       global $wpUpload, $wpUploadAffirm, $wpUploadFile;
-       global $wpUploadDescription, $wpIgnoreWarning;
-
-       if ( "" != $msg ) {
-               $sub = wfMsg( "uploaderror" );
-               $wgOut->addHTML( "<h2>{$sub}</h2>\n" .
-                 "<h4><font color=red>{$msg}</font></h4>\n" );
-       } else {
-               $sub = wfMsg( "uploadfile" );
-               $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
+               if ( "" != $msg ) {
+                       $sub = wfMsg( "uploaderror" );
+                       $wgOut->addHTML( "<h2>{$sub}</h2>\n" .
+                         "<h4><font color=red>{$msg}</font></h4>\n" );
+               } else {
+                       $sub = wfMsg( "uploadfile" );
+                       $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
+               }
+               $wgOut->addHTML( "<p>" . wfMsg( "uploadtext" ) );
+               $sk = $wgUser->getSkin();
+
+               $fn = wfMsg( "filename" );
+               $fd = wfMsg( "filedesc" );
+               $ulb = wfMsg( "uploadbtn" );
+
+               $clink = $sk->makeKnownLink( wfMsg( "copyrightpage" ),
+                 wfMsg( "copyrightpagename" ) );
+               $ca = wfMsg( "affirmation", $clink );
+               $iw = wfMsg( "ignorewarning" );
+
+               $titleObj = Title::makeTitle( NS_SPECIAL, "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>
+       " ;
+                 }
+
+               $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}
+       </tr>
+       <tr><td>&nbsp;</td><td align=left>
+       <input tabindex=5 type=submit name=\"wpUpload\" value=\"{$ulb}\">
+       </td></tr></table></form>\n" );
        }
-       $wgOut->addHTML( "<p>" . wfMsg( "uploadtext" ) );
-       $sk = $wgUser->getSkin();
-
-       $fn = wfMsg( "filename" );
-       $fd = wfMsg( "filedesc" );
-       $ulb = wfMsg( "uploadbtn" );
-
-       $clink = $sk->makeKnownLink( wfMsg( "copyrightpage" ),
-         wfMsg( "copyrightpagename" ) );
-       $ca = str_replace( "$1", $clink, wfMsg( "affirmation" ) );
-       $iw = wfMsg( "ignorewarning" );
-
-       $action = wfLocalUrl( $wgLang->specialPage( "Upload" ) );
-       $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( $wpUploadFile ) . "\" size=40>
-</td></tr><tr>
-<td align=right>{$fd}:</td><td align=left>
-<input tabindex=2 type=text name=\"wpUploadDescription\" value=\""
-  . htmlspecialchars( $wpUploadDescription ) . "\" size=40>
-</td></tr><tr>
-<td align=right>
-<input tabindex=3 type=checkbox name=\"wpUploadAffirm\" value=\"1\">
-</td><td align=left>{$ca}</td></tr>
-<tr><td>&nbsp;</td><td align=left>
-<input tabindex=5 type=submit name=\"wpUpload\" value=\"{$ulb}\">
-</td></tr></table></form>\n" );
 }
-
 ?>