const VERIFICATION_ERROR = 10;
const UPLOAD_VERIFICATION_ERROR = 11;
const UPLOAD_WARNING = 12;
+ const INTERNAL_ERROR = 13;
/**#@+
* @access private
$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 ) );
+ $pathParts = explode( '/', $url );
+ $this->mSrcName = array_pop( $pathParts );
$this->mSessionKey = false;
$this->mStashed = false;
}
$this->mainUploadForm();
} else if( 'submit' == $this->mAction || $this->mUploadClicked ) {
- $this->processUpload();
+ $this->processUpload();
} else {
$this->mainUploadForm();
}
switch($value) {
case self::SUCCESS:
$wgOut->redirect( $this->mLocalFile->getTitle()->getFullURL() );
- return;
+ break;
case self::BEFORE_PROCESSING:
- return false;
+ break;
case self::LARGE_FILE_SERVER:
$this->mainUploadForm( wfMsgHtml( 'largefileserver' ) );
- return;
+ break;
case self::EMPTY_FILE:
$this->mainUploadForm( wfMsgHtml( 'emptyfile' ) );
- return;
+ break;
case self::MIN_LENGHT_PARTNAME:
$this->mainUploadForm( wfMsgHtml( 'minlength1' ) );
- return;
+ break;
case self::ILLEGAL_FILENAME:
$filtered = $details['filtered'];
$this->uploadError( wfMsgWikiHtml( 'illegalfilename', htmlspecialchars( $filtered ) ) );
- return;
+ break;
case self::PROTECTED_PAGE:
- return $this->uploadError( wfMsgWikiHtml( 'protectedpage' ) );
+ $this->uploadError( wfMsgWikiHtml( 'protectedpage' ) );
+ break;
case self::OVERWRITE_EXISTING_FILE:
$errorText = $details['overwrite'];
$overwrite = new WikiError( $wgOut->parse( $errorText ) );
- return $this->uploadError( $overwrite->toString() );
+ $this->uploadError( $overwrite->toString() );
+ break;
case self::FILETYPE_MISSING:
- return $this->uploadError( wfMsgExt( 'filetype-missing', array ( 'parseinline' ) ) );
+ $this->uploadError( wfMsgExt( 'filetype-missing', array ( 'parseinline' ) ) );
+ break;
case self::FILETYPE_BADTYPE:
$finalExt = $details['finalExt'];
- return $this->uploadError( wfMsgExt( 'filetype-badtype', array ( 'parseinline' ), htmlspecialchars( $finalExt ), implode ( ', ', $wgFileExtensions ) ) );
+ $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'];
- return $this->uploadError( $veri->toString() );
+ $this->uploadError( $veri->toString() );
+ break;
case self::UPLOAD_VERIFICATION_ERROR:
$error = $details['error'];
- return $this->uploadError( $error );
+ $this->uploadError( $error );
+ break;
case self::UPLOAD_WARNING:
$warning = $details['warning'];
- return $this->uploadWarning( $warning );
+ $this->uploadWarning( $warning );
+ break;
+
+ case self::INTERNAL_ERROR:
+ $internal = $details['internal'];
+ $this->showError( $internal );
+ break;
+
+ default:
+ throw new MWException( __METHOD__ . ": Unknown value `{$value}`" );
}
-
- /* TODO: Each case returns instead of breaking to maintain the highest level of compatibility during branch merging.
- They should be reviewed and corrected separatelly.
- */
- new MWException( __METHOD__ . ": Unknown value `{$value}`" );
}
/**
* If the image is protected, non-sysop users won't be able
* to modify it by uploading a new revision.
*/
- if( !$nt->userCan( 'edit' ) ) {
+ if( !$nt->userCan( 'edit' ) || !$nt->userCan( 'create' ) ) {
return self::PROTECTED_PAGE;
}
global $wgCheckFileExtensions;
if ( $wgCheckFileExtensions ) {
- if ( ! $this->checkFileExtension( $finalExt, $wgFileExtensions ) ) {
- $warning .= '<li>'.wfMsgExt( 'filetype-badtype', array ( 'parseinline' ),
- htmlspecialchars( $finalExt ), implode ( ', ', $wgFileExtensions ) ).'</li>';
+ if ( !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) {
+ $warning .= '<li>' .
+ wfMsgExt( 'filetype-unwanted-type',
+ array( 'parseinline' ),
+ htmlspecialchars( $finalExt ),
+ implode(
+ wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ),
+ $wgFileExtensions
+ )
+ ) . '</li>';
}
}
$status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText,
File::DELETE_SOURCE, $this->mFileProps );
if ( !$status->isGood() ) {
- $this->showError( $status->getWikiText() );
+ $resultDetails = array( 'internal' => $status->getWikiText() );
+ return self::INTERNAL_ERROR;
} else {
if ( $this->mWatchthis ) {
global $wgUser;
}
// 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 ) );
+ wfRunHooks( 'UploadComplete', array( &$this ) );
return self::SUCCESS;
}
}
* Returns an empty string if there is no warning
*/
static function getExistsWarning( $file ) {
- global $wgUser;
+ global $wgUser, $wgContLang;
// Check for uppercase extension. We allow these filenames but check if an image
// with lowercase extension exists already
$warning = '';
-
+ $align = $wgContLang->isRtl() ? 'left' : 'right';
+
if( strpos( $file->getName(), '.' ) == false ) {
$partname = $file->getName();
$rawExtension = '';
} else {
- list( $partname, $rawExtension ) = explode( '.', $file->getName(), 2 );
+ $n = strrpos( $file->getName(), '.' );
+ $rawExtension = substr( $file->getName(), $n + 1 );
+ $partname = substr( $file->getName(), 0, $n );
}
+
$sk = $wgUser->getSkin();
if ( $rawExtension != $file->getExtension() ) {
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 );
+ $dlink2 = $sk->makeImageLinkObj( $file->getTitle(), wfMsgExt( 'fileexists-thumb', 'parseinline' ),
+ $file->getName(), $align, array(), false, true );
} elseif ( !$file->allowInlineDisplay() && $file->isSafeFile() ) {
$icon = $file->iconThumb();
- $dlink2 = '<div style="float:right" id="mw-media-icon">' .
+ $dlink2 = '<div style="float:' . $align . '" id="mw-media-icon">' .
$icon->toHtml( array( 'desc-link' => true ) ) . '<br />' . $dlink . '</div>';
} else {
$dlink2 = '';
}
- $warning .= '<li>' . wfMsgExt( 'fileexists', 'parseline', $dlink ) . '</li>' . $dlink2;
+ $warning .= '<li>' . wfMsgExt( 'fileexists', array('parseinline','replaceafter'), $dlink ) . '</li>' . $dlink2;
+ } elseif( $file->getTitle()->getArticleID() ) {
+ $lnk = $sk->makeKnownLinkObj( $file->getTitle(), '', 'redirect=no' );
+ $warning .= '<li>' . wfMsgExt( 'filepageexists', array( 'parseinline', 'replaceafter' ), $lnk ) . '</li>';
} 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 );
+ $dlink2 = $sk->makeImageLinkObj( $nt_lc, wfMsgExt( 'fileexists-thumb', 'parseinline' ),
+ $nt_lc->getText(), $align, array(), false, true );
} elseif ( !$file_lc->allowInlineDisplay() && $file_lc->isSafeFile() ) {
$icon = $file_lc->iconThumb();
- $dlink2 = '<div style="float:right" id="mw-media-icon">' .
+ $dlink2 = '<div style="float:' . $align . '" id="mw-media-icon">' .
$icon->toHtml( array( 'desc-link' => true ) ) . '<br />' . $dlink . '</div>';
} else {
$dlink2 = '';
$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 );
+ wfMsgExt( 'fileexists-thumb', 'parseinline' ),
+ $nt_thb->getText(), $align, array(), false, true );
} elseif ( !$file_thb->allowInlineDisplay() && $file_thb->isSafeFile() ) {
$icon = $file_thb->iconThumb();
- $dlink2 = '<div style="float:right" id="mw-media-icon">' .
+ $dlink2 = '<div style="float:' . $align . '" id="mw-media-icon">' .
$icon->toHtml( array( 'desc-link' => true ) ) . '<br />' .
$dlink . '</div>';
} else {
}
}
- if ( $file->wasDeleted() ) {
+ 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 image exists now, however
+ # 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() );
}
$cols = intval($wgUser->getOption( 'cols' ));
- $ew = $wgUser->getOption( 'editwidth' );
- if ( $ew ) $ew = " style=\"width:100%\"";
- else $ew = '';
+
+ if( $wgUser->getOption( 'editwidth' ) ) {
+ $width = " style=\"width:100%\"";
+ } else {
+ $width = '';
+ }
if ( '' != $msg ) {
$sub = wfMsgHtml( 'uploaderror' );
"<span class='error'>{$msg}</span>\n" );
}
$wgOut->addHTML( '<div id="uploadtext">' );
- $wgOut->addWikiText( wfMsgNoTrans( 'uploadtext', $this->mDesiredDestName ) );
- $wgOut->addHTML( '</div>' );
+ $wgOut->addWikiMsg( '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' );
"onfocus='" .
"toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\");" .
"toggle_element_check(\"wpSourceTypeFile\",\"wpSourceTypeURL\")'" .
- ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . "size='40' />" .
+ ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . "size='60' />" .
wfMsgHTML( 'upload_source_file' ) . "<br/>" .
"<input type='radio' id='wpSourceTypeURL' name='wpSourceType' value='web' " .
"onchange='toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\")' />" .
"onfocus='" .
"toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\");" .
"toggle_element_check(\"wpSourceTypeURL\",\"wpSourceTypeFile\")'" .
- ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='40' DISABLED />" .
+ ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='60' DISABLED />" .
wfMsgHtml( 'upload_source_url' ) ;
} else {
$filename_form =
"<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' " .
($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") .
- "size='40' />" .
+ "size='60' />" .
"<input type='hidden' name='wpSourceType' value='file' />" ;
}
if ( $useAjaxDestCheck ) {
<tr>
<td align='$align1'><label for='wpDestFile'>{$destfilename}:</label></td>
<td align='$align2'>
- <input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='40'
+ <input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='60'
value="$encDestName" $destOnkeyup />
</td>
</tr>
<td align='$align1'><label for='wpUploadDescription'>{$summary}</label></td>
<td align='$align2'>
<textarea tabindex='3' name='wpUploadDescription' id='wpUploadDescription' rows='6'
- cols='{$cols}'{$ew}>$encComment</textarea>
+ cols='{$cols}'{$width}>$encComment</textarea>
{$this->uploadFormTextAfterSummary}
</td>
</tr>
$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>
+ value=\"$copystatus\" size='60' /></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>
+ value=\"$uploadsource\" size='60' /></td>
</tr>
<tr>
");
);
if( $reader->hasRows() ) {
$out->addHtml( '<div id="mw-upload-deleted-warn">' );
- $out->addWikiText( wfMsg( 'upload-wasdeleted' ) );
+ $out->addWikiMsg( 'upload-wasdeleted' );
$viewer = new LogViewer( $reader );
$viewer->showList( $out );
$out->addHtml( '</div>' );
dépôts / lhc / web / wiklou.git / blobdiff