From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 3 May 2012 13:01:35 +0200 Subject: Update to MediaWiki 1.19.0 --- includes/FileDeleteForm.php | 134 +++++++++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 58 deletions(-) (limited to 'includes/FileDeleteForm.php') diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index 515768ff..11f9aea5 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -8,9 +8,19 @@ */ class FileDeleteForm { + /** + * @var Title + */ private $title = null; + + /** + * @var File + */ private $file = null; + /** + * @var File + */ private $oldfile = null; private $oldimage = ''; @@ -29,30 +39,31 @@ class FileDeleteForm { * pending authentication, confirmation, etc. */ public function execute() { - global $wgOut, $wgRequest, $wgUser; - $this->setHeaders(); + global $wgOut, $wgRequest, $wgUser, $wgUploadMaintenance; - if( wfReadOnly() ) { - $wgOut->readOnlyPage(); - return; + $permissionErrors = $this->title->getUserPermissionsErrors( 'delete', $wgUser ); + if ( count( $permissionErrors ) ) { + throw new PermissionsError( 'delete', $permissionErrors ); } - $permission_errors = $this->title->getUserPermissionsErrors('delete', $wgUser); - if (count($permission_errors)>0) { - $wgOut->showPermissionsErrorPage( $permission_errors ); - return; + + 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' ); # 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 ) + 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' ) ); @@ -62,26 +73,38 @@ class FileDeleteForm { // 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 .= wfMsgForContent( 'colon-separator' ) . $this->DeleteReason; - } elseif ( $reason == 'other' ) { - $reason = $this->DeleteReason; + $reason = $deleteReasonList . wfMsgForContent( 'colon-separator' ) . $deleteReason; + } else { + $reason = $deleteReasonList; } - $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress ); + $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress, $wgUser ); - if( !$status->isGood() ) + 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->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; } @@ -94,17 +117,20 @@ class FileDeleteForm { * Really delete the file * * @param $title Title object - * @param $file File 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 */ - public static function doDelete( &$title, &$file, &$oldimage, $reason, $suppress ) { - global $wgUser; - $article = null; - $status = Status::newFatal( 'error' ); + 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 @@ -116,20 +142,17 @@ class FileDeleteForm { $log->addEntry( 'delete', $title, $logComment ); } } else { - $id = $title->getArticleID( Title::GAID_FOR_UPDATE ); - $article = new Article( $title ); + $status = Status::newFatal( 'cannotdelete', + wfEscapeWikiText( $title->getPrefixedText() ) + ); + $page = WikiPage::factory( $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 ); - } + $error = ''; + if ( $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error, $user ) >= WikiPage::DELETE_SUCCESS ) { $status = $file->delete( $reason, $suppress ); - if( $status->ok ) { + if( $status->isOK() ) { $dbw->commit(); } else { $dbw->rollback(); @@ -141,8 +164,10 @@ class FileDeleteForm { throw $e; } } - if( $status->isGood() ) - wfRunHooks('FileDeleteComplete', array( &$file, &$oldimage, &$article, &$wgUser, &$reason)); + + if ( $status->isOK() ) { + wfRunHooks( 'FileDeleteComplete', array( &$file, &$oldimage, &$page, &$user, &$reason ) ); + } return $status; } @@ -170,7 +195,7 @@ class FileDeleteForm { 'id' => 'mw-img-deleteconfirm' ) ) . Xml::openElement( 'fieldset' ) . Xml::element( 'legend', null, wfMsg( 'filedelete-legend' ) ) . - Html::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) . + Html::hidden( 'wpEditToken', $wgUser->getEditToken( $this->oldimage ) ) . $this->prepareMessage( 'filedelete-intro' ) . Xml::openElement( 'table', array( 'id' => 'mw-img-deleteconfirm-table' ) ) . " @@ -193,7 +218,7 @@ class FileDeleteForm { " {$suppress}"; - if( $wgUser->isLoggedIn() ) { + if( $wgUser->isLoggedIn() ) { $form .= " @@ -216,9 +241,8 @@ class FileDeleteForm { Xml::closeElement( 'form' ); if ( $wgUser->isAllowed( 'editinterface' ) ) { - $skin = $wgUser->getSkin(); $title = Title::makeTitle( NS_MEDIAWIKI, 'Filedelete-reason-dropdown' ); - $link = $skin->link( + $link = Linker::link( $title, wfMsgHtml( 'filedelete-edit-reasonlist' ), array(), @@ -236,7 +260,7 @@ class FileDeleteForm { private function showLogEntries() { global $wgOut; $wgOut->addHTML( '

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

\n" ); - LogEventsList::showLogExtract( $wgOut, 'delete', $this->title->getPrefixedText() ); + LogEventsList::showLogExtract( $wgOut, 'delete', $this->title ); } /** @@ -270,19 +294,10 @@ class FileDeleteForm { * 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()->link( - $this->title, - null, - array(), - array(), - array( 'known', 'noclasses' ) - ) - ) ); + $wgOut->addBacklinkSubtitle( $this->title ); } /** @@ -301,6 +316,9 @@ class FileDeleteForm { * 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 */ public static function haveDeletableFile(&$file, &$oldfile, $oldimage) { -- cgit v1.2.3-54-g00ecf