From c10b49adf444d5077b47360f5893b4e5be393587 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Thu, 1 Apr 2004 12:37:45 +0000 Subject: [PATCH] refactoring and $wgRequest use --- includes/GlobalFunctions.php | 10 +- includes/SpecialUpload.php | 558 ++++++++++++++++++----------------- 2 files changed, 294 insertions(+), 274 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 3fb050880a..1b88de0532 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -481,12 +481,10 @@ function wfImageArchiveDir( $fname , $subdir="archive") return $archive; } -function wfRecordUpload( $name, $oldver, $size, $desc ) +function wfRecordUpload( $name, $oldver, $size, $desc, $copyStatus = "", $source = "" ) { global $wgUser, $wgLang, $wgTitle, $wgOut, $wgDeferredUpdateList; - global $wgRequest, $wgUseCopyrightUpload; - - extract( $wgRequest->getValues( 'wpUploadCopyStatus', 'wpUploadSource' ) ); + global $wgUseCopyrightUpload; $fname = "wfRecordUpload"; @@ -501,8 +499,8 @@ function wfRecordUpload( $name, $oldver, $size, $desc ) if ( $wgUseCopyrightUpload ) { $textdesc = "== " . wfMsg ( "filedesc" ) . " ==\n" . $desc . "\n" . - "== " . wfMsg ( "filestatus" ) . " ==\n" . $wpUploadCopyStatus . "\n" . - "== " . wfMsg ( "filesource" ) . " ==\n" . $wpUploadSource ; + "== " . wfMsg ( "filestatus" ) . " ==\n" . $copyStatus . "\n" . + "== " . wfMsg ( "filesource" ) . " ==\n" . $source ; } else $textdesc = $desc ; diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php index 3f335041c0..219b70d57f 100644 --- a/includes/SpecialUpload.php +++ b/includes/SpecialUpload.php @@ -2,306 +2,328 @@ 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; - } - if ( isset( $wpReUpload) ) { - unsaveUploadedFile(); - mainUploadForm( "" ); - } else if ( "submit" == $action || isset( $wpUpload ) ) { - processUpload(); - } else { - 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; + $form = new UploadForm( $wgRequest ); + $form->execute(); +} - if ( $wgUseCopyrightUpload ) { - $wpUploadAffirm = 1; - if ( trim ( $wpUploadCopyStatus ) == "" || trim ( $wpUploadSource ) == "" ) { - $wpUploadAffirm = 0; +class UploadForm { + var $mUploadAffirm, $mUploadFile, $mUploadDescription, $mIgnoreWarning; + var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion; + var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload; + var $mOname, $mSessionKey; + + 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', "" ); - 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 ( "" != $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 execute() { + global $wgUser, $wgOut; + global $wgDisableUploads; - if ( "" == $ext ) { $xl = 0; } else { $xl = strlen( $ext ) + 1; } - $partname = substr( $basename, 0, strlen( $basename ) - $xl ); - - if ( strlen( $partname ) < 3 ) { - mainUploadForm( WfMsg( "minlength" ) ); + if ( $wgDisableUploads ) { + $wgOut->addWikiText( wfMsg( "uploaddisabled" ) ); return; } - $nt = Title::newFromText( $basename ); - $wpUploadSaveName = $nt->getDBkey(); - - /* Don't allow users to override the blacklist */ - if( checkFileExtension( $ext, $wgFileBlacklist ) || - ($wgStrictFileExtensions && !checkFileExtension( $ext, $wgFileExtensions ) ) ) { - return uploadError( wfMsg( "badfiletype", $ext ) ); + if ( ( 0 == $wgUser->getID() ) + or $wgUser->isBlocked() ) { + $wgOut->errorpage( "uploadnologin", "uploadnologintext" ); + return; } - - saveUploadedFile(); - if ( ( ! $wpIgnoreWarning ) && - ( 0 != strcmp( ucfirst( $basename ), $wpUploadSaveName ) ) ) { - return uploadWarning( wfMsg( "badfilename", $wpUploadSaveName ) ); + if ( wfReadOnly() ) { + $wgOut->readOnlyPage(); + return; + } + if ( $this->mReUpload ) { + $this->unsaveUploadedFile(); + $this->mainUploadForm( "" ); + } else if ( "submit" == $this->mAction || $this->mUpload ) { + $this->processUpload(); + } else { + $this->mainUploadForm( "" ); } - - if ( $wgCheckFileExtensions ) { - if ( ( ! $wpIgnoreWarning ) && - ( ! checkFileExtension( $ext, $wgFileExtensions ) ) ) { - return uploadWarning( wfMsg( "badfiletype", $ext ) ); + } + + + function processUpload() + { + global $wgUser, $wgOut, $wgLang; + global $wgUploadDirectory; + global $wgSavedFile, $wgUploadOldVersion; + global $wgUseCopyrightUpload; + global $wgCheckFileExtensions, $wgStrictFileExtensions; + global $wgFileExtensions, $wgFileBlacklist; + + if ( $wgUseCopyrightUpload ) { + $this->mUploadAffirm = 1; + if ( trim ( $this->mUploadCopyStatus ) == "" || trim ( $this->mUploadSource ) == "" ) { + $this->mUploadAffirm = 0; } } - if ( ( ! $wpIgnoreWarning ) && ( $wpUploadSize > 150000 ) ) { - return uploadWarning( WfMsg( "largefile" ) ); + + if ( 1 != $this->mUploadAffirm ) { + $this->mainUploadForm( WfMsg( "noaffirmation" ) ); + return; } - } - 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( "

" . wfMsg( "successfulupload" ) . "

\n" ); - $text = wfMsg( "fileuploaded", $ilink, $dlink ); - $wgOut->addHTML( "

{$text}\n" ); - $wgOut->returnToMain( false ); -} -function checkFileExtension( $ext, $list ) { - return in_array( strtolower( $ext ), $list ); -} + if ( "" != $this->mOname ) { + $basename = strrchr( $this->mOname, "/" ); + if ( false === $basename ) { $basename = $this->mOname; } + else ( $basename = substr( $basename, 1 ) ); -function saveUploadedFile() -{ - global $wpUploadSaveName, $wpUploadTempName; - global $wgSavedFile, $wgUploadOldVersion; - global $wgUploadDirectory, $wgOut; + $ext = strrchr( $basename, "." ); + if ( false === $ext ) { $ext = ""; } + else { $ext = substr( $ext, 1 ); } - $dest = wfImageDir( $wpUploadSaveName ); - $archive = wfImageArchiveDir( $wpUploadSaveName ); - $wgSavedFile = "{$dest}/{$wpUploadSaveName}"; + if ( "" == $ext ) { $xl = 0; } else { $xl = strlen( $ext ) + 1; } + $partname = substr( $basename, 0, strlen( $basename ) - $xl ); - if ( is_file( $wgSavedFile ) ) { - $wgUploadOldVersion = gmdate( "YmdHis" ) . "!{$wpUploadSaveName}"; + if ( strlen( $partname ) < 3 ) { + $this->mainUploadForm( WfMsg( "minlength" ) ); + return; + } + $nt = Title::newFromText( $basename ); + $this->mUploadSaveName = $nt->getDBkey(); - if ( ! rename( $wgSavedFile, "${archive}/{$wgUploadOldVersion}" ) ) { - $wgOut->fileRenameError( $wgSavedFile, - "${archive}/{$wgUploadOldVersion}" ); - return; + /* 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" ) ); + } } - } else { - $wgUploadOldVersion = ""; - } - if ( ! move_uploaded_file( $wpUploadTempName, $wgSavedFile ) ) { - $wgOut->fileCopyError( $wpUploadTempName, $wgSavedFile ); + 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, wfImageUrl( + $this->mUploadSaveName ) ); + $dname = $wgLang->getNsText( Namespace::getImage() ) . ":{$this->mUploadSaveName}"; + $dlink = $sk->makeKnownLink( $dname, $dname ); + + $wgOut->addHTML( "

" . wfMsg( "successfulupload" ) . "

\n" ); + $text = wfMsg( "fileuploaded", $ilink, $dlink ); + $wgOut->addHTML( "

{$text}\n" ); + $wgOut->returnToMain( false ); } - chmod( $wgSavedFile, 0644 ); -} -function unsaveUploadedFile() -{ - global $wpSessionKey, $wpUploadOldVersion; - global $wgUploadDirectory, $wgOut; - - $wgSavedFile = $_SESSION['wsUploadFiles'][$wpSessionKey]; - $wgUploadOldVersion = $wpUploadOldVersion; - - if ( ! @unlink( $wgSavedFile ) ) { - $wgOut->fileDeleteError( $wgSavedFile ); - return; + function checkFileExtension( $ext, $list ) { + return in_array( strtolower( $ext ), $list ); } - 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 saveUploadedFile( $saveName, $tempName ) + { + global $wgSavedFile, $wgUploadOldVersion; + global $wgUploadDirectory, $wgOut; + + $dest = wfImageDir( $saveName ); + $archive = wfImageArchiveDir( $saveName ); + $wgSavedFile = "{$dest}/{$saveName}"; + + if ( is_file( $wgSavedFile ) ) { + $wgUploadOldVersion = gmdate( "YmdHis" ) . "!{$saveName}"; + + 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 uploadError( $error ) -{ - global $wgOut; - $sub = wfMsg( "uploadwarning" ); - $wgOut->addHTML( "

{$sub}

\n" ); - $wgOut->addHTML( "

{$error}

\n" ); -} + function unsaveUploadedFile() + { + global $wgUploadDirectory, $wgOut, $wgRequest; + + $wgSavedFile = $_SESSION['wsUploadFiles'][$this->mSessionKey]; + $wgUploadOldVersion = $this->mUploadOldVersion; -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( "

{$sub}

\n" ); - $wgOut->addHTML( "

{$warning}

\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 ) + 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 ) { - $copyright = " - - -"; + global $wgOut; + $sub = wfMsg( "uploadwarning" ); + $wgOut->addHTML( "

{$sub}

\n" ); + $wgOut->addHTML( "

{$error}

\n" ); } - $wgOut->addHTML( " -
- - - -{$copyright} - - - - - - - -
- -{$iw}
- -{$reup}
\n" ); -} + function uploadWarning( $warning ) + { + global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest; + global $wgSavedFile, $wgUploadOldVersion; + global $wgUseCopyrightUpload; -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( "

{$sub}

\n" . - "

{$msg}

\n" ); - } else { - $sub = wfMsg( "uploadfile" ); + # wgSavedFile is stored in the session not the form, for security + $this->mSessionKey = mt_rand( 0, 0x7fffffff ); + $_SESSION['wsUploadFiles'][$this->mSessionKey] = $wgSavedFile; + + $sub = wfMsg( "uploadwarning" ); $wgOut->addHTML( "

{$sub}

\n" ); + $wgOut->addHTML( "

{$warning}

\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 = " + mUploadCopyStatus ) . "\"> + mUploadSource ) . "\"> + "; + } else { + $copyright = ""; + } + + $wgOut->addHTML( " +
+ + + mUploadDescription ) . "\"> + {$copyright} + mUploadSaveName ) . "\"> + mUploadTempName ) . "\"> + mUploadSize ) . "\"> + mSessionKey ) . "\"> + + + +
+ + {$iw}
+ + {$reup}
\n" ); } - $wgOut->addHTML( "

" . 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 = " - - - -" ; - if ( $wgUseCopyrightUpload ) - { - $source = " -" . wfMsg ( "filestatus" ) . ": - - -". wfMsg ( "filesource" ) . ": - -" ; - } - - $wgOut->addHTML( " -

- - - -{$source} - -
{$fn}: - -
{$fd}: - -
  - -
\n" ); -} + function mainUploadForm( $msg ) + { + global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest; + global $wgUseCopyrightUpload; + + if ( "" != $msg ) { + $sub = wfMsg( "uploaderror" ); + $wgOut->addHTML( "

{$sub}

\n" . + "

{$msg}

\n" ); + } else { + $sub = wfMsg( "uploadfile" ); + $wgOut->addHTML( "

{$sub}

\n" ); + } + $wgOut->addHTML( "

" . 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 = " + + + + " ; + if ( $wgUseCopyrightUpload ) + { + $source = " + " . wfMsg ( "filestatus" ) . ": + mUploadCopyStatus). "\" size=40> + + ". wfMsg ( "filesource" ) . ": + mUploadSource). "\" size=40> + " ; + } + + $wgOut->addHTML( " +

+ + + + {$source} + +
{$fn}: + mUploadFile ) . "\" size=40> +
{$fd}: + mUploadDescription ) . "\" size=40> +
  + +
\n" ); + } +} ?> -- 2.20.1