<?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
+require_once( 'Image.php' );
+
+/**
+ * Entry point
+ */
+function wfSpecialUpload() {
+ global $wgRequest;
+ $form = new UploadForm( $wgRequest );
+ $form->execute();
+}
-function wfSpecialUpload()
-{
- global $wgUser, $wgOut, $wpUpload, $wpReUpload, $action;
- 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;
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+class UploadForm {
+ /**#@+
+ * @access private
+ */
+ var $mUploadAffirm, $mUploadFile, $mUploadDescription, $mIgnoreWarning;
+ var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion;
+ var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload;
+ var $mOname, $mSessionKey;
+ /**#@- */
+
+ /**
+ * 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' );
+
+ /** Generate a temporary name if we don't have one yet */
+ if ( ! $this->mUploadTempName ) {
+ $this->mUploadTempName = $request->getFileTempName( 'wpUploadFile' );
+ }
+
+ /** Get size of file */
+ if ( ! $this->mUploadSize ) {
+ $this->mUploadSize = $request->getFileSize( 'wpUploadFile' );
+ }
+ $this->mOname = $request->getFileName( 'wpUploadFile' );
}
- if ( isset( $wpReUpload) ) {
- unsaveUploadedFile();
- mainUploadForm( "" );
- } else if ( "submit" == $action || isset( $wpUpload ) ) {
- processUpload();
- } else {
- mainUploadForm( "" );
+
+ /**
+ * Start doing stuff
+ * @access public
+ */
+ function execute() {
+ global $wgUser, $wgOut;
+ global $wgDisableUploads;
+
+ /** Show an error message if file upload is disabled */
+ if ( $wgDisableUploads ) {
+ $wgOut->addWikiText( wfMsg( 'uploaddisabled' ) );
+ return;
+ }
+
+ /** Various rights checks */
+ if ( ( $wgUser->getID() == 0 )
+ 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( '' );
+ }
}
-}
-function processUpload()
-{
- global $wgUser, $wgOut, $wgLang, $wpUploadAffirm, $wpUploadFile;
- global $wpUploadDescription, $wpIgnoreWarning;
- global $wgUploadDirectory;
- global $wpUploadSaveName, $wpUploadTempName, $wpUploadSize;
- global $wgSavedFile, $wgUploadOldVersion, $wpUploadOldVersion;
- global $wgUseCopyrightUpload , $wpUploadCopyStatus , $wpUploadSource ;
- global $wgCheckFileExtensions, $wgStrictFileExtensions;
- global $wgFileExtensions, $wgFileBlacklist;
- global $wgRequest;
+ /**
+ * Really do the upload
+ * Checks are made in SpecialUpload::execute()
+ * @access private
+ */
+ function processUpload() {
+ global $wgUser, $wgOut, $wgLang, $wgContLang;
+ global $wgUploadDirectory;
+ global $wgSavedFile, $wgUploadOldVersion;
+ global $wgUseCopyrightUpload, $wgCheckCopyrightUpload;
+ global $wgCheckFileExtensions, $wgStrictFileExtensions;
+ global $wgFileExtensions, $wgFileBlacklist, $wgUploadSizeWarning;
+
+ /** When using detailed copyright, if user filled field, assume he
+ * confirmed the upload */
+ if ( $wgUseCopyrightUpload ) {
+ $this->mUploadAffirm = 1;
+ if ($wgCheckCopyrightUpload &&
+ (trim ( $this->mUploadCopyStatus ) == '' || trim ( $this->mUploadSource ) == '' )) {
+ $this->mUploadAffirm = 0;
+ }
+ }
- if ( $wgUseCopyrightUpload ) {
- $wpUploadAffirm = 1;
- if ( trim ( $wpUploadCopyStatus ) == "" || trim ( $wpUploadSource ) == "" ) {
- $wpUploadAffirm = 0;
+ /** User need to confirm his upload */
+ if ( $this->mUploadAffirm != 1) {
+ $this->mainUploadForm( WfMsg( 'noaffirmation' ) );
+ return;
}
- }
- if ( 1 != $wpUploadAffirm ) {
- mainUploadForm( WfMsg( "noaffirmation" ) );
- return;
- }
- if ( ! $wpUploadTempName ) {
- $wpUploadTempName = $_FILES['wpUploadFile']['tmp_name'];
- }
- if ( ! $wpUploadSize ) {
- $wpUploadSize = $_FILES['wpUploadFile']['size'];
- }
- $prev = error_reporting( E_ALL & ~( E_NOTICE | E_WARNING ) );
- $oname = $wgRequest->getGPCVal( $_FILES['wpUploadFile'], 'name' );
- error_reporting( $prev );
+ if ( $this->mOname != '' ) {
+ $basename = strrchr( $this->mOname, '/' );
- if ( "" != $oname ) {
- $basename = strrchr( $oname, "/" );
- if ( false === $basename ) { $basename = $oname; }
- else ( $basename = substr( $basename, 1 ) );
+ 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 );
+ $ext = strrchr( $basename, '.' );
+ if ( false === $ext ) { $ext = ''; }
+ else { $ext = substr( $ext, 1 ); }
- if ( strlen( $partname ) < 3 ) {
- mainUploadForm( WfMsg( "minlength" ) );
- return;
- }
- $nt = Title::newFromText( $basename );
- $wpUploadSaveName = $nt->getDBkey();
+ if ( '' == $ext ) { $xl = 0; } else { $xl = strlen( $ext ) + 1; }
+ $partname = substr( $basename, 0, strlen( $basename ) - $xl );
- /* Don't allow users to override the blacklist */
- if( checkFileExtension( $ext, $wgFileBlacklist ) ||
- ($wgStrictFileExtensions && !checkFileExtension( $ext, $wgFileExtensions ) ) ) {
- return uploadError( wfMsg( "badfiletype", $ext ) );
- }
-
- saveUploadedFile();
- if ( ( ! $wpIgnoreWarning ) &&
- ( 0 != strcmp( ucfirst( $basename ), $wpUploadSaveName ) ) ) {
- return uploadWarning( wfMsg( "badfilename", $wpUploadSaveName ) );
- }
-
- if ( $wgCheckFileExtensions ) {
- if ( ( ! $wpIgnoreWarning ) &&
- ( ! checkFileExtension( $ext, $wgFileExtensions ) ) ) {
- return uploadWarning( wfMsg( "badfiletype", $ext ) );
+ if ( strlen( $partname ) < 3 ) {
+ $this->mainUploadForm( WfMsg( 'minlength' ) );
+ return;
+ }
+
+ $changed_name = false;
+ $bn = preg_replace ( "/[^".Title::legalChars()."]/", '-', $basename );
+ if ( 0 != strcmp( $bn, $basename ) )
+ {
+ $changed_name = true;
+ $basename = $bn;
+ }
+
+ $nt = Title::newFromText( $basename );
+ if( !$nt ) {
+ return $this->uploadError( wfMsg( 'illegalfilename', htmlspecialchars( $basename ) ) );
+ }
+ $nt->setNamespace( Namespace::getImage() );
+ $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', htmlspecialchars( $ext ) ) );
+ }
+
+ if( !$this->verify( $this->mUploadTempName, $ext ) ) {
+ return $this->uploadError( wfMsg( 'uploadcorrupt' ) );
+ }
+
+ $this->saveUploadedFile( $this->mUploadSaveName, $this->mUploadTempName );
+ if ( !$nt->userCanEdit() ) {
+ return $this->uploadError( wfMsg( 'protectedpage' ) );
+ }
+
+ if ( ! $this->mIgnoreWarning ) {
+ $warning = '';
+ if( $changed_name || 0 != strcmp( ucfirst( $basename ), $this->mUploadSaveName ) ) {
+ $warning .= '<li>'.wfMsg( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
+ }
+
+ if ( $wgCheckFileExtensions ) {
+ if ( ! $this->checkFileExtension( $ext, $wgFileExtensions ) ) {
+ $warning .= '<li>'.wfMsg( 'badfiletype', htmlspecialchars( $ext ) ).'</li>';
+ }
+ }
+ if ( $wgUploadSizeWarning && ( $this->mUploadSize > $wgUploadSizeWarning ) ) {
+ $warning .= '<li>'.wfMsg( 'largefile' ).'</li>';
+ }
+ if ( $this->mUploadSize == 0 ) {
+ $warning .= '<li>'.wfMsg( 'emptyfile' ).'</li>';
+ }
+ if( $nt->getArticleID() ) {
+ $sk = $wgUser->getSkin();
+ $dname = $wgContLang->getNsText( Namespace::getImage() ) .':'.$this->mUploadSaveName;
+ $dlink = $sk->makeKnownLink( $dname, $dname );
+ $warning .= '<li>'.wfMsg( 'fileexists', $dlink ).'</li>';
+ }
+ if($warning != '') return $this->uploadWarning($warning);
}
+ } elseif(!isset($this->mUploadSaveName)) {
+ // no filename given even when reuploading
+ return $this->uploadError('<li>'.wfMsg( 'emptyfile' ).'</li>');
+
}
- 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 = $wgContLang->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;
- }
- 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 = wfMsg( "fileuploaded", $ilink, $dlink );
- $wgOut->addHTML( "<p>{$text}\n" );
- $wgOut->returnToMain( false );
-}
-function checkFileExtension( $ext, $list ) {
- return in_array( strtolower( $ext ), $list );
-}
+ function checkFileExtension( $ext, $list ) {
+ return in_array( strtolower( $ext ), $list );
+ }
-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 = gmdate( "YmdHis" ) . "!{$wpUploadSaveName}";
+ if ( is_file( $wgSavedFile ) ) {
+ $wgUploadOldVersion = gmdate( 'YmdHis' ) . "!{$saveName}";
- if ( ! rename( $wgSavedFile, "${archive}/{$wgUploadOldVersion}" ) ) {
- $wgOut->fileRenameError( $wgSavedFile,
- "${archive}/{$wgUploadOldVersion}" );
- return;
+ if ( ! rename( $wgSavedFile, "${archive}/{$wgUploadOldVersion}" ) ) {
+ $wgOut->fileRenameError( $wgSavedFile,
+ "${archive}/{$wgUploadOldVersion}" );
+ return;
+ }
+ } else {
+ $wgUploadOldVersion = '';
}
- } else {
- $wgUploadOldVersion = "";
- }
- if ( ! move_uploaded_file( $wpUploadTempName, $wgSavedFile ) ) {
- $wgOut->fileCopyError( $wpUploadTempName, $wgSavedFile );
+ if ( ! move_uploaded_file( $tempName, $wgSavedFile ) ) {
+ $wgOut->fileCopyError( $tempName, $wgSavedFile );
+ }
+ chmod( $wgSavedFile, 0644 );
}
- chmod( $wgSavedFile, 0644 );
-}
-function unsaveUploadedFile()
-{
- global $wpSessionKey, $wpUploadOldVersion;
- global $wgUploadDirectory, $wgOut;
-
- $wgSavedFile = $_SESSION['wsUploadFiles'][$wpSessionKey];
- $wgUploadOldVersion = $wpUploadOldVersion;
+ function unsaveUploadedFile() {
+ global $wgUploadDirectory, $wgOut, $wgRequest;
+
+ $wgSavedFile = $_SESSION['wsUploadFiles'][$this->mSessionKey];
+ $wgUploadOldVersion = $this->mUploadOldVersion;
- if ( ! @unlink( $wgSavedFile ) ) {
- $wgOut->fileDeleteError( $wgSavedFile );
- return;
- }
- 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 ( ! @unlink( $wgSavedFile ) ) {
+ $wgOut->fileDeleteError( $wgSavedFile );
+ return;
+ }
+ 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 );
+ }
}
}
-}
-
-function uploadError( $error )
-{
- global $wgOut;
- $sub = wfMsg( "uploadwarning" );
- $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
- $wgOut->addHTML( "<h4><font color=red>{$error}</font></h4>\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 $wpSessionKey, $wpUploadOldVersion;
- global $wgUseCopyrightUpload , $wpUploadCopyStatus , $wpUploadSource ;
-
- # wgSavedFile is stored in the session not the form, for security
- $wpSessionKey = mt_rand( 0, 0x7fffffff );
- $_SESSION['wsUploadFiles'][$wpSessionKey] = $wgSavedFile;
-
- $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" );
- $titleObj = Title::makeTitle( NS_SPECIAL, "Upload" );
- $action = $titleObj->escapeLocalURL( "action=submit" );
-
- if ( $wgUseCopyrightUpload )
- {
- $copyright = "
-<input type=hidden name=\"wpUploadCopyStatus\" value=\"" . htmlspecialchars( $wpUploadCopyStatus ) . "\">
-<input type=hidden name=\"wpUploadSource\" value=\"" . htmlspecialchars( $wpUploadSource ) . "\">
-";
+ function uploadError( $error ) {
+ global $wgOut;
+ $sub = wfMsg( 'uploadwarning' );
+ $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
+ $wgOut->addHTML( "<h4 style='error'>{$error}</h4>\n" );
}
- $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 ) . "\">
-{$copyright}
-<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=\"wpSessionKey\" value=\"" . htmlspecialchars( $wpSessionKey ) . "\">
-<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, $wgRequest;
+ global $wgSavedFile, $wgUploadOldVersion;
+ global $wgUseCopyrightUpload;
+
+ # wgSavedFile is stored in the session not the form, for security
+ $this->mSessionKey = mt_rand( 0, 0x7fffffff );
+ $_SESSION['wsUploadFiles'][$this->mSessionKey] = $wgSavedFile;
-function mainUploadForm( $msg )
-{
- global $wgOut, $wgUser, $wgLang, $wgUploadDirectory;
- global $wpUpload, $wpUploadAffirm, $wpUploadFile;
- global $wpUploadDescription, $wpIgnoreWarning;
- global $wgUseCopyrightUpload , $wpUploadSource , $wpUploadCopyStatus ;
-
- if ( "" != $msg ) {
- $sub = wfMsg( "uploaderror" );
- $wgOut->addHTML( "<h2>{$sub}</h2>\n" .
- "<h4><font color=red>{$msg}</font></h4>\n" );
- } else {
- $sub = wfMsg( "uploadfile" );
+ $sub = wfMsg( 'uploadwarning' );
$wgOut->addHTML( "<h2>{$sub}</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' );
+
+ 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" );
}
- $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($wpUploadCopyStatus). "\" size=40></td>
-</tr><tr>
-<td align=right>". wfMsg ( "filesource" ) . ":</td>
-<td><input tabindex=4 type=text name=\"wpUploadSource\" value=\"" .
-htmlspecialchars($wpUploadSource). "\" 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( $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>
-{$source}
-</tr>
-<tr><td> </td><td align=left>
-<input tabindex=5 type=submit name=\"wpUpload\" value=\"{$ulb}\">
-</td></tr></table></form>\n" );
-}
+ function mainUploadForm( $msg ) {
+ global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest;
+ global $wgUseCopyrightUpload;
+
+ if ( '' != $msg ) {
+ $sub = wfMsg( 'uploaderror' );
+ $wgOut->addHTML( "<h2>{$sub}</h2>\n" .
+ "<h4 style='error'>{$msg}</h4>\n" );
+ } else {
+ $sub = wfMsg( 'uploadfile' );
+ $wgOut->addHTML( "<h2>{$sub}</h2>\n" );
+ }
+ $wgOut->addWikiText( wfMsg( 'uploadtext' ) );
+ $sk = $wgUser->getSkin();
+
+ $fn = wfMsg( 'filename' );
+ $fd = wfMsg( 'filedesc' );
+ $ulb = wfMsg( 'uploadbtn' );
+
+ $clink = $sk->makeKnownLink( wfMsgForContent( '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='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></td><td align='left'>
+ <input tabindex='5' type='submit' name=\"wpUpload\" value=\"{$ulb}\" />
+ </td></tr></table></form>\n" );
+ }
+
+ /**
+ * Returns false if the file is of a known type but can't be recognized,
+ * indicating a corrupt file.
+ * Returns true otherwise; unknown file types are not checked if given
+ * with an unrecognized extension.
+ *
+ * @param string $tmpfile Pathname to the temporary upload file
+ * @param string $extension The filename extension that the file is to be served with
+ * @return bool
+ */
+ function verify( $tmpfile, $extension ) {
+ if( $this->triggersIEbug( $tmpfile ) ) {
+ return false;
+ }
+
+ $fname = 'SpecialUpload::verify';
+ $mergeExtensions = array(
+ 'jpg' => 'jpeg',
+ 'tif' => 'tiff' );
+ $extensionTypes = array(
+ # See http://www.php.net/getimagesize
+ 1 => 'gif',
+ 2 => 'jpeg',
+ 3 => 'png',
+ 4 => 'swf',
+ 5 => 'psd',
+ 6 => 'bmp',
+ 7 => 'tiff',
+ 8 => 'tiff',
+ 9 => 'jpc',
+ 10 => 'jp2',
+ 11 => 'jpx',
+ 12 => 'jb2',
+ 13 => 'swc',
+ 14 => 'iff',
+ 15 => 'wbmp',
+ 16 => 'xbm' );
+
+ $extension = strtolower( $extension );
+ if( isset( $mergeExtensions[$extension] ) ) {
+ $extension = $mergeExtensions[$extension];
+ }
+ wfDebug( "$fname: Testing file '$tmpfile' with given extension '$extension'\n" );
+
+ if( !in_array( $extension, $extensionTypes ) ) {
+ # Not a recognized image type. We don't know how to verify these.
+ # They're allowed by policy or they wouldn't get this far, so we'll
+ # let them slide for now.
+ wfDebug( "$fname: Unknown extension; passing.\n" );
+ return true;
+ }
+
+ $data = @getimagesize( $tmpfile );
+ if( false === $data ) {
+ # Didn't recognize the image type.
+ # Either the image is corrupt or someone's slipping us some
+ # bogus data such as HTML+JavaScript trying to take advantage
+ # of an Internet Explorer security flaw.
+ wfDebug( "$fname: getimagesize() doesn't recognize the file; rejecting.\n" );
+ return false;
+ }
+
+ $imageType = $data[2];
+ if( !isset( $extensionTypes[$imageType] ) ) {
+ # Now we're kind of confused. Perhaps new image types added
+ # to PHP's support that we don't know about.
+ # We'll let these slide for now.
+ wfDebug( "$fname: getimagesize() knows the file, but we don't recognize the type; passing.\n" );
+ return true;
+ }
+
+ $ext = strtolower( $extension );
+ if( $extension != $extensionTypes[$imageType] ) {
+ # The given filename extension doesn't match the
+ # file type. Probably just a mistake, but it's a stupid
+ # one and we shouldn't let it pass. KILL THEM!
+ wfDebug( "$fname: file extension does not match recognized type; rejecting.\n" );
+ return false;
+ }
+
+ wfDebug( "$fname: all clear; passing.\n" );
+ 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.
+ *
+ * Returns true if IE is likely to mistake the given file for HTML.
+ *
+ * @param string $filename
+ * @return bool
+ */
+ function triggersIEbug( $filename ) {
+ $file = fopen( $filename, 'rb' );
+ $chunk = strtolower( fread( $file, 200 ) );
+ fclose( $file );
+
+ $tags = array( '<html', '<head', '<body', '<script' );
+ foreach( $tags as $tag ) {
+ if( false !== strpos( $chunk, $tag ) ) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
?>