X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FFileDeleteForm.php;h=5177d35fe71ac356041d62c083212e68aa45473c;hb=f0566ab4b6959839f35d9da3bf7760b0ab5c6221;hp=01f0099253243c2a7edb3d9326390ec4fb7b066b;hpb=b713caf2da034f1387bb7d902c8566d212feb629;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 01f0099253..5177d35fe7 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -3,7 +3,7 @@
 /**
  * File deletion user interface
  *
- * @addtogroup Media
+ * @ingroup Media
  * @author Rob Church <robchur@gmail.com>
  */
 class FileDeleteForm {
@@ -13,7 +13,7 @@ class FileDeleteForm {
 
 	private $oldfile = null;
 	private $oldimage = '';
-	
+
 	/**
 	 * Constructor
 	 *
@@ -23,7 +23,7 @@ class FileDeleteForm {
 		$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,86 +67,138 @@ 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;
 			}
-			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 ) {
 				$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();
 	}
 
+	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 ) {
+				$id = $title->getArticleID( GAID_FOR_UPDATE );
+				// Need to delete the associated article
+				$article = new Article( $title );
+				$error = '';
+				if( wfRunHooks('ArticleDelete', array(&$article, &$wgUser, &$reason, &$error)) ) {
+					if( $article->doDeleteArticle( $reason, $suppress, $id ) ) {
+						global $wgRequest;
+						if( $wgRequest->getCheck( 'wpWatch' ) ) {
+							$article->doWatch();
+						} elseif( $title->userIsWatching() ) {
+							$article->doUnwatch();
+						}
+						wfRunHooks('ArticleDeleteComplete', array(&$article, &$wgUser, $reason, $id));
+					}
+				}
+			}
+		}
+		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 = "<tr id=\"wpDeleteSuppressRow\">
+					<td></td>
+					<td class='mw-input'>" .
+						Xml::checkLabel( wfMsg( 'revdelete-suppress' ),
+							'wpSuppress', 'wpSuppress', false, array( 'tabindex' => '3' ) ) .
+					"</td>
+				</tr>";
+		} 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', array(), wfMsgHtml( 'filedelete-legend' ) ) .
+			Xml::element( 'legend', null, wfMsg( 'filedelete-legend' ) ) .
 			Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) .
 			$this->prepareMessage( 'filedelete-intro' ) .
-			Xml::openElement( 'table' ) .
+			Xml::openElement( 'table', array( 'id' => 'mw-img-deleteconfirm-table' ) ) .
 			"<tr>
-				<td align=$align>" .
+				<td class='mw-label'>" .
 					Xml::label( wfMsg( 'filedelete-comment' ), 'wpDeleteReasonList' ) .
 				"</td>
-				<td>" .
+				<td class='mw-input'>" .
 					Xml::listDropDown( 'wpDeleteReasonList',
-						wfMsgForContent( 'filedelete-reason-dropdown' ), 
+						wfMsgForContent( 'filedelete-reason-dropdown' ),
 						wfMsgForContent( 'filedelete-reason-otherlist' ), '', 'wpReasonDropDown', 1 ) .
 				"</td>
 			</tr>
 			<tr>
-				<td align=$align>" .
+				<td class='mw-label'>" .
 					Xml::label( wfMsg( 'filedelete-otherreason' ), 'wpReason' ) .
 				"</td>
-				<td>" .
-					Xml::input( 'wpReason', 60, $wgRequest->getText( 'wpReason' ), array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '1' ) ) .
+				<td class='mw-input'>" .
+					Xml::input( 'wpReason', 60, $wgRequest->getText( 'wpReason' ),
+						array( 'type' => 'text', 'maxlength' => '255', 'tabindex' => '2', 'id' => 'wpReason' ) ) .
+				"</td>
+			</tr>
+			{$suppress}
+			<tr>
+				<td></td>
+				<td class='mw-input'>" .
+					Xml::checkLabel( wfMsg( 'watchthis' ),
+						'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) .
 				"</td>
 			</tr>
 			<tr>
 				<td></td>
-				<td>" .
-					Xml::submitButton( wfMsg( 'filedelete-submit' ), array( 'name' => 'mw-filedelete-submit', 'id' => 'mw-filedelete-submit' ) ) .
+				<td class='mw-submit'>" .
+					Xml::submitButton( wfMsg( 'filedelete-submit' ),
+						array( 'name' => 'mw-filedelete-submit', 'id' => 'mw-filedelete-submit', 'tabindex' => '4' ) ) .
 				"</td>
 			</tr>" .
 			Xml::closeElement( 'table' ) .
 			Xml::closeElement( 'fieldset' ) .
 			Xml::closeElement( 'form' );
 
-		$wgOut->addHtml( $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 );
 	}
 
 	/**
@@ -155,20 +206,10 @@ class FileDeleteForm {
 	 */
 	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 );		
+		$wgOut->addHTML( '<h2>' . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
+		LogEventsList::showLogExtract( $wgOut, 'delete', $this->title->getPrefixedText() );
 	}
-	
+
 	/**
 	 * Prepare a message referring to the file being deleted,
 	 * showing an appropriate message depending upon whether
@@ -178,16 +219,16 @@ class FileDeleteForm {
 	 * @return string
 	 */
 	private function prepareMessage( $message ) {
-		global $wgLang, $wgServer;
+		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(),
 				$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,
@@ -196,7 +237,7 @@ class FileDeleteForm {
 			);
 		}
 	}
-	
+
 	/**
 	 * Set headers, titles and other bits
 	 */
@@ -206,18 +247,18 @@ class FileDeleteForm {
 		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setSubtitle( wfMsg( 'filedelete-backlink', $wgUser->getSkin()->makeKnownLinkObj( $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
@@ -225,12 +266,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,7 +284,7 @@ class FileDeleteForm {
 			$q[] = 'oldimage=' . urlencode( $this->oldimage );
 		return $this->title->getLocalUrl( implode( '&', $q ) );
 	}
-	
+
 	/**
 	 * Extract the timestamp of the old version
 	 *
@@ -252,5 +293,5 @@ class FileDeleteForm {
 	private function getTimestamp() {
 		return $this->oldfile->getTimestamp();
 	}
-	
+
 }