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;
$url = trim( $url );
if( stripos($url, 'http://') !== 0 && stripos($url, 'ftp://') !== 0 ) {
# Only HTTP or FTP URLs
- $wgOut->errorPage( 'upload-proto-error', 'upload-proto-error-text' );
+ $wgOut->showErrorPage( 'upload-proto-error', 'upload-proto-error-text' );
return true;
}
$this->mCurlDestHandle = @fopen( $this->mTempPath, "wb" );
if( $this->mCurlDestHandle === false ) {
# Could not open temporary file to write in
- $wgOut->errorPage( 'upload-file-error', 'upload-file-error-text');
+ $wgOut->showErrorPage( 'upload-file-error', 'upload-file-error-text');
return true;
}
if( $error ) {
unlink( $dest );
if( wfEmptyMsg( "upload-curl-error$errornum", wfMsg("upload-curl-error$errornum") ) )
- $wgOut->errorPage( 'upload-misc-error', 'upload-misc-error-text' );
+ $wgOut->showErrorPage( 'upload-misc-error', 'upload-misc-error-text' );
else
- $wgOut->errorPage( "upload-curl-error$errornum", "upload-curl-error$errornum-text" );
+ $wgOut->showErrorPage( "upload-curl-error$errornum", "upload-curl-error$errornum-text" );
}
return $error;
}
$this->mainUploadForm();
} else if( 'submit' == $this->mAction || $this->mUploadClicked ) {
- $this->processUpload();
+ $this->processUpload();
} else {
$this->mainUploadForm();
}
$details = null;
$value = null;
$value = $this->internalProcessUpload( $details );
-
+
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}`" );
}
/**
return self::BEFORE_PROCESSING;
}
- /* Check for PHP error if any, requires php 4.2 or newer */
- if( $this->mCurlError == 1/*UPLOAD_ERR_INI_SIZE*/ ) {
- return self::LARGE_FILE_SERVER;
- }
-
/**
* If there was no filename or a zero size given, give up quick.
*/
return self::EMPTY_FILE;
}
+ /* Check for curl error */
+ if( $this->mCurlError ) {
+ return self::BEFORE_PROCESSING;
+ }
+
# Chop off any directories in the given filename
if( $this->mDesiredDestName ) {
$basename = $this->mDesiredDestName;
* 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() );
*/
function uploadError( $error ) {
global $wgOut;
- $wgOut->addHTML( "<h2>" . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" );
- $wgOut->addHTML( "<span class='error'>{$error}</span>\n" );
+ $wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'uploadwarning' ) . "\n" ) );
+ $wgOut->addHTML( Xml::tags( 'span', array( 'class' => 'error' ), $error ) );
}
/**
* @access private
*/
function uploadWarning( $warning ) {
- global $wgOut, $wgContLang;
+ global $wgOut;
global $wgUseCopyrightUpload;
$this->mSessionKey = $this->stashSession();
return;
}
- $wgOut->addHTML( "<h2>" . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" );
- $wgOut->addHTML( "<ul class='warning'>{$warning}</ul><br />\n" );
+ $wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'uploadwarning' ) ) . "\n" );
+ $wgOut->addHTML( Xml::tags( 'ul', array( 'class' => 'warning' ), $warning ) . "\n" );
- $save = wfMsgHtml( 'savefile' );
- $reupload = wfMsgHtml( 'reupload' );
- $iw = wfMsgWikiHtml( 'ignorewarning' );
- $reup = wfMsgWikiHtml( 'reuploaddesc' );
$titleObj = SpecialPage::getTitleFor( 'Upload' );
- $action = $titleObj->escapeLocalURL( 'action=submit' );
- $align1 = $wgContLang->isRTL() ? 'left' : 'right';
- $align2 = $wgContLang->isRTL() ? 'right' : 'left';
- if ( $wgUseCopyrightUpload )
- {
- $copyright = "
- <input type='hidden' name='wpUploadCopyStatus' value=\"" . htmlspecialchars( $this->mCopyrightStatus ) . "\" />
- <input type='hidden' name='wpUploadSource' value=\"" . htmlspecialchars( $this->mCopyrightSource ) . "\" />
- ";
+ if ( $wgUseCopyrightUpload ) {
+ $copyright = Xml::hidden( 'wpUploadCopyStatus', $this->mCopyrightStatus ) . "\n" .
+ Xml::hidden( 'wpUploadSource', $this->mCopyrightSource ) . "\n";
} else {
- $copyright = "";
- }
-
- $wgOut->addHTML( "
- <form id='uploadwarning' method='post' enctype='multipart/form-data' action='$action'>
- <input type='hidden' name='wpIgnoreWarning' value='1' />
- <input type='hidden' name='wpSessionKey' value=\"" . htmlspecialchars( $this->mSessionKey ) . "\" />
- <input type='hidden' name='wpUploadDescription' value=\"" . htmlspecialchars( $this->mComment ) . "\" />
- <input type='hidden' name='wpLicense' value=\"" . htmlspecialchars( $this->mLicense ) . "\" />
- <input type='hidden' name='wpDestFile' value=\"" . htmlspecialchars( $this->mDesiredDestName ) . "\" />
- <input type='hidden' name='wpWatchthis' value=\"" . htmlspecialchars( intval( $this->mWatchthis ) ) . "\" />
- {$copyright}
- <table border='0'>
- <tr>
- <tr>
- <td align='$align1'>
- <input tabindex='2' type='submit' name='wpUpload' value=\"$save\" />
- </td>
- <td align='$align2'>$iw</td>
- </tr>
- <tr>
- <td align='$align1'>
- <input tabindex='2' type='submit' name='wpReUpload' value=\"{$reupload}\" />
- </td>
- <td align='$align2'>$reup</td>
- </tr>
- </tr>
- </table></form>\n" );
+ $copyright = '';
+ }
+
+ $wgOut->addHTML(
+ Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ),
+ 'enctype' => 'multipart/form-data', 'id' => 'uploadwarning' ) ) . "\n" .
+ Xml::hidden( 'wpIgnoreWarning', '1' ) . "\n" .
+ Xml::hidden( 'wpSessionKey', $this->mSessionKey ) . "\n" .
+ Xml::hidden( 'wpUploadDescription', $this->mComment ) . "\n" .
+ Xml::hidden( 'wpLicense', $this->mLicense ) . "\n" .
+ Xml::hidden( 'wpDestFile', $this->mDesiredDestName ) . "\n" .
+ Xml::hidden( 'wpWatchthis', $this->mWatchthis ) . "\n" .
+ "{$copyright}<br />" .
+ Xml::submitButton( wfMsg( 'ignorewarning' ), array ( 'name' => 'wpUpload', 'id' => 'wpUpload', 'checked' => 'checked' ) ) . ' ' .
+ Xml::submitButton( wfMsg( 'reuploaddesc' ), array ( 'name' => 'wpReUpload', 'id' => 'wpReUpload' ) ) .
+ Xml::closeElement( 'form' ) . "\n"
+ );
}
/**
* @access private
*/
function mainUploadForm( $msg='' ) {
- global $wgOut, $wgUser, $wgContLang;
+ global $wgOut, $wgUser, $wgLang, $wgMaxUploadSize;
global $wgUseCopyrightUpload, $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview;
global $wgRequest, $wgAllowCopyUploads;
global $wgStylePath, $wgStyleVersion;
$adc = wfBoolToStr( $useAjaxDestCheck );
$alp = wfBoolToStr( $useAjaxLicensePreview );
+ $autofill = wfBoolToStr( $this->mDesiredDestName == '' );
$wgOut->addScript( "<script type=\"text/javascript\">
wgAjaxUploadDestCheck = {$adc};
wgAjaxLicensePreview = {$alp};
+wgUploadAutoFill = {$autofill};
</script>
<script type=\"text/javascript\" src=\"{$wgStylePath}/common/upload.js?{$wgStyleVersion}\"></script>
" );
}
$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;
+
+ $allowedExtensions = '';
+ if( $wgCheckFileExtensions ) {
+ $delim = wfMsgExt( 'comma-separator', array( 'escapenoentities' ) );
+ if( $wgStrictFileExtensions ) {
+ # Everything not permitted is banned
+ $extensionsList =
+ '<div id="mw-upload-permitted">' .
+ wfMsgWikiHtml( 'upload-permitted', implode( $wgFileExtensions, $delim ) ) .
+ "</div>\n";
+ } else {
+ # We have to list both preferred and prohibited
+ $extensionsList =
+ '<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";
+ }
+ }
+
+ # Get the maximum file size from php.ini as $wgMaxUploadSize works for uploads from URL via CURL only
+ # See http://www.php.net/manual/en/ini.core.php#ini.upload-max-filesize for possible values of upload_max_filesize
+ $val = trim( ini_get( 'upload_max_filesize' ) );
+ $last = strtoupper( ( substr( $val, -1 ) ) );
+ switch( $last ) {
+ case 'G':
+ $val2 = substr( $val, 0, -1 ) * 1024 * 1024 * 1024;
+ break;
+ case 'M':
+ $val2 = substr( $val, 0, -1 ) * 1024 * 1024;
+ break;
+ case 'K':
+ $val2 = substr( $val, 0, -1 ) * 1024;
+ break;
+ default:
+ $val2 = $val;
+ }
+ $val2 = $wgAllowCopyUploads ? min( $wgMaxUploadSize, $val2 ) : $val2;
+ $maxUploadSize = wfMsgExt( 'upload-maxfilesize', array( 'parseinline', 'escapenoentities' ), $wgLang->formatSize( $val2 ) );
- $sourcefilename = wfMsgHtml( 'sourcefilename' );
- $destfilename = wfMsgHtml( 'destfilename' );
+ $sourcefilename = wfMsgExt( 'sourcefilename', 'escapenoentities' );
+ $destfilename = wfMsgExt( 'destfilename', 'escapenoentities' );
$summary = wfMsgExt( 'fileuploadsummary', 'parseinline' );
$licenses = new Licenses();
$titleObj = SpecialPage::getTitleFor( 'Upload' );
- $action = $titleObj->escapeLocalURL();
$encDestName = htmlspecialchars( $this->mDesiredDestName );
if( $wgAllowCopyUploads && $wgUser->isAllowed( 'upload_by_url' ) ) {
$filename_form =
"<input type='radio' id='wpSourceTypeFile' name='wpSourceType' value='file' " .
- "onchange='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\")' checked />" .
+ "onchange='toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\")' checked='checked' />" .
"<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' " .
"onfocus='" .
"toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\");" .
- "toggle_element_check(\"wpSourceTypeFile\",\"wpSourceTypeURL\")'" .
- ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . "size='40' />" .
+ "toggle_element_check(\"wpSourceTypeFile\",\"wpSourceTypeURL\")' " .
+ "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\")' />" .
"<input tabindex='1' type='text' name='wpUploadFileURL' id='wpUploadFileURL' " .
"onfocus='" .
"toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\");" .
- "toggle_element_check(\"wpSourceTypeURL\",\"wpSourceTypeFile\")'" .
- ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='40' DISABLED />" .
+ "toggle_element_check(\"wpSourceTypeURL\",\"wpSourceTypeFile\")' " .
+ "onchange='fillDestFilename(\"wpUploadFileURL\")' size='60' disabled='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 ) {
}
$encComment = htmlspecialchars( $this->mComment );
- $align1 = $wgContLang->isRTL() ? 'left' : 'right';
- $align2 = $wgContLang->isRTL() ? 'right' : 'left';
-
- $wgOut->addHTML( <<<EOT
- <form id='upload' method='post' enctype='multipart/form-data' action="$action">
- <table border='0'>
- <tr>
- {$this->uploadFormTextTop}
- <td align='$align1' valign='top'><label for='wpUploadFile'>{$sourcefilename}:</label></td>
- <td align='$align2'>
- {$filename_form}
- </td>
- </tr>
- <tr>
- <td align='$align1'><label for='wpDestFile'>{$destfilename}:</label></td>
- <td align='$align2'>
- <input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='40'
- value="$encDestName" $destOnkeyup />
- </td>
- </tr>
- <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>
- {$this->uploadFormTextAfterSummary}
- </td>
- </tr>
- <tr>
-EOT
+
+ $wgOut->addHTML(
+ Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL(),
+ 'enctype' => 'multipart/form-data', 'id' => 'mw-upload-form' ) ) .
+ Xml::openElement( 'fieldset' ) .
+ Xml::element( 'legend', null, wfMsg( 'upload' ) ) .
+ Xml::openElement( 'table', array( 'border' => '0', 'id' => 'mw-upload-table' ) ) .
+ "<tr>
+ {$this->uploadFormTextTop}
+ <td class='mw-label'>
+ <label for='wpUploadFile'>{$sourcefilename}</label>
+ </td>
+ <td class='mw-input'>
+ {$filename_form}
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ {$maxUploadSize}
+ {$extensionsList}
+ </td>
+ </tr>
+ <tr>
+ <td class='mw-label'>
+ <label for='wpDestFile'>{$destfilename}</label>
+ </td>
+ <td class='mw-input'>
+ <input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='60'
+ value=\"{$encDestName}\" onchange='toggleFilenameFiller()' $destOnkeyup />
+ </td>
+ </tr>
+ <tr>
+ <td class='mw-label'>
+ <label for='wpUploadDescription'>{$summary}</label>
+ </td>
+ <td class='mw-input'>
+ <textarea tabindex='3' name='wpUploadDescription' id='wpUploadDescription' rows='6'
+ cols='{$cols}'{$width}>$encComment</textarea>
+ {$this->uploadFormTextAfterSummary}
+ </td>
+ </tr>
+ <tr>"
);
if ( $licenseshtml != '' ) {
global $wgStylePath;
$wgOut->addHTML( "
- <td align='$align1'><label for='wpLicense'>$license:</label></td>
- <td align='$align2'>
- <select name='wpLicense' id='wpLicense' tabindex='4'
- onchange='licenseSelectorCheck()'>
- <option value=''>$nolicense</option>
- $licenseshtml
- </select>
- </td>
- </tr>
- <tr>" );
+ <td class='mw-label'>
+ <label for='wpLicense'>$license</label>
+ </td>
+ <td class='mw-input'>
+ <select name='wpLicense' id='wpLicense' tabindex='4'
+ onchange='licenseSelectorCheck()'>
+ <option value=''>$nolicense</option>
+ $licenseshtml
+ </select>
+ </td>
+ </tr>
+ <tr>"
+ );
if( $useAjaxLicensePreview ) {
$wgOut->addHtml( "
- <td></td>
- <td id=\"mw-license-preview\"></td>
- </tr>
- <tr>" );
+ <td></td>
+ <td id=\"mw-license-preview\"></td>
+ </tr>
+ <tr>"
+ );
}
}
if ( $wgUseCopyrightUpload ) {
- $filestatus = wfMsgHtml ( 'filestatus' );
+ $filestatus = wfMsgExt( 'filestatus', 'escapenoentities' );
$copystatus = htmlspecialchars( $this->mCopyrightStatus );
- $filesource = wfMsgHtml ( 'filesource' );
+ $filesource = wfMsgExt( 'filesource', 'escapenoentities' );
$uploadsource = htmlspecialchars( $this->mCopyrightSource );
$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>
- </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>
- </tr>
- <tr>
- ");
+ <td class='mw-label' style='white-space: nowrap;'>
+ <label for='wpUploadCopyStatus'>$filestatus</label></td>
+ <td class='mw-input'>
+ <input tabindex='5' type='text' name='wpUploadCopyStatus' id='wpUploadCopyStatus'
+ value=\"$copystatus\" size='60' />
+ </td>
+ </tr>
+ <tr>
+ <td class='mw-label'>
+ <label for='wpUploadCopyStatus'>$filesource</label>
+ </td>
+ <td class='mw-input'>
+ <input tabindex='6' type='text' name='wpUploadSource' id='wpUploadCopyStatus'
+ value=\"$uploadsource\" size='60' />
+ </td>
+ </tr>
+ <tr>"
+ );
}
$wgOut->addHtml( "
- <td></td>
- <td>
- <input tabindex='7' type='checkbox' name='wpWatchthis' id='wpWatchthis' $watchChecked value='true' />
- <label for='wpWatchthis'>" . wfMsgHtml( 'watchthisupload' ) . "</label>
- <input tabindex='8' type='checkbox' name='wpIgnoreWarning' id='wpIgnoreWarning' value='true' $warningChecked/>
- <label for='wpIgnoreWarning'>" . wfMsgHtml( 'ignorewarnings' ) . "</label>
- </td>
- </tr>
- $warningRow
- <tr>
- <td></td>
- <td align='$align2'><input tabindex='9' type='submit' name='wpUpload' value=\"{$ulb}\"" . $wgUser->getSkin()->tooltipAndAccesskey( 'upload' ) . " /></td>
- </tr>
- <tr>
- <td></td>
- <td align='$align2'>
- " );
+ <td></td>
+ <td>
+ <input tabindex='7' type='checkbox' name='wpWatchthis' id='wpWatchthis' $watchChecked value='true' />
+ <label for='wpWatchthis'>" . wfMsgHtml( 'watchthisupload' ) . "</label>
+ <input tabindex='8' type='checkbox' name='wpIgnoreWarning' id='wpIgnoreWarning' value='true' $warningChecked/>
+ <label for='wpIgnoreWarning'>" . wfMsgHtml( 'ignorewarnings' ) . "</label>
+ </td>
+ </tr>
+ $warningRow
+ <tr>
+ <td></td>
+ <td class='mw-input'>
+ <input tabindex='9' type='submit' name='wpUpload' value=\"{$ulb}\"" . $wgUser->getSkin()->tooltipAndAccesskey( 'upload' ) . " />
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class='mw-input'>"
+ );
$wgOut->addWikiText( wfMsgForContent( 'edittools' ) );
$wgOut->addHTML( "
- </td>
- </tr>
-
- </table>
- <input type='hidden' name='wpDestFileWarningAck' id='wpDestFileWarningAck' value=''/>
- </form>" );
+ </td>
+ </tr>" .
+ Xml::closeElement( 'table' ) .
+ Xml::hidden( 'wpDestFileWarningAck', '', array( 'id' => 'wpDestFileWarningAck' ) ) .
+ Xml::closeElement( 'fieldset' ) .
+ Xml::closeElement( 'form' )
+ );
+ $uploadfooter = wfMsgNoTrans( 'uploadfooter' );
+ if( $uploadfooter != '-' && !wfEmptyMsg( 'uploadfooter', $uploadfooter ) ){
+ $wgOut->addWikiText( Xml::tags( 'div',
+ array( 'id' => 'mw-upload-footer-message' ), $uploadfooter ) );
+ }
}
/* -------------------------------------------------------------- */
);
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