From: Aaron Schulz Date: Wed, 30 Sep 2009 19:50:35 +0000 (+0000) Subject: * Renamed deletedcontent to deletedtext X-Git-Tag: 1.31.0-rc.0~39446 X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=c2f7ea4d7b71543b0851d378d3bfbd6ba89f95b3;p=lhc%2Fweb%2Fwiklou.git * Renamed deletedcontent to deletedtext * Removed deletedrevision and used deletedhistory/deletedtext instead --- diff --git a/includes/Article.php b/includes/Article.php index da033f2f11..f33dc9dee8 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -3430,7 +3430,7 @@ class Article { $cdel=''; // Don't show useless link to people who cannot hide revisions - if( $wgUser->isAllowed('deleterevision') || ($revision->getVisibility() && $wgUser->isAllowed('deletedrevision')) ) { + if( $wgUser->isAllowed('deleterevision') || ($revision->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) { if( !$revision->userCan( Revision::DELETED_RESTRICTED ) ) { // If revision was hidden from sysops $cdel = wfMsgHtml( 'rev-delundel' ); diff --git a/includes/ChangesList.php b/includes/ChangesList.php index dab30b66a5..4601c5aeaa 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -446,11 +446,11 @@ class ChangesList { * @return bool */ public static function userCan( $rc, $field ) { - if( ( $rc->mAttribs['rc_deleted'] & $field ) == $field ) { + if( $rc->mAttribs['rc_deleted'] & $field ) { global $wgUser; - $permission = ( $rc->mAttribs['rc_deleted'] & Revision::DELETED_RESTRICTED ) == Revision::DELETED_RESTRICTED + $permission = ( $rc->mAttribs['rc_deleted'] & Revision::DELETED_RESTRICTED ) ? 'suppressrevision' - : 'deletedrevision'; + : ( $field & Revision::DELETED_TEXT ) ? 'deletedtext' : 'deletedhistory'; wfDebug( "Checking for $permission due to $field match on {$rc->mAttribs['rc_deleted']}\n" ); return $wgUser->isAllowed( $permission ); } else { diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 9a60135a3c..6f99492e57 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1354,8 +1354,7 @@ $wgGroupPermissions['sysop']['createaccount'] = true; $wgGroupPermissions['sysop']['delete'] = true; $wgGroupPermissions['sysop']['bigdelete'] = true; // can be separately configured for pages with > $wgDeleteRevisionsLimit revs $wgGroupPermissions['sysop']['deletedhistory'] = true; // can view deleted history entries, but not see or restore the text -$wgGroupPermissions['sysop']['deletedcontent'] = true; // can view deleted revision text -$wgGroupPermissions['sysop']['deletedrevision'] = true; // can view hidden revision items (user/comment/text) +$wgGroupPermissions['sysop']['deletedtext'] = true; // can view deleted revision text $wgGroupPermissions['sysop']['undelete'] = true; $wgGroupPermissions['sysop']['editinterface'] = true; $wgGroupPermissions['sysop']['editusercss'] = true; diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index 7480812515..7410f2c08b 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -97,7 +97,7 @@ class FileDeleteForm { if( $status->ok ) { // Need to do a log item $log = new LogPage( 'delete' ); - $logComment = wfMsgForContent( 'deletedrevision', $oldimage ); + $logComment = wfMsgForContent( 'deletedhistory', $oldimage ); if( trim( $reason ) != '' ) $logComment .= ": {$reason}"; $log->addEntry( 'delete', $title, $logComment ); diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php index 9bc58baa30..86bd39ea26 100644 --- a/includes/HistoryPage.php +++ b/includes/HistoryPage.php @@ -351,7 +351,7 @@ class HistoryPager extends ReverseChronologicalPager { $s .= Xml::hidden( 'title', $this->title->getPrefixedDbKey() ) . "\n"; $this->buttons = '
'; - if( $wgUser->isAllowed('deletedrevision') ) { + if( $wgUser->isAllowed('deletedhistory') ) { $this->buttons .= Xml::element( 'button', array( 'type' => 'submit', @@ -464,7 +464,7 @@ class HistoryPager extends ReverseChronologicalPager { $s = "($curlink) ($lastlink) $diffButtons"; - if( $wgUser->isAllowed( 'deletedrevision' ) ) { + if( $wgUser->isAllowed( 'deletedhistory' ) ) { // Don't show useless link to people who cannot hide revisions if( !$rev->getVisibility() && !$wgUser->isAllowed( 'deleterevision' ) ) { $del = Xml::check( 'deleterevisions', false, array('class' => 'mw-revdelundel-hidden') ); diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 399ee7d3c7..f95e536a9a 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -821,7 +821,7 @@ class ImageHistoryList { . $navLinks . "\n" . Xml::openElement( 'table', array( 'class' => 'wikitable filehistory' ) ) . "\n" . '' - . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedrevision') ) ? '' : '' ) + . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ? '' : '' ) . '' . wfMsgHtml( 'filehist-datetime' ) . '' . ( $this->showThumb ? '' . wfMsgHtml( 'filehist-thumb' ) . '' : '' ) . '' . wfMsgHtml( 'filehist-dimensions' ) . '' @@ -847,7 +847,7 @@ class ImageHistoryList { $row = $css = $selected = ''; // Deletion link - if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedrevision') ) ) { + if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ) { $row .= ''; # Link to remove from history if( $wgUser->isAllowed( 'delete' ) ) { @@ -861,7 +861,7 @@ class ImageHistoryList { ); } # Link to hide content. Don't show useless link to people who cannot hide revisions. - if( $wgUser->isAllowed('deleterevision') || ($wgUser->isAllowed('deletedrevision') && $file->getVisibility()) ) { + if( $wgUser->isAllowed('deleterevision') || ($wgUser->isAllowed('deletedhistory') && $file->getVisibility()) ) { if( $wgUser->isAllowed('delete') ) { $row .= '
'; } diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php index d05be83c4d..e4aa3a3063 100644 --- a/includes/LogEventsList.php +++ b/includes/LogEventsList.php @@ -284,7 +284,7 @@ class LogEventsList { $paramArray = LogPage::extractParams( $row->log_params ); $revert = $del = ''; // Some user can hide log items and have review links - if( !($this->flags & self::NO_ACTION_LINK) && $wgUser->isAllowed( 'deletedrevision' ) ) { + if( !($this->flags & self::NO_ACTION_LINK) && $wgUser->isAllowed( 'deletedhistory' ) ) { // Don't show useless link to people who cannot hide revisions if( $row->log_deleted || $wgUser->isAllowed( 'deleterevision' ) ) { $del = $this->getShowHideLinks( $row ) . ' '; @@ -381,7 +381,7 @@ class LogEventsList { array( 'known', 'noclasses' ) ) . ')'; // If an edit was hidden from a page give a review link to the history - } else if( self::typeAction($row,array('delete','suppress'),'revision','deletedrevision') ) { + } else if( self::typeAction($row,array('delete','suppress'),'revision','deletedhistory') ) { if( count($paramArray) >= 2 ) { // Different revision types use different URL params... $key = $paramArray[0]; @@ -434,7 +434,7 @@ class LogEventsList { $revert = wfMsg( 'parentheses', $wgLang->pipeList( $revert ) ); } // Hidden log items, give review link - } else if( self::typeAction($row,array('delete','suppress'),'event','deletedrevision') ) { + } else if( self::typeAction($row,array('delete','suppress'),'event','deletedhistory') ) { if( count($paramArray) >= 1 ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); // $paramArray[1] is a CSV of the IDs @@ -547,11 +547,11 @@ class LogEventsList { * @return Boolean */ public static function userCan( $row, $field ) { - if( ( $row->log_deleted & $field ) == $field ) { + if( $row->log_deleted & $field ) { global $wgUser; - $permission = ( $row->log_deleted & LogPage::DELETED_RESTRICTED ) == LogPage::DELETED_RESTRICTED + $permission = ( $row->log_deleted & LogPage::DELETED_RESTRICTED ) ? 'suppressrevision' - : 'deletedrevision'; + : 'deletedhistory'; wfDebug( "Checking for $permission due to $field match on $row->log_deleted\n" ); return $wgUser->isAllowed( $permission ); } else { @@ -807,7 +807,7 @@ class LogPager extends ReverseChronologicalPager { global $wgUser; $this->mConds['log_user'] = $userid; // Paranoia: avoid brute force searches (bug 17342) - if( !$wgUser->isAllowed( 'deletedrevision' ) ) { + if( !$wgUser->isAllowed( 'deletedhistory' ) ) { $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::DELETED_USER) . ' = 0'; } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) { $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_USER) . @@ -854,7 +854,7 @@ class LogPager extends ReverseChronologicalPager { $this->mConds['log_title'] = $title->getDBkey(); } // Paranoia: avoid brute force searches (bug 17342) - if( !$wgUser->isAllowed( 'deletedrevision' ) ) { + if( !$wgUser->isAllowed( 'deletedhistory' ) ) { $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::DELETED_ACTION) . ' = 0'; } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) { $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_ACTION) . diff --git a/includes/Revision.php b/includes/Revision.php index 9ec8a89dd9..fc43989ca9 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -977,11 +977,11 @@ class Revision { * @return bool */ public function userCan( $field ) { - if( ( $this->mDeleted & $field ) == $field ) { + if( $this->mDeleted & $field ) { global $wgUser; - $permission = ( $this->mDeleted & self::DELETED_RESTRICTED ) == self::DELETED_RESTRICTED + $permission = ( $this->mDeleted & self::DELETED_RESTRICTED ) ? 'suppressrevision' - : 'deletedrevision'; + : ( $field & self::DELETED_TEXT ) ? 'deletedtext' : 'deletedhistory'; wfDebug( "Checking for $permission due to $field match on $this->mDeleted\n" ); return $wgUser->isAllowed( $permission ); } else { diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index e0afaa9f51..90cf2bab85 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -800,7 +800,7 @@ class SkinTemplate extends Skin { } } else { //article doesn't exist or is deleted - if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'deletedcontent' ) ) { + if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'deletedtext' ) ) { if( $n = $this->mTitle->isDeleted() ) { $undelTitle = SpecialPage::getTitleFor( 'Undelete' ); $content_actions['undelete'] = array( diff --git a/includes/User.php b/includes/User.php index 7f40790010..45d374ea01 100644 --- a/includes/User.php +++ b/includes/User.php @@ -142,8 +142,7 @@ class User { 'createtalk', 'delete', 'deletedhistory', - 'deletedcontent', - 'deletedrevision', + 'deletedtext', 'deleterevision', 'edit', 'editinterface', diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php index 7aed5c1fd4..0f09dc7e81 100644 --- a/includes/diff/DifferenceInterface.php +++ b/includes/diff/DifferenceInterface.php @@ -318,7 +318,7 @@ CONTROL; } $rdel = ''; $ldel = ''; - if( $wgUser->isAllowed( 'deletedrevision' ) ) { + if( $wgUser->isAllowed( 'deletedhistory' ) ) { // Don't show useless link to people who cannot hide revisions if( $this->mOldRev->getVisibility() || $wgUser->isAllowed( 'deleterevision' ) ) { if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) { diff --git a/includes/filerepo/ArchivedFile.php b/includes/filerepo/ArchivedFile.php index 94f8f67121..1c22ba26bc 100644 --- a/includes/filerepo/ArchivedFile.php +++ b/includes/filerepo/ArchivedFile.php @@ -377,11 +377,11 @@ class ArchivedFile */ public function userCan( $field ) { $this->load(); - if( ($this->deleted & $field) == $field ) { + if( $this->deleted & $field ) { global $wgUser; - $permission = ( $this->deleted & File::DELETED_RESTRICTED ) == File::DELETED_RESTRICTED + $permission = ( $this->deleted & File::DELETED_RESTRICTED ) ? 'suppressrevision' - : 'deletedrevision'; + : ( $field & File::DELETED_FILE ) ? 'deletedtext' : 'deletedhistory'; wfDebug( "Checking for $permission due to $field match on $this->deleted\n" ); return $wgUser->isAllowed( $permission ); } else { diff --git a/includes/filerepo/OldLocalFile.php b/includes/filerepo/OldLocalFile.php index aaa7c4469f..4c31997a71 100644 --- a/includes/filerepo/OldLocalFile.php +++ b/includes/filerepo/OldLocalFile.php @@ -195,11 +195,11 @@ class OldLocalFile extends LocalFile { * @return bool */ function userCan( $field ) { - if( isset($this->deleted) && ($this->deleted & $field) == $field ) { + if( isset($this->deleted) && ($this->deleted & $field) ) { global $wgUser; - $permission = ( $this->deleted & File::DELETED_RESTRICTED ) == File::DELETED_RESTRICTED + $permission = ( $this->deleted & File::DELETED_RESTRICTED ) ? 'suppressrevision' - : 'deletedrevision'; + : ( $field & File::DELETED_FILE ) ? 'deletedtext' : 'deletedhistory'; wfDebug( "Checking for $permission due to $field match on $this->mDeleted\n" ); return $wgUser->isAllowed( $permission ); } else { diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php index 78a5d49403..c87f6c9167 100644 --- a/includes/specials/SpecialContributions.php +++ b/includes/specials/SpecialContributions.php @@ -461,7 +461,7 @@ class ContribsPager extends ReverseChronologicalPager { $conds = array_merge( $userCond, $this->getNamespaceCond() ); // Paranoia: avoid brute force searches (bug 17342) - if( !$wgUser->isAllowed( 'deletedrevision' ) ) { + if( !$wgUser->isAllowed( 'deletedhistory' ) ) { $conds[] = $this->mDb->bitAnd('rev_deleted',Revision::DELETED_USER) . ' = 0'; } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) { $conds[] = $this->mDb->bitAnd('rev_deleted',Revision::SUPPRESSED_USER) . @@ -633,7 +633,7 @@ class ContribsPager extends ReverseChronologicalPager { } // Don't show useless link to people who cannot hide revisions - if( $wgUser->isAllowed('deleterevision') || ($rev->getVisibility() && $wgUser->isAllowed('deletedrevision')) ) { + if( $wgUser->isAllowed('deleterevision') || ($rev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) { // If revision was hidden from sysops if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php index 1d4437613c..3a7d0279b3 100644 --- a/includes/specials/SpecialDeletedContributions.php +++ b/includes/specials/SpecialDeletedContributions.php @@ -31,7 +31,7 @@ class DeletedContribsPager extends IndexPager { list( $index, $userCond ) = $this->getUserCond(); $conds = array_merge( $userCond, $this->getNamespaceCond() ); // Paranoia: avoid brute force searches (bug 17792) - if( !$wgUser->isAllowed( 'deletedrevision' ) ) { + if( !$wgUser->isAllowed( 'deletedhistory' ) ) { $conds[] = $this->mDb->bitAnd('ar_deleted',Revision::DELETED_USER) . ' = 0'; } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) { $conds[] = $this->mDb->bitAnd('ar_deleted',Revision::SUPPRESSED_USER) . @@ -146,7 +146,7 @@ class DeletedContribsPager extends IndexPager { $this->messages['undeleteviewlink'] ); - if( $wgUser->isAllowed('deletedcontent') ) { + if( $wgUser->isAllowed('deletedtext') ) { $last = $sk->linkKnown( $undelete, $this->messages['diff'], @@ -191,7 +191,7 @@ class DeletedContribsPager extends IndexPager { } // Don't show useless link to people who cannot hide revisions - if( $wgUser->isAllowed('deleterevision') || ($rev->getVisibility() && $wgUser->isAllowed('deletedrevision')) ) { + if( $wgUser->isAllowed('deleterevision') || ($rev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) { // If revision was hidden from sysops if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php index 2d6b9f150a..b877769697 100644 --- a/includes/specials/SpecialRevisiondelete.php +++ b/includes/specials/SpecialRevisiondelete.php @@ -90,13 +90,13 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { ); public function __construct() { - parent::__construct( 'Revisiondelete', 'deletedrevision' ); + parent::__construct( 'Revisiondelete', 'deletedhistory' ); } public function execute( $par ) { global $wgOut, $wgUser, $wgRequest; - if( !$wgUser->isAllowed( 'deletedrevision' ) ) { - $wgOut->permissionRequired( 'deletedrevision' ); + if( !$wgUser->isAllowed( 'deletedhistory' ) ) { + $wgOut->permissionRequired( 'deletedhistory' ); return; } else if( wfReadOnly() ) { $wgOut->readOnlyPage(); @@ -261,7 +261,11 @@ class SpecialRevisionDelete extends UnlistedSpecialPage { return; } if( !$oimage->userCan(File::DELETED_FILE) ) { - $wgOut->permissionRequired( 'suppressrevision' ); + if( $oimage->isDeleted( File::DELETED_RESTRICTED ) ) { + $wgOut->permissionRequired( 'suppressrevision' ); + } else { + $wgOut->permissionRequired( 'deletedtext' ); + } return; } if ( !$wgUser->matchEditToken( $this->token, $archiveName ) ) { diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 226cf7a592..6f58a46b9a 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -576,10 +576,10 @@ class UndeleteForm { if( $par != "" ) { $this->mTarget = $par; } - if ( $wgUser->isAllowed( 'deletedcontent' ) && $wgUser->isAllowed( 'undelete' ) && !$wgUser->isBlocked() ) { + if ( $wgUser->isAllowed( 'deletedtext' ) && $wgUser->isAllowed( 'undelete' ) && !$wgUser->isBlocked() ) { $this->mAllowed = true; // user can restore $this->mCanView = true; // user can view content - } elseif ( $wgUser->isAllowed( 'deletedcontent' ) ) { + } elseif ( $wgUser->isAllowed( 'deletedtext' ) ) { $this->mAllowed = false; // user cannot restore $this->mCanView = true; // user can view content } else { // user can only view the list of revisions @@ -639,9 +639,17 @@ class UndeleteForm { } if( $this->mFile !== null ) { $file = new ArchivedFile( $this->mTargetObj, '', $this->mFile ); + $file->load(); // Check if user is allowed to see this file - if( !$file->userCan( File::DELETED_FILE ) ) { - $wgOut->permissionRequired( 'suppressrevision' ); + if ( !$file->exists() ) { + $wgOut->addWikiMsg( 'filedelete-nofile', $this->mFile ); + return; + } else if( !$file->userCan( File::DELETED_FILE ) ) { + if( $file->isDeleted( File::DELETED_RESTRICTED ) ) { + $wgOut->permissionRequired( 'suppressrevision' ); + } else { + $wgOut->permissionRequired( 'deletedtext' ); + } return false; } elseif ( !$wgUser->matchEditToken( $this->mToken, $this->mFile ) ) { $this->showFileConfirmationForm( $this->mFile ); @@ -779,7 +787,7 @@ class UndeleteForm { $revdlink = ''; // Diffs already have revision delete links - if( !$this->mDiff && $wgUser->isAllowed( 'deletedrevision' ) ) { + if( !$this->mDiff && $wgUser->isAllowed( 'deletedhistory' ) ) { // Don't show useless link to people who cannot hide revisions if( !$rev->getVisibility() && !$wgUser->isAllowed( 'deleterevision' ) ) { $revdlink = ''; @@ -893,7 +901,7 @@ class UndeleteForm { $targetQuery = array( 'oldid' => $rev->getId() ); } // Add show/hide link if available. Don't show useless link to people who cannot hide revisions. - if( $wgUser->isAllowed('deleterevision') || ($rev->getVisibility() && $wgUser->isAllowed('deletedrevision')) ) { + if( $wgUser->isAllowed('deleterevision') || ($rev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) { // If revision was hidden from sysops if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { $del = ' ' . Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), @@ -1194,7 +1202,7 @@ class UndeleteForm { // Edit summary $comment = $sk->revComment( $rev ); // Show/hide link. // Don't show useless link to people who cannot hide revisions. - if( $wgUser->isAllowed('deleterevision') || ($rev->getVisibility() && $wgUser->isAllowed('deletedrevision')) ) { + if( $wgUser->isAllowed('deleterevision') || ($rev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) { if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { // If revision was hidden from sysops $revdlink = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), @@ -1241,7 +1249,7 @@ class UndeleteForm { $comment = $this->getFileComment( $file, $sk ); $revdlink = ''; // Add show/hide link if available. Don't show useless link to people who cannot hide revisions. - if( $wgUser->isAllowed('deleterevision') || ($file->getVisibility() && $wgUser->isAllowed('deletedrevision')) ) { + if( $wgUser->isAllowed('deleterevision') || ($file->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) { if( !$file->userCan(File::DELETED_RESTRICTED ) ) { // If revision was hidden from sysops $revdlink = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.wfMsgHtml('rev-delundel').')' );