X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FFileDeleteForm.php;h=be11821c2125718b33bd86d04fc8181fae8ed47f;hb=b378be4dd64744cbaff7fcf2c7a5188095b294cf;hp=2d4d22a8d59125e2964fc0df72a3e50b64ef7c9a;hpb=65d74391fd69b34541d846ee867d3714d8a13bcd;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index 2d4d22a8d5..be11821c21 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -3,139 +3,264 @@ /** * File deletion user interface * - * @addtogroup Media + * @ingroup Media * @author Rob Church */ class FileDeleteForm { private $title = null; private $file = null; + + 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, $wgLang, $wgServer; + global $wgOut, $wgRequest, $wgUser; $this->setHeaders(); if( wfReadOnly() ) { $wgOut->readOnlyPage(); return; - } elseif( !$wgUser->isLoggedIn() ) { - $wgOut->showErrorPage( 'uploadnologin', 'uploadnologintext' ); - return; - } elseif( !$wgUser->isAllowed( 'delete' ) ) { - $wgOut->permissionError( '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('suppressrevision'); + + if( $this->oldimage && !self::isValidOldSpec($this->oldimage) ) { $wgOut->showUnexpectedValueError( 'oldimage', htmlspecialchars( $this->oldimage ) ); return; } - - if( !$this->haveDeletableFile() ) { - $wgOut->addHtml( $this->prepareMessage( 'filedelete-nofile' ) ); - $wgOut->addReturnTo( $this->title ); - return; - } - - // Don't allow accidental deletion of a single file revision - // if this is, in fact, the current revision; things might break - if( $this->oldimage && $this->file->getTimestamp() == $this->getTimestamp() ) { - $wgOut->addHtml( wfMsgExt( 'filedelete-iscurrent', 'parse' ) ); + if( $this->oldimage ) + $this->oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage ); + + 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 ) ) { - $comment = $wgRequest->getText( 'wpComment' ); - if( $this->oldimage ) { - $status = $this->file->deleteOld( $this->oldimage, $comment ); - if( $status->ok ) { - // Need to do a log item - $log = new LogPage( 'delete' ); - $log->addEntry( 'delete', $this->title, wfMsg( 'deletedrevision' , $this->oldimage ) ); - } - } else { - $status = $this->file->delete( $comment ); - if( $status->ok ) { - // Need to delete the associated article - $article = new Article( $this->title ); - $article->doDeleteArticle( $comment ); - } + $this->DeleteReasonList = $wgRequest->getText( 'wpDeleteReasonList' ); + $this->DeleteReason = $wgRequest->getText( 'wpReason' ); + $reason = $this->DeleteReasonList; + if ( $reason != 'other' && $this->DeleteReason != '') { + // Entry from drop down menu + additional comment + $reason .= wfMsgForContent( 'colon-separator' ) . $this->DeleteReason; + } elseif ( $reason == 'other' ) { + $reason = $this->DeleteReason; } + + $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 ) { - $wgOut->addHtml( $this->prepareMessage( 'filedelete-success' ) ); + $wgOut->setPagetitle( wfMsg( '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() ); } return; } - - // Show the form - $this->showForm(); + + $this->showForm(); + $this->showLogEntries(); } - + + /** + * Really delete the file + * + * @param $title Title object + * @param $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 + */ + public static function doDelete( &$title, &$file, &$oldimage, $reason, $suppress ) { + global $wgUser; + $article = null; + $status = Status::newFatal( 'error' ); + + 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 .= wfMsgForContent( 'colon-separator' ) . $reason; + $log->addEntry( 'delete', $title, $logComment ); + } + } else { + $id = $title->getArticleID( GAID_FOR_UPDATE ); + $article = new Article( $title ); + $error = ''; + $dbw = wfGetDB( DB_MASTER ); + try { + if( wfRunHooks( 'ArticleDelete', array( &$article, &$wgUser, &$reason, &$error ) ) ) { + // delete the associated article first + if( $article->doDeleteArticle( $reason, $suppress, $id, false ) ) { + global $wgRequest; + if( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) { + $article->doWatch(); + } elseif( $title->userIsWatching() ) { + $article->doUnwatch(); + } + $status = $file->delete( $reason, $suppress ); + if( $status->ok ) { + $dbw->commit(); + wfRunHooks( 'ArticleDeleteComplete', array( &$article, &$wgUser, $reason, $id ) ); + } else { + $dbw->rollback(); + } + } + } + } catch ( MWException $e ) { + // rollback before returning to prevent UI from displaying incorrect "View or restore N deleted edits?" + $dbw->rollback(); + throw $e; + } + } + if( $status->isGood() ) + wfRunHooks('FileDeleteComplete', array( &$file, &$oldimage, &$article, &$wgUser, &$reason)); + + return $status; + } + /** * Show the confirmation form */ private function showForm() { - global $wgOut, $wgUser, $wgRequest, $wgLang, $wgContLang, $wgServer; - - $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction() ) ); - $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ); - $form .= '
' . wfMsgHtml( 'filedelete-legend' ) . ''; - $form .= $this->prepareMessage( 'filedelete-intro' ); - - $form .= '

' . Xml::inputLabel( wfMsg( 'filedelete-comment' ), 'wpComment', 'wpComment', 60 ) . '

'; - $form .= '

' . Xml::submitButton( wfMsg( 'filedelete-submit' ) ) . '

'; - $form .= '
'; - $form .= ''; - - $wgOut->addHtml( $form ); + global $wgOut, $wgUser, $wgRequest; + + if( $wgUser->isAllowed( 'suppressrevision' ) ) { + $suppress = " + + " . + Xml::checkLabel( wfMsg( 'revdelete-suppress' ), + 'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '3' ) ) . + " + "; + } else { + $suppress = ''; + } + + $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 ) ) . + $this->prepareMessage( 'filedelete-intro' ) . + 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-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' ) ) . + " + + {$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' => '4' ) ) . + " + " . + Xml::closeElement( 'table' ) . + Xml::closeElement( 'fieldset' ) . + Xml::closeElement( 'form' ); + + if ( $wgUser->isAllowed( 'editinterface' ) ) { + $skin = $wgUser->getSkin(); + $title = Title::makeTitle( NS_MEDIAWIKI, 'Filedelete-reason-dropdown' ); + $link = $skin->link( + $title, + wfMsgHtml( 'filedelete-edit-reasonlist' ), + array(), + array( 'action' => 'edit' ) + ); + $form .= '

' . $link . '

'; + } + + $wgOut->addHTML( $form ); + } + + /** + * Show deletion log fragments pertaining to the current file + */ + private function showLogEntries() { + global $wgOut; + $wgOut->addHTML( '

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

\n" ); + LogEventsList::showLogExtract( $wgOut, 'delete', $this->title->getPrefixedText() ); } - + /** * 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 ) { + $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() ), - $wgLang->time( $this->getTimestamp() ), - $wgServer . $this->file->getArchiveUrl( $this->oldimage ) - ); + $wgLang->date( $this->getTimestamp(), true ), + $wgLang->time( $this->getTimestamp(), true ), + wfExpandUrl( $this->file->getArchiveUrl( $this->oldimage ) ) ); } else { return wfMsgExt( $message, @@ -144,27 +269,37 @@ class FileDeleteForm { ); } } - + /** * Set headers, titles and other bits */ private function setHeaders() { - global $wgOut; + global $wgOut, $wgUser; $wgOut->setPageTitle( wfMsg( 'filedelete', $this->title->getText() ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); + $wgOut->setSubtitle( wfMsg( + 'filedelete-backlink', + $wgUser->getSkin()->link( + $this->title, + null, + array(), + array(), + array( 'known', 'noclasses' ) + ) + ) ); } - + /** * 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 @@ -172,11 +307,12 @@ class FileDeleteForm { * * @return bool */ - private function haveDeletableFile() { - $file = wfFindFile( $this->title, $this->oldimage ); - return $file && $file->exists() && $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 * @@ -184,19 +320,20 @@ 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 * * @return string */ private function getTimestamp() { - return substr( $this->oldimage, 0, 14 ); + return $this->oldfile->getTimestamp(); } - -} \ No newline at end of file +}