if( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
- } elseif( !$wgUser->isLoggedIn() ) {
- $wgOut->showErrorPage( 'uploadnologin', 'uploadnologintext' );
- return;
- } elseif( !$wgUser->isAllowed( 'delete' ) ) {
- $wgOut->permissionRequired( 'delete' );
- return;
- } elseif( $wgUser->isBlocked() ) {
- $wgOut->blockedPage();
+ }
+ $permission_errors = $this->title->getUserPermissionsErrors('delete', $wgUser);
+ if (count($permission_errors)>0) {
+ $wgOut->showPermissionsErrorPage( $permission_errors );
return;
}
$this->oldimage = $wgRequest->getText( 'oldimage', false );
$token = $wgRequest->getText( 'wpEditToken' );
- if( $this->oldimage && !$this->isValidOldSpec() ) {
+ # Flag to hide all contents of the archived revisions
+ $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed('deleterevision');
+
+ if( $this->oldimage && !self::isValidOldSpec($this->oldimage) ) {
$wgOut->showUnexpectedValueError( 'oldimage', htmlspecialchars( $this->oldimage ) );
return;
}
if( $this->oldimage )
$this->oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage );
- if( !$this->haveDeletableFile() ) {
+ if( !self::haveDeletableFile($this->file, $this->oldfile, $this->oldimage) ) {
$wgOut->addHtml( $this->prepareMessage( 'filedelete-nofile' ) );
$wgOut->addReturnTo( $this->title );
return;
} elseif ( $reason == 'other' ) {
$reason = $this->DeleteReason;
}
- if( $this->oldimage ) {
- $status = $this->file->deleteOld( $this->oldimage, $reason );
- if( $status->ok ) {
- // Need to do a log item
- $log = new LogPage( 'delete' );
- $logComment = wfMsg( 'deletedrevision', $this->oldimage );
- if( trim( $reason ) != '' )
- $logComment .= ": {$reason}";
- $log->addEntry( 'delete', $this->title, $logComment );
- }
- } else {
- $status = $this->file->delete( $reason );
- if( $status->ok ) {
- // Need to delete the associated article
- $article = new Article( $this->title );
- $article->doDeleteArticle( $reason );
- }
- }
+
+ $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress );
+
if( !$status->isGood() )
$wgOut->addWikiText( $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) );
if( $status->ok ) {
$this->showForm();
$this->showLogEntries();
}
+
+ public static function doDelete( &$title, &$file, &$oldimage, $reason, $suppress ) {
+ $article = null;
+ if( $oldimage ) {
+ $status = $file->deleteOld( $oldimage, $reason, $suppress );
+ if( $status->ok ) {
+ // Need to do a log item
+ $log = new LogPage( 'delete' );
+ $logComment = wfMsgForContent( 'deletedrevision', $oldimage );
+ if( trim( $reason ) != '' )
+ $logComment .= ": {$reason}";
+ $log->addEntry( 'delete', $title, $logComment );
+ }
+ } else {
+ $status = $file->delete( $reason, $suppress );
+ if( $status->ok ) {
+ // Need to delete the associated article
+ $article = new Article( $title );
+ if( wfRunHooks('ArticleDelete', array(&$article, &$wgUser, &$reason)) ) {
+ if( $article->doDeleteArticle( $reason, $suppress ) )
+ wfRunHooks('ArticleDeleteComplete', array(&$article, &$wgUser, $reason));
+ }
+ }
+ }
+ if( $status->isGood() ) wfRunHooks('FileDeleteComplete', array(
+ &$file, &$oldimage, &$article, &$wgUser, &$reason));
+
+ return $status;
+ }
/**
* Show the confirmation form
*/
private function showForm() {
- global $wgOut, $wgUser, $wgRequest;
-
- $mDeletereasonother = Xml::label( wfMsg( 'filedelete-otherreason' ), 'wpReason' );
- $mDeletereasonotherlist = wfMsgHtml( 'filedelete-reason-otherlist' );
- $scDeleteReasonList = wfMsgForContent( 'filedelete-reason-dropdown' );
- $mDeleteReasonList = '';
- $delcom = Xml::label( wfMsg( 'filedelete-comment' ), 'wpDeleteReasonList' );
- if ( $scDeleteReasonList != '' && $scDeleteReasonList != '-' ) {
- $deleteReasonList = "<option value=\"other\">$mDeletereasonotherlist</option>";
- $optgroup = "";
- foreach ( explode( "\n", $scDeleteReasonList ) as $option) {
- $value = trim( htmlspecialchars($option) );
- if ( $value == '' ) {
- continue;
- } elseif ( substr( $value, 0, 1) == '*' && substr( $value, 1, 1) != '*' ) {
- // A new group is starting ...
- $value = trim( substr( $value, 1 ) );
- $deleteReasonList .= "$optgroup<optgroup label=\"$value\">";
- $optgroup = "</optgroup>";
- } elseif ( substr( $value, 0, 2) == '**' ) {
- // groupmember
- $selected = "";
- $value = trim( substr( $value, 2 ) );
- if ( $mDeleteReasonList === $value)
- $selected = ' selected="selected"';
- $deleteReasonList .= "<option value=\"$value\"$selected>$value</option>";
- } else {
- // groupless delete reason
- $selected = "";
- if ( $this->DeleteReasonList === $value)
- $selected = ' selected="selected"';
- $deleteReasonList .= "$optgroup<option value=\"$value\"$selected>$value</option>";
- $optgroup = "";
- }
- }
- $deleteReasonList .= $optgroup;
+ global $wgOut, $wgUser, $wgRequest, $wgContLang;
+ $align = $wgContLang->isRtl() ? 'left' : 'right';
+
+ if( $wgUser->isAllowed( 'deleterevision' ) ) {
+ $suppress = "<tr id=\"wpDeleteSuppressRow\" name=\"wpDeleteSuppressRow\"><td></td><td>";
+ $suppress .= Xml::checkLabel( wfMsg( 'revdelete-suppress' ), 'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '2' ) );
+ $suppress .= "</td></tr>";
+ } else {
+ $suppress = '';
}
- $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction() ) );
- $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) );
- $form .= '<fieldset><legend>' . wfMsgHtml( 'filedelete-legend' ) . '</legend>';
- $form .= '<table><tr>';
- $form .= $this->prepareMessage( 'filedelete-intro' );
- $form .= "<td align=\"right\"> $delcom </td><td align=\"left\">";
- $form .= "<select tabindex='2' id='wpDeleteReasonList' name=\"wpDeleteReasonList\">
- $deleteReasonList
-</select>";
- $form .= "</tr><tr><td align=\"right\"> $mDeletereasonother </td><td align=\"left\">";
- $form .= "<input type='text' maxlength='255' size='60' name='wpReason' id='wpReason' ";
- $form .= "value=\"". htmlspecialchars( $wgRequest->getText( 'wpReason' ) ) ."\" tabindex=\"1\" />";
- $form .= '</td></tr><tr><td colspan=2>';
- $form .= '<p>' . Xml::submitButton( wfMsg( 'filedelete-submit' ), array( 'name' => 'mw-filedelete-submit', 'id' => 'mw-filedelete-submit' ) ) . '</p>';
- $form .= '</tr></table>';
- $form .= '</fieldset>';
- $form .= '</form>';
+ $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction() ) ) .
+ Xml::openElement( 'fieldset' ) .
+ Xml::element( 'legend', null, wfMsg( 'filedelete-legend' ) ) .
+ Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) .
+ $this->prepareMessage( 'filedelete-intro' ) .
+ Xml::openElement( 'table' ) .
+ "<tr>
+ <td align='$align'>" .
+ Xml::label( wfMsg( 'filedelete-comment' ), 'wpDeleteReasonList' ) .
+ "</td>
+ <td>" .
+ Xml::listDropDown( 'wpDeleteReasonList',
+ wfMsgForContent( 'filedelete-reason-dropdown' ),
+ wfMsgForContent( 'filedelete-reason-otherlist' ), '', 'wpReasonDropDown', 1 ) .
+ "</td>
+ </tr>
+ <tr>
+ <td align='$align'>" .
+ Xml::label( wfMsg( 'filedelete-otherreason' ), 'wpReason' ) .
+ "</td>
+ <td>" .
+ Xml::input( 'wpReason', 60, $wgRequest->getText( 'wpReason' ), array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ) ) .
+ "</td>
+ </tr>
+ {$suppress}
+ <tr>
+ <td></td>
+ <td>" .
+ Xml::submitButton( wfMsg( 'filedelete-submit' ), array( 'name' => 'mw-filedelete-submit', 'id' => 'mw-filedelete-submit', 'tabindex' => '3' ) ) .
+ "</td>
+ </tr>" .
+ Xml::closeElement( 'table' ) .
+ Xml::closeElement( 'fieldset' ) .
+ Xml::closeElement( 'form' );
+
+ if ( $wgUser->isAllowed( 'editinterface' ) ) {
+ $skin = $wgUser->getSkin();
+ $link = $skin->makeLink ( 'MediaWiki:Filedelete-reason-dropdown', wfMsgHtml( 'filedelete-edit-reasonlist' ) );
+ $form .= '<p class="mw-filedelete-editreasons">' . $link . '</p>';
+ }
$wgOut->addHtml( $form );
}
private function showLogEntries() {
global $wgOut;
$wgOut->addHtml( '<h2>' . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
- $reader = new LogViewer(
- new LogReader(
- new FauxRequest(
- array(
- 'type' => 'delete',
- 'page' => $this->title->getPrefixedText(),
- )
- )
- )
- );
- $reader->showList( $wgOut );
+ LogEventsList::showLogExtract( $wgOut, 'delete', $this->title->getPrefixedText() );
}
/**
* @return string
*/
private function prepareMessage( $message ) {
- global $wgLang, $wgServer;
+ global $wgLang;
if( $this->oldimage ) {
+ $url = $this->file->getArchiveUrl( $this->oldimage );
return wfMsgExt(
- "{$message}-old",
+ "{$message}-old", # To ensure grep will find them: 'filedelete-intro-old', 'filedelete-nofile-old', 'filedelete-success-old'
'parse',
$this->title->getText(),
$wgLang->date( $this->getTimestamp(), true ),
$wgLang->time( $this->getTimestamp(), true ),
- $wgServer . $this->file->getArchiveUrl( $this->oldimage )
- );
+ wfExpandUrl( $this->file->getArchiveUrl( $this->oldimage ) ) );
} else {
return wfMsgExt(
$message,
*
* @return bool
*/
- private function isValidOldSpec() {
- return strlen( $this->oldimage ) >= 16
- && strpos( $this->oldimage, '/' ) === false
- && strpos( $this->oldimage, '\\' ) === false;
+ public static function isValidOldSpec($oldimage) {
+ return strlen( $oldimage ) >= 16
+ && strpos( $oldimage, '/' ) === false
+ && strpos( $oldimage, '\\' ) === false;
}
/**
*
* @return bool
*/
- private function haveDeletableFile() {
- return $this->oldimage
- ? $this->oldfile && $this->oldfile->exists() && $this->oldfile->isLocal()
- : $this->file && $this->file->exists() && $this->file->isLocal();
+ public static function haveDeletableFile(&$file, &$oldfile, $oldimage) {
+ return $oldimage
+ ? $oldfile && $oldfile->exists() && $oldfile->isLocal()
+ : $file && $file->exists() && $file->isLocal();
}
/**
return $this->oldfile->getTimestamp();
}
-}
\ No newline at end of file
+}
dépôts / lhc / web / wiklou.git / blobdiff