X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialUpload.php;h=96cff75ce1df89791952308fe2dad9144d241488;hb=f1cc6051330c2f40fe16ffa660b0e3587cd0bd07;hp=8dcaaf4f853ad5a79dbd8bf8d4aeb51b27cb5776;hpb=8ee5d707350e703aa5f5d94f5dbca70eb527f284;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 8dcaaf4f85..96cff75ce1 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -1,246 +1,371 @@
-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( "" );
- }
+/**
+ * Constructor
+ */
+function wfSpecialUpload() {
+ global $wgRequest;
+ $form = new UploadForm( $wgRequest );
+ $form->execute();
}
-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'];
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+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 = $request->getFileTempName( 'wpUploadFile' );
+ }
+ if ( ! $this->mUploadSize ) {
+ $this->mUploadSize = $request->getFileSize( 'wpUploadFile' );
+ }
+ $this->mOname = $request->getFileName( 'wpUploadFile' );
+
}
- 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, $wgCheckCopyrightUpload;
+ global $wgCheckFileExtensions, $wgStrictFileExtensions;
+ global $wgFileExtensions, $wgFileBlacklist, $wgUploadSizeWarning;
- if ( "" == $ext ) { $xl = 0; } else { $xl = strlen( $ext ) + 1; }
- $partname = substr( $basename, 0, strlen( $basename ) - $xl );
+ if ( $wgUseCopyrightUpload ) {
+ $this->mUploadAffirm = 1;
+ if ($wgCheckCopyrightUpload &&
+ (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;
+ }
+
+ $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 ) ) );
+ }
+
+ $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 .= ''.wfMsg( "badfilename", htmlspecialchars( $this->mUploadSaveName ) ).'';
+ }
+
+ if ( $wgCheckFileExtensions ) {
+ if ( ! $this->checkFileExtension( $ext, $wgFileExtensions ) ) {
+ $warning .= ''.wfMsg( "badfiletype", htmlspecialchars( $ext ) ).'';
+ }
+ }
+ if ( $wgUploadSizeWarning && ( $this->mUploadSize > $wgUploadSizeWarning ) ) {
+ $warning .= ''.wfMsg( "largefile" ).'';
+ }
+ if ( $this->mUploadSize == 0 ) {
+ $warning .= ''.wfMsg( "emptyfile" ).'';
+ }
+ if( $nt->getArticleID() ) {
+ $sk = $wgUser->getSkin();
+ $dname = $wgLang->getNsText( Namespace::getImage() ) . ":{$this->mUploadSaveName}";
+ $dlink = $sk->makeKnownLink( $dname, $dname );
+ $warning .= ''.wfMsg( "fileexists", $dlink ).'';
+ }
+ if($warning != '') return $this->uploadWarning($warning);
+ }
}
- 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( "" . wfMsg( "successfulupload" ) . "
\n" );
+ $text = wfMsg( "fileuploaded", $ilink, $dlink );
+ $wgOut->addHTML( "{$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( "
" . wfMsg( "successfulupload" ) . "
\n" );
- $text = str_replace( "$1", $ilink, wfMsg( "fileuploaded" ) );
- $text = str_replace( "$2", $dlink, $text );
- $wgOut->addHTML( "{$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( "
{$sub}
\n" );
+ $wgOut->addHTML( "{$error}
\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( "{$sub}
\n" );
+ $wgOut->addHTML( "
\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 = "
+ mUploadCopyStatus ) . "\" />
+ mUploadSource ) . "\" />
+ ";
+ } else {
+ $copyright = "";
}
+
+ $wgOut->addHTML( "
+ \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( "{$sub}
\n" );
- $wgOut->addHTML( "{$warning}
\n" );
-
- $save = wfMsg( "savefile" );
- $reupload = wfMsg( "reupload" );
- $iw = wfMsg( "ignorewarning" );
- $reup = wfMsg( "reuploaddesc" );
- $action = wfLocalUrlE( $wgLang->specialPage( "Upload" ),
- "action=submit" );
-
- $wgOut->addHTML( "
-\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( "{$sub}
\n" .
- "{$msg}
\n" );
- } else {
- $sub = wfMsg( "uploadfile" );
- $wgOut->addHTML( "{$sub}
\n" );
+ if ( "" != $msg ) {
+ $sub = wfMsg( "uploaderror" );
+ $wgOut->addHTML( "{$sub}
\n" .
+ "{$msg}
\n" );
+ } else {
+ $sub = wfMsg( "uploadfile" );
+ $wgOut->addHTML( "{$sub}
\n" );
+ }
+ $wgOut->addWikiText( 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( "
+ \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 = str_replace( "$1", $clink, wfMsg( "affirmation" ) );
- $iw = wfMsg( "ignorewarning" );
-
- $action = wfLocalUrl( $wgLang->specialPage( "Upload" ) );
- $wgOut->addHTML( "
-
\n" );
}
-
?>