From dfa7f0ae40b44805534ee888fef45f378762e79f Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 21 Mar 2008 05:09:23 +0000 Subject: [PATCH] rev_deleted merge: *Allow deletion of archived revs, live old files, and archived files *Allow viewing of deleted live old files --- includes/SpecialRevisiondelete.php | 1261 +++++++++++++++++++++++++--- 1 file changed, 1165 insertions(+), 96 deletions(-) diff --git a/includes/SpecialRevisiondelete.php b/includes/SpecialRevisiondelete.php index c1702d1403..ee26cf4c98 100644 --- a/includes/SpecialRevisiondelete.php +++ b/includes/SpecialRevisiondelete.php @@ -1,37 +1,55 @@ getVal( 'target' ); - $oldid = $wgRequest->getIntArray( 'oldid' ); - + global $wgOut, $wgRequest, $wgUser, $wgAllowLogDeletion; + # Handle our many different possible input types + $target = $wgRequest->getText( 'target' ); + $oldid = $wgRequest->getArray( 'oldid' ); + $artimestamp = $wgRequest->getArray( 'artimestamp' ); + $logid = $wgAllowLogDeletion ? $wgRequest->getArray( 'logid' ) : ''; + $img = $wgRequest->getArray( 'oldimage' ); + $fileid = $wgRequest->getArray( 'fileid' ); + # For reviewing deleted files... + $file = $wgRequest->getVal( 'file' ); + # If this is a revision, then we need a target page $page = Title::newFromUrl( $target ); - - if( is_null( $page ) ) { - $wgOut->showErrorPage( 'notargettitle', 'notargettext' ); + if( is_null($page) && is_null($logid) ) { + $wgOut->addWikiText( wfMsgHtml( 'undelete-header' ) ); return; } - - if( is_null( $oldid ) ) { + # Only one target set at a time please! + $i = (bool)$file + (bool)$oldid + (bool)$logid + (bool)$artimestamp + (bool)$fileid + (bool)$img; + if( $i !== 1 ) { $wgOut->showErrorPage( 'revdelete-nooldid-title', 'revdelete-nooldid-text' ); return; } - - $form = new RevisionDeleteForm( $wgRequest ); + # Either submit or create our form + $form = new RevisionDeleteForm( $page, $oldid, $logid, $artimestamp, $fileid, $img, $file ); if( $wgRequest->wasPosted() ) { $form->submit( $wgRequest ); - } else { - $form->show( $wgRequest ); + } else if( $oldid || $artimestamp ) { + $form->showRevs( $wgRequest ); + } else if( $fileid || $img ) { + $form->showImages( $wgRequest ); + } else if( $logid ) { + $form->showLogItems( $wgRequest ); + } + # Show relevant lines from the deletion log. This will show even if said ID + # does not exist...might be helpful + if( !is_null($page) ) { + $wgOut->addHTML( "

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

\n" ); + $logViewer = new LogViewer( + new LogReader( + new FauxRequest( + array( 'page' => $page->getPrefixedText(), 'type' => 'delete' ) ) ) ); + $logViewer->showList( $wgOut ); } } @@ -41,54 +59,411 @@ function wfSpecialRevisiondelete( $par = null ) { */ class RevisionDeleteForm { /** - * @param WebRequest $request + * @param Title $page + * @param array $oldids + * @param array $logids + * @param array $artimestamps + * @param array $fileids + * @param array $img + * @param string $file */ - function __construct( $request ) { + function __construct( $page, $oldids, $logids, $artimestamps, $fileids, $img, $file ) { global $wgUser; - - $target = $request->getVal( 'target' ); - $this->page = Title::newFromUrl( $target ); - - $this->revisions = $request->getIntArray( 'oldid', array() ); - + + $this->page = $page; + # For reviewing deleted files... + if( $file ) { + $oimage = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $page, $file ); + $oimage->load(); + // Check if user is allowed to see this file + if( !$oimage->userCan(File::DELETED_FILE) ) { + $wgOut->permissionRequired( 'hiderevision' ); + } else { + $this->showFile( $file ); + } + return; + } $this->skin = $wgUser->getSkin(); + // At this point, we should only have one of these + if( $oldids ) { + $this->revisions = $oldids; + $hide_content_name = array( 'revdelete-hide-text', 'wpHideText', Revision::DELETED_TEXT ); + $this->deleteKey='oldid'; + } else if( $artimestamps ) { + $this->archrevs = $artimestamps; + $hide_content_name = array( 'revdelete-hide-text', 'wpHideText', Revision::DELETED_TEXT ); + $this->deleteKey='artimestamp'; + } else if( $img ) { + $this->ofiles = $img; + $hide_content_name = array( 'revdelete-hide-image', 'wpHideImage', File::DELETED_FILE ); + $this->deleteKey='oldimage'; + } else if( $fileids ) { + $this->afiles = $fileids; + $hide_content_name = array( 'revdelete-hide-image', 'wpHideImage', File::DELETED_FILE ); + $this->deleteKey='fileid'; + } else if( $logids ) { + $this->events = $logids; + $hide_content_name = array( 'revdelete-hide-name', 'wpHideName', LogPage::DELETED_ACTION ); + $this->deleteKey='logid'; + } + // Our checkbox messages depends one what we are doing, + // e.g. we don't hide "text" for logs or images $this->checks = array( - array( 'revdelete-hide-text', 'wpHideText', Revision::DELETED_TEXT ), + $hide_content_name, array( 'revdelete-hide-comment', 'wpHideComment', Revision::DELETED_COMMENT ), array( 'revdelete-hide-user', 'wpHideUser', Revision::DELETED_USER ), array( 'revdelete-hide-restricted', 'wpHideRestricted', Revision::DELETED_RESTRICTED ) ); } /** + * Show a deleted file version requested by the visitor. + */ + private function showFile( $key ) { + global $wgOut, $wgRequest; + $wgOut->disable(); + + # We mustn't allow the output to be Squid cached, otherwise + # if an admin previews a deleted image, and it's cached, then + # a user without appropriate permissions can toddle off and + # nab the image, and Squid will serve it + $wgRequest->response()->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' ); + $wgRequest->response()->header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' ); + $wgRequest->response()->header( 'Pragma: no-cache' ); + + $store = FileStore::get( 'deleted' ); + $store->stream( $key ); + } + + /** + * This lets a user set restrictions for live and archived revisions * @param WebRequest $request */ - function show( $request ) { - global $wgOut, $wgUser; + function showRevs( $request ) { + global $wgOut, $wgUser, $action; - $wgOut->addWikiMsg( 'revdelete-selected', $this->page->getPrefixedText() ); + $UserAllowed = true; + + $count = ($this->deleteKey=='oldid') ? + count($this->revisions) : count($this->archrevs); + $wgOut->addWikiMsg( 'revdelete-selected', $this->page->getPrefixedText(), $count ); + $bitfields = 0; $wgOut->addHtml( "" ); + + $wgOut->addWikiText( wfMsgHtml( 'revdelete-text' ) ); + + // Normal sysops can always see what they did, but can't always change it + if( !$UserAllowed ) return; + + $items = array( + wfInputLabel( wfMsgHtml( 'revdelete-log' ), 'wpReason', 'wpReason', 60 ), + wfSubmitButton( wfMsgHtml( 'revdelete-submit' ) ) ); + $hidden = array( + wfHidden( 'wpEditToken', $wgUser->editToken() ), + wfHidden( 'target', $this->page->getPrefixedText() ), + wfHidden( 'type', $this->deleteKey ) ); + if( $this->deleteKey=='oldid' ) { + foreach( $revObjs as $rev ) + $hidden[] = wfHidden( 'oldid[]', $rev->getID() ); + } else { + foreach( $revObjs as $rev ) + $hidden[] = wfHidden( 'artimestamp[]', $rev->getTimestamp() ); + } + $special = SpecialPage::getTitleFor( 'Revisiondelete' ); + $wgOut->addHtml( wfElement( 'form', array( + 'method' => 'post', + 'action' => $special->getLocalUrl( 'action=submit' ) ), + null ) ); + + $wgOut->addHtml( '
' . wfMsgHtml( 'revdelete-legend' ) . '' ); + // FIXME: all items checked for just one rev are checked, even if not set for the others + foreach( $this->checks as $item ) { + list( $message, $name, $field ) = $item; + $wgOut->addHtml( "
" . + wfCheckLabel( wfMsgHtml( $message), $name, $name, $bitfields & $field ) . + "
\n" ); + } + $wgOut->addHtml( '
' ); + foreach( $items as $item ) { + $wgOut->addHtml( '

' . $item . '

' ); + } + foreach( $hidden as $item ) { + $wgOut->addHtml( $item ); + } + + $wgOut->addHtml( '' ); + } + + /** + * This lets a user set restrictions for archived images + * @param WebRequest $request + */ + function showImages( $request ) { + global $wgOut, $wgUser, $action; + + $UserAllowed = true; + + $count = ($this->deleteKey=='oldimage') ? count($this->ofiles) : count($this->afiles); + $wgOut->addWikiText( wfMsgExt( 'revdelete-selected', array('parsemag'), + $this->page->getPrefixedText(), $count ) ); + + $bitfields = 0; + $wgOut->addHtml( "" ); + + $wgOut->addWikiText( wfMsgHtml( 'revdelete-text' ) ); + //Normal sysops can always see what they did, but can't always change it + if( !$UserAllowed ) return; + + $items = array( + wfInputLabel( wfMsgHtml( 'revdelete-log' ), 'wpReason', 'wpReason', 60 ), + wfSubmitButton( wfMsgHtml( 'revdelete-submit' ) ) ); + $hidden = array( + wfHidden( 'wpEditToken', $wgUser->editToken() ), + wfHidden( 'target', $this->page->getPrefixedText() ), + wfHidden( 'type', $this->deleteKey ) ); + if( $this->deleteKey=='oldimage' ) { + foreach( $this->ofiles as $filename ) + $hidden[] = wfHidden( 'oldimage[]', $filename ); + } else { + foreach( $this->afiles as $fileid ) + $hidden[] = wfHidden( 'fileid[]', $fileid ); + } + $special = SpecialPage::getTitleFor( 'Revisiondelete' ); + $wgOut->addHtml( wfElement( 'form', array( + 'method' => 'post', + 'action' => $special->getLocalUrl( 'action=submit' ) ), + null ) ); + + $wgOut->addHtml( '
' . wfMsgHtml( 'revdelete-legend' ) . '' ); + // FIXME: all items checked for just one file are checked, even if not set for the others + foreach( $this->checks as $item ) { + list( $message, $name, $field ) = $item; + $wgOut->addHtml( '
' . + wfCheckLabel( wfMsgHtml( $message), $name, $name, $bitfields & $field ) . + '
' ); + } + $wgOut->addHtml( '
' ); + foreach( $items as $item ) { + $wgOut->addHtml( '

' . $item . '

' ); + } + foreach( $hidden as $item ) { + $wgOut->addHtml( $item ); + } + + $wgOut->addHtml( '' ); + } + + /** + * This lets a user set restrictions for log items + * @param WebRequest $request + */ + function showLogItems( $request ) { + global $wgOut, $wgUser, $action; + + $UserAllowed = true; + $wgOut->addWikiText( wfMsgExt( 'logdelete-selected', array('parsemag'), count($this->events) ) ); + + $bitfields = 0; + $wgOut->addHtml( "" ); - + $wgOut->addWikiMsg( 'revdelete-text' ); + // Normal sysops can always see what they did, but can't always change it + if( !$UserAllowed ) return; $items = array( Xml::inputLabel( wfMsg( 'revdelete-log' ), 'wpReason', 'wpReason', 60 ), Xml::submitButton( wfMsg( 'revdelete-submit' ) ) ); $hidden = array( Xml::hidden( 'wpEditToken', $wgUser->editToken() ), - Xml::hidden( 'target', $this->page->getPrefixedText() ) ); - foreach( $this->revisions as $revid ) { - $hidden[] = Xml::hidden( 'oldid[]', $revid ); + Xml::hidden( 'type', $this->deleteKey ) ); + foreach( $this->events as $logid ) { + $hidden[] = Xml::hidden( 'logid[]', $logid ); } $special = SpecialPage::getTitleFor( 'Revisiondelete' ); @@ -98,10 +473,11 @@ class RevisionDeleteForm { null ) ); $wgOut->addHtml( '
' . wfMsgHtml( 'revdelete-legend' ) . '' ); + // FIXME: all items checked for just on event are checked, even if not set for the others foreach( $this->checks as $item ) { list( $message, $name, $field ) = $item; $wgOut->addHtml( '
' . - Xml::checkLabel( wfMsg( $message), $name, $name, $rev->isDeleted( $field ) ) . + Xml::checkLabel( wfMsg( $message), $name, $name, $bitfields & $field ) . '
' ); } $wgOut->addHtml( '
' ); @@ -119,17 +495,163 @@ class RevisionDeleteForm { * @param Revision $rev * @returns string */ - function historyLine( $rev ) { + private function historyLine( $rev ) { global $wgContLang; $date = $wgContLang->timeanddate( $rev->getTimestamp() ); - return - "
  • " . - $this->skin->makeLinkObj( $this->page, $date, 'oldid=' . $rev->getId() ) . - " " . - $this->skin->revUserLink( $rev ) . - " " . - $this->skin->revComment( $rev ) . - "
    • "; + + $difflink=''; $del = ''; + // Live revisions + if( $this->deleteKey=='oldid' ) { + $difflink = '(' . $this->skin->makeKnownLinkObj( $this->page, wfMsgHtml('diff'), + 'diff=' . $rev->getId() . '&oldid=prev' ) . ')'; + $revlink = $this->skin->makeLinkObj( $this->page, $date, 'oldid=' . $rev->getId() ); + } else { + // Archived revisions + $undelete = SpecialPage::getTitleFor( 'Undelete' ); + $target = $this->page->getPrefixedText(); + $revlink = $this->skin->makeLinkObj( $undelete, $date, + "target=$target×tamp=" . $rev->getTimestamp() ); + } + + if( $rev->isDeleted(Revision::DELETED_TEXT) ) { + $revlink = ''.$revlink.''; + $del = ' ' . wfMsgHtml( 'deletedrev' ) . ''; + if( !$rev->userCan(Revision::DELETED_TEXT) ) { + $revlink = ''.$date.''; + } + } + + return "
  • $difflink $revlink ".$this->skin->revUserLink( $rev )." ".$this->skin->revComment( $rev )."$del
    • "; + } + + /** + * @param File $file + * @returns string + */ + private function fileLine( $file ) { + global $wgContLang, $wgTitle; + + $target = $this->page->getPrefixedText(); + $date = $wgContLang->timeanddate( $file->getTimestamp(), true ); + + $del = ''; + # Hidden files... + if( $file->isDeleted(File::DELETED_FILE) ) { + $del = ' ' . wfMsgHtml( 'deletedrev' ) . ''; + if( !$file->userCan(File::DELETED_FILE) ) { + $pageLink = $date; + } else { + $pageLink = $this->skin->makeKnownLinkObj( $wgTitle, $date, + "target=$target&file=$file->sha1.".$file->getExtension() ); + } + $pageLink = '' . $pageLink . ''; + # Regular files... + } else { + $url = $file->getUrlRel(); + $pageLink = "{$date}"; + } + + $data = wfMsgHtml( 'widthheight', + $wgContLang->formatNum( $file->getWidth() ), + $wgContLang->formatNum( $file->getHeight() ) ) . + ' (' . wfMsgHtml( 'nbytes', $wgContLang->formatNum( $file->getSize() ) ) . ')'; + + return "
  • $pageLink ".$this->fileUserTools( $file )." $data ".$this->fileComment( $file )."$del
    • "; + } + + /** + * @param ArchivedFile $file + * @returns string + */ + private function archivedfileLine( $file ) { + global $wgContLang, $wgTitle; + + $target = $this->page->getPrefixedText(); + $date = $wgContLang->timeanddate( $file->getTimestamp(), true ); + + $undelete = SpecialPage::getTitleFor( 'Undelete' ); + $pageLink = $this->skin->makeKnownLinkObj( $undelete, $date, "target=$target&file={$file->getKey()}" ); + + $del = ''; + if( $file->isDeleted(File::DELETED_FILE) ) { + $del = ' ' . wfMsgHtml( 'deletedrev' ) . ''; + } + + $data = wfMsgHtml( 'widthheight', + $wgContLang->formatNum( $file->getWidth() ), + $wgContLang->formatNum( $file->getHeight() ) ) . + ' (' . wfMsgHtml( 'nbytes', $wgContLang->formatNum( $file->getSize() ) ) . ')'; + + return "
  • $pageLink ".$this->fileUserTools( $file )." $data ".$this->fileComment( $file )."$del
    • "; + } + + /** + * @param Array $row row + * @returns string + */ + private function logLine( $row ) { + global $wgContLang; + + $date = $wgContLang->timeanddate( $row->log_timestamp ); + $paramArray = LogPage::extractParams( $row->log_params ); + // Action text + if( !LogPage::userCan($row,LogPage::DELETED_ACTION) ) { + $action = '' . wfMsgHtml('rev-deleted-event') . ''; + } else { + $title = Title::makeTitle( $row->log_namespace, $row->log_title ); + $action = LogPage::actionText( $row->log_type, $row->log_action, $title, + $this->skin, $paramArray, true, true ); + if( $row->log_deleted & LogPage::DELETED_ACTION ) + $action = '' . $action . ''; + } + // User links + $userLink = $this->skin->userLink( $row->log_user, User::WhoIs($row->log_user) ); + if( LogPage::isDeleted($row,LogPage::DELETED_USER) ) { + $userLink = '' . $userLink . ''; + } + // Comment + $comment = $wgContLang->getDirMark() . $this->skin->commentBlock( $row->log_comment ); + if( LogPage::isDeleted($row,LogPage::DELETED_COMMENT) ) { + $comment = '' . $comment . ''; + } + return "
  • $date $userLink $action $comment
    • "; + } + + /** + * Generate a user tool link cluster if the current user is allowed to view it + * @param ArchivedFile $file + * @return string HTML + */ + private function fileUserTools( $file ) { + if( $file->userCan( Revision::DELETED_USER ) ) { + $link = $this->skin->userLink( $file->user, $file->user_text ) . + $this->skin->userToolLinks( $file->user, $file->user_text ); + } else { + $link = wfMsgHtml( 'rev-deleted-user' ); + } + if( $file->isDeleted( Revision::DELETED_USER ) ) { + return '' . $link . ''; + } + return $link; + } + + /** + * Wrap and format the given file's comment block, if the current + * user is allowed to view it. + * + * @param ArchivedFile $file + * @return string HTML + */ + private function fileComment( $file ) { + if( $file->userCan( File::DELETED_COMMENT ) ) { + $block = $this->skin->commentBlock( $file->description ); + } else { + $block = ' ' . wfMsgHtml( 'rev-deleted-comment' ); + } + if( $file->isDeleted( File::DELETED_COMMENT ) ) { + return "$block"; + } + return $block; } /** @@ -138,16 +660,52 @@ class RevisionDeleteForm { function submit( $request ) { $bitfield = $this->extractBitfield( $request ); $comment = $request->getText( 'wpReason' ); - if( $this->save( $bitfield, $comment ) ) { - return $this->success( $request ); - } else { - return $this->show( $request ); + + $this->target = $request->getText( 'target' ); + $this->title = Title::newFromURL( $this->target ); + + if( $this->save( $bitfield, $comment, $this->title ) ) { + $this->success( $request ); + } else if( $request->getCheck( 'oldid' ) || $request->getCheck( 'artimestamp' ) ) { + return $this->showRevs( $request ); + } else if( $request->getCheck( 'logid' ) ) { + return $this->showLogs( $request ); + } else if( $request->getCheck( 'oldimage' ) || $request->getCheck( 'fileid' ) ) { + return $this->showImages( $request ); } } - function success( $request ) { + private function success( $request ) { global $wgOut; - $wgOut->addWikiText( 'woo' ); + + $wgOut->setPagetitle( wfMsgHtml( 'actioncomplete' ) ); + # Give a link to the log for this page + $logtitle = SpecialPage::getTitleFor( 'Log' ); + $loglink = $this->skin->makeKnownLinkObj( $logtitle, wfMsgHtml( 'viewpagelogs' ), + wfArrayToCGI( array('page' => $this->target ) ) ); + # Give a link to the page history + $histlink = $this->skin->makeKnownLinkObj( $this->title, wfMsgHtml( 'pagehist' ), + wfArrayToCGI( array('action' => 'history' ) ) ); + # Link to deleted edits + $undelete = SpecialPage::getTitleFor( 'Undelete' ); + $dellink = $this->skin->makeKnownLinkObj( $undelete, wfMsgHtml( 'deletedhist' ), + wfArrayToCGI( array('target' => $this->target) ) ); + # Logs themselves don't have histories or archived revisions + if( !is_null($this->title) && $this->title->getNamespace() > -1) + $wgOut->setSubtitle( '

    '.$histlink.' / '.$loglink.' / '.$dellink.'

    ' ); + + if( $this->deleteKey=='logid' ) { + $wgOut->addWikiText( wfMsgHtml('logdelete-success'), false ); + $this->showLogItems( $request ); + } else if( $this->deleteKey=='oldid' || $this->deleteKey=='artimestamp' ) { + $wgOut->addWikiText( wfMsgHtml('revdelete-success'), false ); + $this->showRevs( $request ); + } else if( $this->deleteKey=='fileid' ) { + $wgOut->addWikiText( wfMsgHtml('revdelete-success'), false ); + $this->showImages( $request ); + } else if( $this->deleteKey=='oldimage' ) { + $this->showImages( $request ); + } } /** @@ -155,7 +713,7 @@ class RevisionDeleteForm { * @param WebRequest $request * @return int */ - function extractBitfield( $request ) { + private function extractBitfield( $request ) { $bitfield = 0; foreach( $this->checks as $item ) { list( /* message */ , $name, $field ) = $item; @@ -166,10 +724,25 @@ class RevisionDeleteForm { return $bitfield; } - function save( $bitfield, $reason ) { + private function save( $bitfield, $reason, $title ) { $dbw = wfGetDB( DB_MASTER ); + // Don't allow simply locking the interface for no reason + if( $bitfield == Revision::DELETED_RESTRICTED ) { + $bitfield = 0; + } $deleter = new RevisionDeleter( $dbw ); - $deleter->setVisibility( $this->revisions, $bitfield, $reason ); + // By this point, only one of the below should be set + if( isset($this->revisions) ) { + return $deleter->setRevVisibility( $title, $this->revisions, $bitfield, $reason ); + } else if( isset($this->archrevs) ) { + return $deleter->setArchiveVisibility( $title, $this->archrevs, $bitfield, $reason ); + } else if( isset($this->ofiles) ) { + return $deleter->setOldImgVisibility( $title, $this->ofiles, $bitfield, $reason ); + } else if( isset($this->afiles) ) { + return $deleter->setArchFileVisibility( $title, $this->afiles, $bitfield, $reason ); + } else if( isset($this->events) ) { + return $deleter->setEventVisibility( $this->events, $bitfield, $reason ); + } } } @@ -179,43 +752,463 @@ class RevisionDeleteForm { */ class RevisionDeleter { function __construct( $db ) { - $this->db = $db; + $this->dbw = $db; } /** + * @param $title, the page these events apply to * @param array $items list of revision ID numbers * @param int $bitfield new rev_deleted value * @param string $comment Comment for log records */ - function setVisibility( $items, $bitfield, $comment ) { - $pages = array(); + function setRevVisibility( $title, $items, $bitfield, $comment ) { + global $wgOut; + $userAllowedAll = $success = true; + $revIDs = array(); + $revCount = 0; + // Run through and pull all our data in one query + foreach( $items as $revid ) { + $where[] = intval($revid); + } + $whereClause = 'rev_id IN(' . implode(',',$where) . ')'; + $result = $this->dbw->select( 'revision', '*', + array( 'rev_page' => $title->getArticleID(), + $whereClause ), + __METHOD__ ); + while( $row = $this->dbw->fetchObject( $result ) ) { + $revObjs[$row->rev_id] = new Revision( $row ); + } // To work! foreach( $items as $revid ) { - $rev = Revision::newFromId( $revid ); - if( !isset( $rev ) ) { - return false; + if( !isset($revObjs[$revid]) || $revObjs[$revid]->isCurrent() ) { + $success = false; + continue; // Must exist + } else if( !$revObjs[$revid]->userCan(Revision::DELETED_RESTRICTED) ) { + $userAllowedAll=false; + continue; + } + // For logging, maintain a count of revisions + if( $revObjs[$revid]->mDeleted != $bitfield ) { + $revCount++; + $revIDs[]=$revid; + + $this->updateRevision( $revObjs[$revid], $bitfield ); + $this->updateRecentChangesEdits( $revObjs[$revid], $bitfield, false ); + } + } + // Clear caches... + // Don't log or touch if nothing changed + if( $revCount > 0 ) { + $this->updateLog( $title, $revCount, $bitfield, $revObjs[$revid]->mDeleted, + $comment, $title, 'oldid', $revIDs ); + $this->updatePage( $title ); + } + // Where all revs allowed to be set? + if( !$userAllowedAll ) { + //FIXME: still might be confusing??? + $wgOut->permissionRequired( 'hiderevision' ); + return false; + } + + return $success; + } + + /** + * @param $title, the page these events apply to + * @param array $items list of revision ID numbers + * @param int $bitfield new rev_deleted value + * @param string $comment Comment for log records + */ + function setArchiveVisibility( $title, $items, $bitfield, $comment ) { + global $wgOut; + + $userAllowedAll = $success = true; + $count = 0; + $Id_set = array(); + // Run through and pull all our data in one query + foreach( $items as $timestamp ) { + $where[] = $this->dbw->addQuotes( $timestamp ); + } + $whereClause = 'ar_timestamp IN(' . implode(',',$where) . ')'; + $result = $this->dbw->select( 'archive', '*', + array( 'ar_namespace' => $title->getNamespace(), + 'ar_title' => $title->getDBKey(), + $whereClause ), + __METHOD__ ); + while( $row = $this->dbw->fetchObject( $result ) ) { + $revObjs[$row->ar_timestamp] = new Revision( array( + 'page' => $title->getArticleId(), + 'id' => $row->ar_rev_id, + 'text' => $row->ar_text_id, + 'comment' => $row->ar_comment, + 'user' => $row->ar_user, + 'user_text' => $row->ar_user_text, + 'timestamp' => $row->ar_timestamp, + 'minor_edit' => $row->ar_minor_edit, + 'text_id' => $row->ar_text_id, + 'deleted' => $row->ar_deleted, + 'len' => $row->ar_len) ); + } + // To work! + foreach( $items as $timestamp ) { + // This will only select the first revision with this timestamp. + // Since they are all selected/deleted at once, we can just check the + // permissions of one. UPDATE is done via timestamp, so all revs are set. + if( !is_object($revObjs[$timestamp]) ) { + $success = false; + continue; // Must exist + } else if( !$revObjs[$timestamp]->userCan(Revision::DELETED_RESTRICTED) ) { + $userAllowedAll=false; + continue; + } + // Which revisions did we change anything about? + if( $revObjs[$timestamp]->mDeleted != $bitfield ) { + $Id_set[]=$timestamp; + $count++; + + $this->updateArchive( $revObjs[$timestamp], $bitfield ); + } + } + // For logging, maintain a count of revisions + if( $count > 0 ) { + $this->updateLog( $title, $count, $bitfield, $revObjs[$timestamp]->mDeleted, + $comment, $title, 'artimestamp', $Id_set ); + } + // Where all revs allowed to be set? + if( !$userAllowedAll ) { + $wgOut->permissionRequired( 'hiderevision' ); + return false; + } + + return $success; + } + + /** + * @param $title, the page these events apply to + * @param array $items list of revision ID numbers + * @param int $bitfield new rev_deleted value + * @param string $comment Comment for log records + */ + function setOldImgVisibility( $title, $items, $bitfield, $comment ) { + global $wgOut; + + $userAllowedAll = $success = true; + $count = 0; + $set = array(); + // Run through and pull all our data in one query + foreach( $items as $timestamp ) { + $where[] = $this->dbw->addQuotes( $timestamp.'!'.$title->getDbKey() ); + } + $whereClause = 'oi_archive_name IN(' . implode(',',$where) . ')'; + $result = $this->dbw->select( 'oldimage', '*', + array( 'oi_name' => $title->getDbKey(), + $whereClause ), + __METHOD__ ); + while( $row = $this->dbw->fetchObject( $result ) ) { + $filesObjs[$row->oi_archive_name] = RepoGroup::singleton()->getLocalRepo()->newFileFromRow( $row ); + $filesObjs[$row->oi_archive_name]->user = $row->oi_user; + $filesObjs[$row->oi_archive_name]->user_text = $row->oi_user_text; + } + // To work! + foreach( $items as $timestamp ) { + $archivename = $timestamp.'!'.$title->getDbKey(); + if( !isset($filesObjs[$archivename]) ) { + $success = false; + continue; // Must exist + } else if( !$filesObjs[$archivename]->userCan(File::DELETED_RESTRICTED) ) { + $userAllowedAll=false; + continue; } - $this->updateRevision( $rev, $bitfield ); - $this->updateRecentChanges( $rev, $bitfield ); - // For logging, maintain a count of revisions per page - $pageid = $rev->getPage(); - if( isset( $pages[$pageid] ) ) { - $pages[$pageid]++; + $transaction = true; + // Which revisions did we change anything about? + if( $filesObjs[$archivename]->deleted != $bitfield ) { + $count++; + + $this->dbw->begin(); + $this->updateOldFiles( $filesObjs[$archivename], $bitfield ); + // If this image is currently hidden... + if( $filesObjs[$archivename]->deleted & File::DELETED_FILE ) { + if( $bitfield & File::DELETED_FILE ) { + # Leave it alone if we are not changing this... + $set[]=$archivename; + $transaction = true; + } else { + # We are moving this out + $transaction = $this->makeOldImagePublic( $filesObjs[$archivename] ); + $set[]=$transaction; + } + // Is it just now becoming hidden? + } else if( $bitfield & File::DELETED_FILE ) { + $transaction = $this->makeOldImagePrivate( $filesObjs[$archivename] ); + $set[]=$transaction; + } else { + $set[]=$timestamp; + } + // If our file operations fail, then revert back the db + if( $transaction==false ) { + $this->dbw->rollback(); + return false; + } + $this->dbw->commit(); + } + } + + // Log if something was changed + if( $count > 0 ) { + $this->updateLog( $title, $count, $bitfield, $filesObjs[$archivename]->deleted, + $comment, $title, 'oldimage', $set ); + # Purge page/history + $file = wfLocalFile( $title ); + $file->purgeCache(); + $file->purgeHistory(); + # Invalidate cache for all pages using this file + $update = new HTMLCacheUpdate( $title, 'imagelinks' ); + $update->doUpdate(); + } + // Where all revs allowed to be set? + if( !$userAllowedAll ) { + $wgOut->permissionRequired( 'hiderevision' ); + return false; + } + + return $success; + } + + /** + * @param $title, the page these events apply to + * @param array $items list of revision ID numbers + * @param int $bitfield new rev_deleted value + * @param string $comment Comment for log records + */ + function setArchFileVisibility( $title, $items, $bitfield, $comment ) { + global $wgOut; + + $userAllowedAll = $success = true; + $count = 0; + $Id_set = array(); + + // Run through and pull all our data in one query + foreach( $items as $id ) { + $where[] = intval($id); + } + $whereClause = 'fa_id IN(' . implode(',',$where) . ')'; + $result = $this->dbw->select( 'filearchive', '*', + array( 'fa_name' => $title->getDbKey(), + $whereClause ), + __METHOD__ ); + while( $row = $this->dbw->fetchObject( $result ) ) { + $filesObjs[$row->fa_id] = ArchivedFile::newFromRow( $row ); + } + // To work! + foreach( $items as $fileid ) { + if( !isset($filesObjs[$fileid]) ) { + $success = false; + continue; // Must exist + } else if( !$filesObjs[$fileid]->userCan(File::DELETED_RESTRICTED) ) { + $userAllowedAll=false; + continue; + } + // Which revisions did we change anything about? + if( $filesObjs[$fileid]->deleted != $bitfield ) { + $Id_set[]=$fileid; + $count++; + + $this->updateArchFiles( $filesObjs[$fileid], $bitfield ); + } + } + // Log if something was changed + if( $count > 0 ) { + $this->updateLog( $title, $count, $bitfield, $comment, + $filesObjs[$fileid]->deleted, $title, 'fileid', $Id_set ); + } + // Where all revs allowed to be set? + if( !$userAllowedAll ) { + $wgOut->permissionRequired( 'hiderevision' ); + return false; + } + + return $success; + } + + /** + * @param array $items list of log ID numbers + * @param int $bitfield new log_deleted value + * @param string $comment Comment for log records + */ + function setEventVisibility( $items, $bitfield, $comment ) { + global $wgOut; + + $userAllowedAll = $success = true; + $logs_count = array(); + $logs_Ids = array(); + + // Run through and pull all our data in one query + foreach( $items as $logid ) { + $where[] = intval($logid); + } + $whereClause = 'log_id IN(' . implode(',',$where) . ')'; + $result = $this->dbw->select( 'logging', '*', + array( $whereClause ), + __METHOD__ ); + while( $row = $this->dbw->fetchObject( $result ) ) { + $logRows[$row->log_id] = $row; + } + // To work! + foreach( $items as $logid ) { + if( !isset($logRows[$logid]) ) { + $success = false; + continue; // Must exist + } else if( !LogPage::userCan($logRows[$logid], Revision::DELETED_RESTRICTED) + || $logRows[$logid]->log_type=='oversight' ) { + // Don't hide from oversight log!!! + $userAllowedAll=false; + continue; + } + $logtype = $logRows[$logid]->log_type; + // For logging, maintain a count of events per log type + if( !isset( $logs_count[$logtype] ) ) { + $logs_count[$logtype]=0; + $logs_Ids[$logtype]=array(); + } + // Which logs did we change anything about? + if( $logRows[$logid]->log_deleted != $bitfield ) { + $logs_Ids[$logtype][]=$logid; + $logs_count[$logtype]++; + + $this->updateLogs( $logRows[$logid], $bitfield ); + $this->updateRecentChangesLog( $logRows[$logid], $bitfield, true ); + } + } + foreach( $logs_count as $logtype => $count ) { + // Don't log or touch if nothing changed + if( $count > 0 ) { + $target = SpecialPage::getTitleFor( 'Log', $logtype ); + $this->updateLog( $target, $count, $bitfield, $logRows[$logid]->log_deleted, + $comment, $target, 'logid', $logs_Ids[$logtype] ); + } + } + // Where all revs allowed to be set? + if( !$userAllowedAll ) { + $wgOut->permissionRequired( 'hiderevision' ); + return false; + } + + return $success; + } + + /** + * Moves an image to a safe private location + * Caller is responsible for clearing caches + * @param File $oimage + * @returns mixed, timestamp string on success, false on failure + */ + function makeOldImagePrivate( $oimage ) { + global $wgFileStore, $wgUseSquid; + + $transaction = new FSTransaction(); + if( !FileStore::lock() ) { + wfDebug( __METHOD__.": failed to acquire file store lock, aborting\n" ); + return false; + } + $oldpath = $oimage->getArchivePath() . DIRECTORY_SEPARATOR . $oimage->archive_name; + // Dupe the file into the file store + if( file_exists( $oldpath ) ) { + // Is our directory configured? + if( $store = FileStore::get( 'deleted' ) ) { + if( !$oimage->sha1 ) { + $oimage->upgradeRow(); // sha1 may be missing + } + $key = $oimage->sha1 . '.' . $oimage->getExtension(); + $transaction->add( $store->insert( $key, $oldpath, FileStore::DELETE_ORIGINAL ) ); } else { - $pages[$pageid] = 1; + $group = null; + $key = null; + $transaction = false; // Return an error and do nothing } + } else { + wfDebug( __METHOD__." deleting already-missing '$oldpath'; moving on to database\n" ); + $group = null; + $key = ''; + $transaction = new FSTransaction(); // empty + } + + if( $transaction === false ) { + // Fail to restore? + wfDebug( __METHOD__.": import to file store failed, aborting\n" ); + throw new MWException( "Could not archive and delete file $oldpath" ); + return false; } - // Clear caches... - foreach( $pages as $pageid => $count ) { - $title = Title::newFromId( $pageid ); - $this->updatePage( $title ); - $this->updateLog( $title, $count, $bitfield, $comment ); + wfDebug( __METHOD__.": set db items, applying file transactions\n" ); + $transaction->commit(); + FileStore::unlock(); + + $m = explode('!',$oimage->archive_name,2); + $timestamp = $m[0]; + + return $timestamp; + } + + /** + * Moves an image from a safe private location + * Caller is responsible for clearing caches + * @param File $oimage + * @returns mixed, string timestamp on success, false on failure + */ + function makeOldImagePublic( $oimage ) { + global $wgFileStore; + + $transaction = new FSTransaction(); + if( !FileStore::lock() ) { + wfDebug( __METHOD__." could not acquire filestore lock\n" ); + return false; + } + + $store = FileStore::get( 'deleted' ); + if( !$store ) { + wfDebug( __METHOD__.": skipping row with no file.\n" ); + return false; + } + + $key = $oimage->sha1.'.'.$oimage->getExtension(); + $destDir = $oimage->getArchivePath(); + if( !is_dir( $destDir ) ) { + wfMkdirParents( $destDir ); + } + $destPath = $destDir . DIRECTORY_SEPARATOR . $oimage->archive_name; + // Check if any other stored revisions use this file; + // if so, we shouldn't remove the file from the hidden + // archives so they will still work. Check hidden files first. + $useCount = $this->dbw->selectField( 'oldimage', '1', + array( 'oi_sha1' => $oimage->sha1, + 'oi_deleted & '.File::DELETED_FILE => File::DELETED_FILE ), + __METHOD__, array( 'FOR UPDATE' ) ); + // Check the rest of the deleted archives too. + // (these are the ones that don't show in the image history) + if( !$useCount ) { + $useCount = $this->dbw->selectField( 'filearchive', '1', + array( 'fa_storage_group' => 'deleted', 'fa_storage_key' => $key ), + __METHOD__, array( 'FOR UPDATE' ) ); + } + + if( $useCount == 0 ) { + wfDebug( __METHOD__.": nothing else using {$oimage->sha1}, will deleting after\n" ); + $flags = FileStore::DELETE_ORIGINAL; + } else { + $flags = 0; } + $transaction->add( $store->export( $key, $destPath, $flags ) ); + + wfDebug( __METHOD__.": set db items, applying file transactions\n" ); + $transaction->commit(); + FileStore::unlock(); - return true; + $m = explode('!',$oimage->archive_name,2); + $timestamp = $m[0]; + + return $timestamp; } /** @@ -224,25 +1217,83 @@ class RevisionDeleter { * @param int $bitfield new rev_deleted bitfield value */ function updateRevision( $rev, $bitfield ) { - $this->db->update( 'revision', + $this->dbw->update( 'revision', array( 'rev_deleted' => $bitfield ), array( 'rev_id' => $rev->getId() ), __METHOD__ ); } + /** + * Update the revision's rev_deleted field + * @param Revision $rev + * @param int $bitfield new rev_deleted bitfield value + */ + function updateArchive( $rev, $bitfield ) { + $this->dbw->update( 'archive', + array( 'ar_deleted' => $bitfield ), + array( 'ar_rev_id' => $rev->getId() ), + __METHOD__ ); + } + + /** + * Update the images's oi_deleted field + * @param File $oimage + * @param int $bitfield new rev_deleted bitfield value + */ + function updateOldFiles( $oimage, $bitfield ) { + $this->dbw->update( 'oldimage', + array( 'oi_deleted' => $bitfield ), + array( 'oi_archive_name' => $oimage->archive_name ), + __METHOD__ ); + } + + /** + * Update the images's fa_deleted field + * @param ArchivedFile $file + * @param int $bitfield new rev_deleted bitfield value + */ + function updateArchFiles( $file, $bitfield ) { + $this->dbw->update( 'filearchive', + array( 'fa_deleted' => $bitfield ), + array( 'fa_id' => $file->getID() ), + __METHOD__ ); + } + + /** + * Update the logging log_deleted field + * @param Row $row + * @param int $bitfield new rev_deleted bitfield value + */ + function updateLogs( $row, $bitfield ) { + $this->dbw->update( 'logging', + array( 'log_deleted' => $bitfield ), + array( 'log_id' => $row->log_id ), + __METHOD__ ); + } + /** * Update the revision's recentchanges record if fields have been hidden * @param Revision $rev * @param int $bitfield new rev_deleted bitfield value */ - function updateRecentChanges( $rev, $bitfield ) { - $this->db->update( 'recentchanges', - array( - 'rc_user' => ($bitfield & Revision::DELETED_USER) ? 0 : $rev->getUser(), - 'rc_user_text' => ($bitfield & Revision::DELETED_USER) ? wfMsg( 'rev-deleted-user' ) : $rev->getUserText(), - 'rc_comment' => ($bitfield & Revision::DELETED_COMMENT) ? wfMsg( 'rev-deleted-comment' ) : $rev->getComment() ), - array( - 'rc_this_oldid' => $rev->getId() ), + function updateRecentChangesEdits( $rev, $bitfield ) { + $this->dbw->update( 'recentchanges', + array( 'rc_deleted' => $bitfield, + 'rc_patrolled' => 1 ), + array( 'rc_this_oldid' => $rev->getId() ), + __METHOD__ ); + } + + /** + * Update the revision's recentchanges record if fields have been hidden + * @param Row $row + * @param int $bitfield new rev_deleted bitfield value + */ + function updateRecentChangesLog( $row, $bitfield ) { + $this->dbw->update( 'recentchanges', + array( 'rc_deleted' => $bitfield, + 'rc_patrolled' => 1 ), + array( 'rc_logid' => $row->log_id ), __METHOD__ ); } @@ -254,21 +1305,39 @@ class RevisionDeleter { */ function updatePage( $title ) { $title->invalidateCache(); + $title->purgeSquid(); + + // Extensions that require referencing previous revisions may need this + wfRunHooks( 'ArticleRevisionVisiblitySet', array( &$title ) ); } /** * Record a log entry on the action - * @param Title $title + * @param Title $title, page where item was removed from * @param int $count the number of revisions altered for this page - * @param int $bitfield the new rev_deleted value + * @param int $nbitfield the new _deleted value + * @param int $obitfield the old _deleted value * @param string $comment + * @param Title $target, the relevant page + * @param string $param, URL param + * @param Array $items */ - function updateLog( $title, $count, $bitfield, $comment ) { - $log = new LogPage( 'delete' ); - $reason = "changed $count revisions to $bitfield"; - $reason .= ": $comment"; - $log->addEntry( 'revision', $title, $reason ); + function updateLog( $title, $count, $nbitfield, $obitfield, $comment, $target, $param, $items = array() ) { + // Put things hidden from sysops in the oversight log + $logtype = ( ($nbitfield | $obitfield) & Revision::DELETED_RESTRICTED ) ? 'oversight' : 'delete'; + $log = new LogPage( $logtype ); + // FIXME: do this better + if( $param=='logid' ) { + $params = array( implode( ',', $items) ); + $reason = wfMsgExt('logdelete-logaction', array('parsemag'), $count, $nbitfield ); + if($comment) $reason .= ": $comment"; + $log->addEntry( 'event', $title, $reason, $params ); + } else { + // Add params for effected page and ids + $params = array( $target->getPrefixedText(), $param, implode( ',', $items) ); + $reason = wfMsgExt('revdelete-logaction', array('parsemag'), $count, $nbitfield ); + if($comment) $reason .= ": $comment"; + $log->addEntry( 'revision', $title, $reason, $params ); + } } } - - -- 2.20.1