X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FFileDeleteForm.php;h=d86c8d82f36ab126242256c3848767e879ef2b86;hb=2a642ad44a223fe76f61cd6cca822edabb497f71;hp=3cb358fc981f0ce7dc561e7604428780f6e02665;hpb=067f145b158678f9b3d193cd3a3c88bc3b751979;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index 3cb358fc98..d86c8d82f3 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -3,151 +3,254 @@ /** * File deletion user interface * - * @addtogroup Media + * @ingroup Media * @author Rob Church */ class FileDeleteForm { + /** + * @var Title + */ private $title = null; + + /** + * @var File + */ private $file = null; + /** + * @var File + */ private $oldfile = null; private $oldimage = ''; - + /** * Constructor * - * @param File $file File we're deleting + * @param $file File object we're deleting */ public function __construct( $file ) { $this->title = $file->getTitle(); $this->file = $file; } - + /** * Fulfil the request; shows the form or deletes the file, * pending authentication, confirmation, etc. */ public function execute() { - global $wgOut, $wgRequest, $wgUser; - $this->setHeaders(); + global $wgOut, $wgRequest, $wgUser, $wgUploadMaintenance; - 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(); - return; + $permissionErrors = $this->title->getUserPermissionsErrors( 'delete', $wgUser ); + if ( count( $permissionErrors ) ) { + throw new PermissionsError( 'delete', $permissionErrors ); + } + + if ( wfReadOnly() ) { + throw new ReadOnlyError; + } + + if ( $wgUploadMaintenance ) { + throw new ErrorPageError( 'filedelete-maintenance-title', 'filedelete-maintenance' ); } - + + $this->setHeaders(); + $this->oldimage = $wgRequest->getText( 'oldimage', false ); $token = $wgRequest->getText( 'wpEditToken' ); - if( $this->oldimage && !$this->isValidOldSpec() ) { - $wgOut->showUnexpectedValueError( 'oldimage', htmlspecialchars( $this->oldimage ) ); - return; - } - if( $this->oldimage ) + # Flag to hide all contents of the archived revisions + $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed('suppressrevision'); + + if( $this->oldimage ) { $this->oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage ); - - if( !$this->haveDeletableFile() ) { - $wgOut->addHtml( $this->prepareMessage( 'filedelete-nofile' ) ); + } + + if( !self::haveDeletableFile($this->file, $this->oldfile, $this->oldimage) ) { + $wgOut->addHTML( $this->prepareMessage( 'filedelete-nofile' ) ); $wgOut->addReturnTo( $this->title ); return; } - + // Perform the deletion if appropriate if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $token, $this->oldimage ) ) { - $this->DeleteReasonList = $wgRequest->getText( 'wpDeleteReasonList' ); - $this->DeleteReason = $wgRequest->getText( 'wpReason' ); - $reason = $this->DeleteReasonList; - if ( $reason != 'other' && $this->DeleteReason != '') { + $deleteReasonList = $wgRequest->getText( 'wpDeleteReasonList' ); + $deleteReason = $wgRequest->getText( 'wpReason' ); + + if ( $deleteReasonList == 'other' ) { + $reason = $deleteReason; + } elseif ( $deleteReason != '' ) { // Entry from drop down menu + additional comment - $reason .= ': ' . $this->DeleteReason; - } 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 = wfMsgForContent( 'deletedrevision', $this->oldimage ); - if( trim( $reason ) != '' ) - $logComment .= ": {$reason}"; - $log->addEntry( 'delete', $this->title, $logComment ); - } + $reason = $deleteReasonList . wfMsgForContent( 'colon-separator' ) . $deleteReason; } else { - $status = $this->file->delete( $reason ); - if( $status->ok ) { - // Need to delete the associated article - $article = new Article( $this->title ); - $article->doDeleteArticle( $reason ); - } + $reason = $deleteReasonList; + } + + $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress, $wgUser ); + + if( !$status->isGood() ) { + $wgOut->addHTML( '

' . $this->prepareMessage( 'filedeleteerror-short' ) . "

\n" ); + $wgOut->addWikiText( '
' . $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) . '
' ); } - if( !$status->isGood() ) - $wgOut->addWikiText( $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) ); if( $status->ok ) { - $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) ); - $wgOut->addHtml( $this->prepareMessage( 'filedelete-success' ) ); + $wgOut->setPageTitle( wfMessage( 'actioncomplete' ) ); + $wgOut->addHTML( $this->prepareMessage( 'filedelete-success' ) ); // Return to the main page if we just deleted all versions of the // file, otherwise go back to the description page $wgOut->addReturnTo( $this->oldimage ? $this->title : Title::newMainPage() ); + + if ( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) { + WatchAction::doWatch( $this->title, $wgUser ); + } elseif ( $this->title->userIsWatching() ) { + WatchAction::doUnwatch( $this->title, $wgUser ); + } } return; } - + $this->showForm(); $this->showLogEntries(); } + /** + * Really delete the file + * + * @param $title Title object + * @param File $file: file object + * @param $oldimage String: archive name + * @param $reason String: reason of the deletion + * @param $suppress Boolean: whether to mark all deleted versions as restricted + * @param $user User object performing the request + * @return bool|Status + */ + public static function doDelete( &$title, &$file, &$oldimage, $reason, $suppress, User $user = null ) { + if ( $user === null ) { + global $wgUser; + $user = $wgUser; + } + + if( $oldimage ) { + $page = null; + $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 .= wfMsgForContent( 'colon-separator' ) . $reason; + } + $log->addEntry( 'delete', $title, $logComment ); + } + } else { + $status = Status::newFatal( 'cannotdelete', + wfEscapeWikiText( $title->getPrefixedText() ) + ); + $page = WikiPage::factory( $title ); + $dbw = wfGetDB( DB_MASTER ); + try { + // delete the associated article first + $error = ''; + if ( $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error, $user ) >= WikiPage::DELETE_SUCCESS ) { + $status = $file->delete( $reason, $suppress ); + if( $status->isOK() ) { + $dbw->commit( __METHOD__ ); + } else { + $dbw->rollback( __METHOD__ ); + } + } + } catch ( MWException $e ) { + // rollback before returning to prevent UI from displaying incorrect "View or restore N deleted edits?" + $dbw->rollback( __METHOD__ ); + throw $e; + } + } + + if ( $status->isOK() ) { + wfRunHooks( 'FileDeleteComplete', array( &$file, &$oldimage, &$page, &$user, &$reason ) ); + } + + return $status; + } + /** * Show the confirmation form */ private function showForm() { - global $wgOut, $wgUser, $wgRequest, $wgContLang; - $align = $wgContLang->isRtl() ? 'left' : 'right'; + global $wgOut, $wgUser, $wgRequest; + + if( $wgUser->isAllowed( 'suppressrevision' ) ) { + $suppress = " + + " . + Xml::checkLabel( wfMsg( 'revdelete-suppress' ), + 'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '3' ) ) . + " + "; + } else { + $suppress = ''; + } - $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction() ) ) . + $checkWatch = $wgUser->getBoolOption( 'watchdeletion' ) || $this->title->userIsWatching(); + $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction(), + 'id' => 'mw-img-deleteconfirm' ) ) . Xml::openElement( 'fieldset' ) . Xml::element( 'legend', null, wfMsg( 'filedelete-legend' ) ) . - Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) . + Html::hidden( 'wpEditToken', $wgUser->getEditToken( $this->oldimage ) ) . $this->prepareMessage( 'filedelete-intro' ) . - Xml::openElement( 'table' ) . + Xml::openElement( 'table', array( 'id' => 'mw-img-deleteconfirm-table' ) ) . " - " . + " . Xml::label( wfMsg( 'filedelete-comment' ), 'wpDeleteReasonList' ) . " - " . + " . Xml::listDropDown( 'wpDeleteReasonList', - wfMsgForContent( 'filedelete-reason-dropdown' ), + wfMsgForContent( 'filedelete-reason-dropdown' ), wfMsgForContent( 'filedelete-reason-otherlist' ), '', 'wpReasonDropDown', 1 ) . " - " . + " . Xml::label( wfMsg( 'filedelete-otherreason' ), 'wpReason' ) . " - " . - Xml::input( 'wpReason', 60, $wgRequest->getText( 'wpReason' ), array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ) ) . + " . + Xml::input( 'wpReason', 60, $wgRequest->getText( 'wpReason' ), + array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ) ) . " + {$suppress}"; + if( $wgUser->isLoggedIn() ) { + $form .= " + + + " . + Xml::checkLabel( wfMsg( 'watchthis' ), + 'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) . + " + "; + } + $form .= " - " . - Xml::submitButton( wfMsg( 'filedelete-submit' ), array( 'name' => 'mw-filedelete-submit', 'id' => 'mw-filedelete-submit', 'tabindex' => '3' ) ) . + " . + Xml::submitButton( wfMsg( 'filedelete-submit' ), + array( 'name' => 'mw-filedelete-submit', 'id' => 'mw-filedelete-submit', 'tabindex' => '4' ) ) . " " . Xml::closeElement( 'table' ) . Xml::closeElement( 'fieldset' ) . Xml::closeElement( 'form' ); - $wgOut->addHtml( $form ); + if ( $wgUser->isAllowed( 'editinterface' ) ) { + $title = Title::makeTitle( NS_MEDIAWIKI, 'Filedelete-reason-dropdown' ); + $link = Linker::link( + $title, + wfMsgHtml( 'filedelete-edit-reasonlist' ), + array(), + array( 'action' => 'edit' ) + ); + $form .= '

' . $link . '

'; + } + + $wgOut->addHTML( $form ); } /** @@ -155,82 +258,74 @@ class FileDeleteForm { */ private function showLogEntries() { global $wgOut; - $wgOut->addHtml( '

' . htmlspecialchars( LogPage::logName( 'delete' ) ) . "

\n" ); - $reader = new LogViewer( - new LogReader( - new FauxRequest( - array( - 'type' => 'delete', - 'page' => $this->title->getPrefixedText(), - ) - ) - ) - ); - $reader->showList( $wgOut ); + $wgOut->addHTML( '

' . htmlspecialchars( LogPage::logName( 'delete' ) ) . "

\n" ); + LogEventsList::showLogExtract( $wgOut, 'delete', $this->title ); } - + /** * Prepare a message referring to the file being deleted, * showing an appropriate message depending upon whether * it's a current file or an old version * - * @param string $message Message base - * @return string + * @param $message String: message base + * @return String */ private function prepareMessage( $message ) { - global $wgLang, $wgServer; + global $wgLang; if( $this->oldimage ) { return wfMsgExt( "{$message}-old", # To ensure grep will find them: 'filedelete-intro-old', 'filedelete-nofile-old', 'filedelete-success-old' 'parse', - $this->title->getText(), + wfEscapeWikiText( $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 ), PROTO_CURRENT ) ); } else { return wfMsgExt( $message, 'parse', - $this->title->getText() + wfEscapeWikiText( $this->title->getText() ) ); } } - + /** * Set headers, titles and other bits */ private function setHeaders() { - global $wgOut, $wgUser; - $wgOut->setPageTitle( wfMsg( 'filedelete', $this->title->getText() ) ); + global $wgOut; + $wgOut->setPageTitle( wfMessage( 'filedelete', $this->title->getText() ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); - $wgOut->setSubtitle( wfMsg( 'filedelete-backlink', $wgUser->getSkin()->makeKnownLinkObj( $this->title ) ) ); + $wgOut->addBacklinkSubtitle( $this->title ); } - + /** * Is the provided `oldimage` value valid? * * @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; } - + /** * Could we delete the file specified? If an `oldimage` * value was provided, does it correspond to an * existing, local, old version of this file? * + * @param $file File + * @param $oldfile File + * @param $oldimage File * @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(); } - + /** * Prepare the form action * @@ -238,12 +333,14 @@ class FileDeleteForm { */ private function getAction() { $q = array(); - $q[] = 'action=delete'; + $q['action'] = 'delete'; + if( $this->oldimage ) - $q[] = 'oldimage=' . urlencode( $this->oldimage ); - return $this->title->getLocalUrl( implode( '&', $q ) ); + $q['oldimage'] = $this->oldimage; + + return $this->title->getLocalUrl( $q ); } - + /** * Extract the timestamp of the old version * @@ -252,5 +349,4 @@ class FileDeleteForm { private function getTimestamp() { return $this->oldfile->getTimestamp(); } - }