X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FFileDeleteForm.php;h=e2c95c2e0bd65d683bdc96f5f4fe492eb685cd67;hb=bd756e66843bd1f346ebfed21d11996fde92ba62;hp=757affbb2b8ba9c19dbd0f471d12165861cd1a10;hpb=29248e7a4f866f9cb4f7925b8b6b9120c0b2d422;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index 757affbb2b..e2c95c2e0b 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -3,7 +3,7 @@ /** * File deletion user interface * - * @addtogroup Media + * @ingroup Media * @author Rob Church */ class FileDeleteForm { @@ -13,17 +13,17 @@ class FileDeleteForm { 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. @@ -35,32 +35,31 @@ class FileDeleteForm { 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('suppressrevision'); + + 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() ) { - $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' ); @@ -68,91 +67,171 @@ class FileDeleteForm { $reason = $this->DeleteReasonList; if ( $reason != 'other' && $this->DeleteReason != '') { // Entry from drop down menu + additional comment - $reason .= ': ' . $this->DeleteReason; + $reason .= wfMsgForContent( 'colon-separator' ) . $this->DeleteReason; } elseif ( $reason == 'other' ) { $reason = $this->DeleteReason; } - - $article = null; - 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 ); - } - } else { - $status = $this->file->delete( $reason ); - if( $status->ok ) { - // Need to delete the associated article - $article = new Article( $this->title ); - $article->doDeleteArticle( $reason ); - } - } - if( $status->isGood() ) wfRunHooks('FileDeleteComplete', array( - &$this->file, &$this->oldimage, &$article, &$wgUser, &$reason)); - - if( !$status->isGood() ) + + $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress ); + + if( !$status->isGood() ) { + $wgOut->addHTML( '

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

\n" ); + $wgOut->addHTML( '' ); $wgOut->addWikiText( $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) ); + $wgOut->addHTML( '' ); + } if( $status->ok ) { $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) ); - $wgOut->addHtml( $this->prepareMessage( 'filedelete-success' ) ); + $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; } - + $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( Title::GAID_FOR_UPDATE ); + $article = new Article( $title ); + $dbw = wfGetDB( DB_MASTER ); + try { + // delete the associated article first + if( $article->doDeleteArticle( $reason, $suppress, $id, false ) ) { + global $wgRequest; + if ( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) { + WatchAction::doWatch( $title, $wgUser ); + } elseif ( $title->userIsWatching() ) { + WatchAction::doUnwatch( $title, $wgUser ); + } + $status = $file->delete( $reason, $suppress ); + if( $status->ok ) { + $dbw->commit(); + } 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, $wgContLang; - $align = $wgContLang->isRtl() ? 'left' : 'right'; + global $wgOut, $wgUser, $wgRequest; - $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction() ) ) . + 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 ) ) . + Html::hidden( 'wpEditToken', $wgUser->editToken( $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' ) ) { + $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 ); } /** @@ -160,48 +239,37 @@ 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->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; if( $this->oldimage ) { - $url = $this->file->getArchiveUrl( $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 ), - wfExpandUrl( $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 */ @@ -209,20 +277,29 @@ class FileDeleteForm { global $wgOut, $wgUser; $wgOut->setPageTitle( wfMsg( 'filedelete', $this->title->getText() ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); - $wgOut->setSubtitle( wfMsg( 'filedelete-backlink', $wgUser->getSkin()->makeKnownLinkObj( $this->title ) ) ); + $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 @@ -230,12 +307,12 @@ class FileDeleteForm { * * @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 * @@ -243,12 +320,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 * @@ -257,5 +336,4 @@ class FileDeleteForm { private function getTimestamp() { return $this->oldfile->getTimestamp(); } - }