$dbr = wfGetDB( DB_SLAVE );
return self::listPages( $dbr, '' );
}
-
+
/**
* List deleted pages recorded in the archive table matching the
* given title prefix.
*/
public static function listPagesByPrefix( $prefix ) {
$dbr = wfGetDB( DB_SLAVE );
-
+
$title = Title::newFromText( $prefix );
if( $title ) {
$ns = $title->getNamespace();
)
);
}
-
+
/**
* List the revisions of the given page. Returns result wrapper with
* (ar_minor_edit, ar_timestamp, ar_user, ar_user_text, ar_comment) fields.
$ret = $dbr->resultObject( $res );
return $ret;
}
-
+
/**
* List the deleted file revisions for this page, if it's a file page.
* Returns a result wrapper with various filearchive fields, or null
return null;
}
}
-
+
/**
* Return the most-previous revision, either live or deleted, against
* the deleted revision given by timestamp.
*/
function getPreviousRevision( $timestamp ) {
$dbr = wfGetDB( DB_SLAVE );
-
+
// Check the previous deleted revision...
$row = $dbr->selectRow( 'archive',
'ar_timestamp',
'ORDER BY' => 'ar_timestamp DESC',
'LIMIT' => 1 ) );
$prevDeleted = $row ? wfTimestamp( TS_MW, $row->ar_timestamp ) : false;
-
+
$row = $dbr->selectRow( array( 'page', 'revision' ),
array( 'rev_id', 'rev_timestamp' ),
array(
'LIMIT' => 1 ) );
$prevLive = $row ? wfTimestamp( TS_MW, $row->rev_timestamp ) : false;
$prevLiveId = $row ? intval( $row->rev_id ) : null;
-
+
if( $prevLive && $prevLive > $prevDeleted ) {
// Most prior revision was live
return Revision::newFromId( $prevLiveId );
// If both the set of text revisions and file revisions are empty,
// restore everything. Otherwise, just restore the requested items.
$restoreAll = empty( $timestamps ) && empty( $fileVersions );
-
+
$restoreText = $restoreAll || !empty( $timestamps );
$restoreFiles = $restoreAll || !empty( $fileVersions );
-
+
if( $restoreFiles && $this->title->getNamespace() == NS_IMAGE ) {
$img = wfLocalFile( $this->title );
$this->fileStatus = $img->restore( $fileVersions, $unsuppress );
} else {
$filesRestored = 0;
}
-
+
if( $restoreText ) {
$textRestored = $this->undeleteRevisions( $timestamps, $unsuppress );
if($textRestored === false) // It must be one of UNDELETE_*
// Touch the log!
global $wgContLang;
$log = new LogPage( 'delete' );
-
+
if( $textRestored && $filesRestored ) {
$reason = wfMsgExt( 'undeletedrevisions-files', array( 'content', 'parsemag' ),
$wgContLang->formatNum( $textRestored ),
wfDebug( "Undelete: nothing undeleted...\n" );
return false;
}
-
+
if( trim( $comment ) != '' )
$reason .= ": {$comment}";
$log->addEntry( 'restore', $this->title, $reason );
return array($textRestored, $filesRestored, $reason);
}
-
+
/**
* This is the meaty bit -- restores archived revisions of the given page
* to the cur/old tables. If the page currently exists, all revisions will
if ( wfReadOnly() )
return false;
$restoreAll = empty( $timestamps );
-
+
$dbw = wfGetDB( DB_MASTER );
# Does this page already exist? We'll have to update it...
'ORDER BY' => 'ar_timestamp' )
);
$ret = $dbw->resultObject( $result );
-
- $rev_count = $dbw->numRows( $result );
+
+ $rev_count = $dbw->numRows( $result );
if( $rev_count ) {
# We need to seek around as just using DESC in the ORDER BY
# would leave the revisions inserted in the wrong order
}
$ret->seek( 0 );
}
-
+
if( $makepage ) {
$newid = $article->insertOn( $dbw );
$pageId = $newid;
$revision = null;
$restored = 0;
-
+
while( $row = $ret->fetchObject() ) {
if( $row->ar_text_id ) {
// Revision was deleted in 1.5+; text is in
) );
$revision->insertOn( $dbw );
$restored++;
-
+
wfRunHooks( 'ArticleRevisionUndeleted', array( &$this->title, $revision, $row->ar_page_id ) );
}
// Was anything restored at all?
$time = $request->getVal( 'timestamp' );
$this->mTimestamp = $time ? wfTimestamp( TS_MW, $time ) : '';
$this->mFile = $request->getVal( 'file' );
-
+
$posted = $request->wasPosted() &&
$wgUser->matchEditToken( $request->getVal( 'wpEditToken' ) );
$this->mRestore = $request->getCheck( 'restore' ) && $posted;
$this->mPreview = $request->getCheck( 'preview' ) && $posted;
$this->mDiff = $request->getCheck( 'diff' );
$this->mComment = $request->getText( 'wpComment' );
- $this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $wgUser->isAllowed( 'oversight' );
-
+ $this->mUnsuppress = $request->getVal( 'wpUnsuppress' ) && $wgUser->isAllowed( 'suppress' );
+
if( $par != "" ) {
$this->mTarget = $par;
}
if( preg_match( '/^ts(\d{14})$/', $key, $matches ) ) {
array_push( $timestamps, $matches[1] );
}
-
+
if( preg_match( '/^fileid(\d+)$/', $key, $matches ) ) {
$this->mFileVersions[] = intval( $matches[1] );
}
} else {
$wgOut->setPagetitle( wfMsg( "viewdeletedpage" ) );
}
-
+
if( is_null( $this->mTargetObj ) ) {
# Not all users can just browse every deleted page from the list
if( $wgUser->isAllowed( 'browsearchive' ) ) {
$file = new ArchivedFile( $this->mTargetObj, '', $this->mFile );
// Check if user is allowed to see this file
if( !$file->userCan( File::DELETED_FILE ) ) {
- $wgOut->permissionRequired( 'hiderevision' );
+ $wgOut->permissionRequired( 'hiderevision' );
return false;
} else {
return $this->showFile( $this->mFile );
function showSearchForm() {
global $wgOut, $wgScript;
$wgOut->addWikiMsg( 'undelete-header' );
-
+
$wgOut->addHtml(
Xml::openElement( 'form', array(
'method' => 'get',
// Generic list of deleted pages
private function showList( $result ) {
global $wgLang, $wgContLang, $wgUser, $wgOut;
-
+
if( $result->numRows() == 0 ) {
$wgOut->addWikiMsg( 'undelete-no-results' );
return;
$wgOut->addHTML( "<ul>\n" );
while( $row = $result->fetchObject() ) {
$title = Title::makeTitleSafe( $row->ar_namespace, $row->ar_title );
- $link = $sk->makeKnownLinkObj( $undelete, htmlspecialchars( $title->getPrefixedText() ),
+ $link = $sk->makeKnownLinkObj( $undelete, htmlspecialchars( $title->getPrefixedText() ),
'target=' . $title->getPrefixedUrl() );
#$revs = wfMsgHtml( 'undeleterevisions', $wgLang->formatNum( $row->count ) );
$revs = wfMsgExt( 'undeleterevisions',
$archive = new PageArchive( $this->mTargetObj );
$rev = $archive->getRevision( $timestamp );
-
+
if( !$rev ) {
$wgOut->addWikiMsg( 'undeleterevision-missing' );
return;
}
-
+
if( $rev->isDeleted(Revision::DELETED_TEXT) ) {
if( !$rev->userCan(Revision::DELETED_TEXT) ) {
$wgOut->addWikiText( wfMsg( 'rev-deleted-text-permission' ) );
// and we are allowed to see...
}
}
-
+
$wgOut->setPageTitle( wfMsg( 'undeletepage' ) );
-
+
$link = $skin->makeKnownLinkObj(
SpecialPage::getTitleFor( 'Undelete', $this->mTargetObj->getPrefixedDBkey() ),
htmlspecialchars( $this->mTargetObj->getPrefixedText() )
$wgOut->addHtml( wfMsgHtml( 'undelete-nodiff' ) );
}
}
-
+
$wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user ) . '</p>' );
-
+
wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) );
-
+
if( $this->mPreview ) {
$wgOut->addHtml( "<hr />\n" );
+
+ //Hide [edit]s
+ $popts = $wgOut->parserOptions();
+ $popts->setEditSection( false );
+ $wgOut->parserOptions( $popts );
$wgOut->addWikiTextTitleTidy( $rev->revText(), $this->mTargetObj, false );
}
wfCloseElement( 'form' ) .
wfCloseElement( 'div' ) );
}
-
+
/**
* Build a diff display between this and the previous either deleted
* or non-deleted edit.
*/
function showDiff( $previousRev, $currentRev ) {
global $wgOut, $wgUser;
-
+
$diffEngine = new DifferenceEngine();
$diffEngine->showDiffStyle();
$wgOut->addHtml(
"</div>\n" );
}
-
+
private function diffHeader( $rev ) {
global $wgUser, $wgLang, $wgLang;
$sk = $wgUser->getSkin();
$sk->revComment( $rev ) . '<br/>' .
'</div>';
}
-
+
/**
* 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
$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 );
}
private function showHistory() {
- global $wgLang, $wgContLang, $wgUser, $wgOut;
+ global $wgLang, $wgUser, $wgOut;
$sk = $wgUser->getSkin();
if( $this->mAllowed ) {
} else {
$wgOut->setPagetitle( wfMsg( 'viewdeletedpage' ) );
}
-
+
$wgOut->addWikiText( wfMsgHtml( 'undeletepagetitle', $this->mTargetObj->getPrefixedText()) );
$archive = new PageArchive( $this->mTargetObj );
# Show relevant lines from the deletion log:
$wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) . "\n" );
- $logViewer = new LogViewer(
- new LogReader(
- new FauxRequest(
- array(
- 'page' => $this->mTargetObj->getPrefixedText(),
- 'type' => 'delete'
- )
- )
- ), LogViewer::NO_ACTION_LINK
- );
- $logViewer->showList( $wgOut );
+ LogEventsList::showLogExtract( $wgOut, 'delete', $this->mTargetObj->getPrefixedText() );
if( $this->mAllowed && ( $haveRevisions || $haveFiles ) ) {
# Format the user-visible controls (comment field, submission button)
# in a nice little table
- $align = $wgContLang->isRtl() ? 'left' : 'right';
+ if( $wgUser->isAllowed( 'suppress' ) ) {
+ $unsuppressBox =
+ "<tr>
+ <td> </td>
+ <td class='mw-input'>" .
+ Xml::checkLabel( wfMsg('revdelete-unsuppress'), 'wpUnsuppress',
+ 'mw-undelete-unsupress', $this->mUnsuppress ).
+ "</td>
+ </tr>";
+ } else {
+ $unsuppressBox = "";
+ }
$table =
Xml::openElement( 'fieldset' ) .
Xml::element( 'legend', null, wfMsg( 'undelete') ).
"</td>
</tr>
<tr>
- <td align='$align'>" .
+ <td class='mw-label'>" .
Xml::label( wfMsg( 'undeletecomment' ), 'wpComment' ) .
"</td>
- <td>" .
- Xml::input( 'wpComment', 50, $this->mComment ) .
+ <td class='mw-input'>" .
+ Xml::input( 'wpComment', 50, $this->mComment, array( 'id' => 'wpComment' ) ) .
"</td>
</tr>
<tr>
<td> </td>
- <td>" .
+ <td class='mw-submit'>" .
Xml::submitButton( wfMsg( 'undeletebtn' ), array( 'name' => 'restore', 'id' => 'mw-undelete-submit' ) ) .
Xml::element( 'input', array( 'type' => 'reset', 'value' => wfMsg( 'undeletereset' ), 'id' => 'mw-undelete-reset' ) ) .
"</td>
- </tr>
- <tr>
- <td> </td>
- <td>" .
- Xml::check( 'wpUnsuppress', $this->mUnsuppress, array('id' => 'mw-undelete-unsupress') ) . ' ' .
- Xml::label( wfMsgHtml('revdelete-unsuppress'), 'mw-undelete-unsupress' ) .
- "</td>
</tr>" .
+ $unsuppressBox .
Xml::closeElement( 'table' ) .
Xml::closeElement( 'fieldset' );
private function formatRevisionRow( $row, $earliestLiveTime, $remaining, $sk ) {
global $wgUser, $wgLang;
-
+
$rev = new Revision( array(
'page' => $this->mTargetObj->getArticleId(),
'comment' => $row->ar_comment,
'timestamp' => $row->ar_timestamp,
'minor_edit' => $row->ar_minor_edit,
'deleted' => $row->ar_deleted,
- 'len' => $row->ar_len) );
-
+ 'len' => $row->ar_len ) );
+
$stxt = '';
-
+ $ts = wfTimestamp( TS_MW, $row->ar_timestamp );
if( $this->mAllowed ) {
- $ts = wfTimestamp( TS_MW, $row->ar_timestamp );
$checkBox = Xml::check( "ts$ts" );
$titleObj = SpecialPage::getTitleFor( "Undelete" );
$pageLink = $this->getPageLink( $rev, $titleObj, $ts, $sk );
if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
$last = wfMsgHtml('diff');
} else if( $remaining > 0 || ($earliestLiveTime && $ts > $earliestLiveTime) ) {
- $last = $sk->makeKnownLinkObj( $titleObj, wfMsgHtml('diff'),
+ $last = $sk->makeKnownLinkObj( $titleObj, wfMsgHtml('diff'),
"target=" . $this->mTargetObj->getPrefixedUrl() . "×tamp=$ts&diff=prev" );
} else {
$last = wfMsgHtml('diff');
} else {
$checkBox = '';
$pageLink = $wgLang->timeanddate( $ts, true );
+ $last = wfMsgHtml('diff');
}
$userLink = $sk->revUserTools( $rev );
-
+
if(!is_null($size = $row->ar_len)) {
if($size == 0)
$stxt = wfMsgHtml('historyempty');
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
// If revision was hidden from sysops
- $del = wfMsgHtml('rev-delundel');
+ $del = wfMsgHtml('rev-delundel');
} else {
$ts = wfTimestamp( TS_MW, $row->ar_timestamp );
$del = $sk->makeKnownLinkObj( $revdel,
}
$revdlink = "<tt>(<small>$del</small>)</tt>";
}
-
+
return "<li>$checkBox $revdlink ($last) $pageLink . . $userLink $stxt $comment</li>";
}
-
+
private function formatFileRow( $row, $sk ) {
global $wgUser, $wgLang;
-
+
$file = ArchivedFile::newFromRow( $row );
-
+
$ts = wfTimestamp( TS_MW, $row->fa_timestamp );
if( $this->mAllowed && $row->fa_storage_key ) {
$checkBox = Xml::check( "fileid" . $row->fa_id );
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
if( !$file->userCan(File::DELETED_RESTRICTED ) ) {
// If revision was hidden from sysops
- $del = $this->messages['rev-delundel'];
+ $del = wfMsgHtml('rev-delundel');
} else {
$del = $sk->makeKnownLinkObj( $revdel,
wfMsgHtml('rev-delundel'),
}
return "<li>$checkBox $revdlink $pageLink . . $userLink $data $comment</li>\n";
}
-
+
private function getEarliestTime( $title ) {
$dbr = wfGetDB( DB_SLAVE );
if( $title->exists() ) {
*/
function getPageLink( $rev, $titleObj, $ts, $sk ) {
global $wgLang;
-
+
if( !$rev->userCan(Revision::DELETED_TEXT) ) {
return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
} else {
- $link = $sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ),
+ $link = $sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ),
"target=".$this->mTargetObj->getPrefixedUrl()."×tamp=$ts" );
if( $rev->isDeleted(Revision::DELETED_TEXT) )
$link = '<span class="history-deleted">' . $link . '</span>';
return $link;
}
}
-
+
/**
* Fetch image view link if it's available to all users
* @return string
if( !$file->userCan(File::DELETED_FILE) ) {
return '<span class="history-deleted">' . $wgLang->timeanddate( $ts, true ) . '</span>';
} else {
- $link = $sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ),
+ $link = $sk->makeKnownLinkObj( $titleObj, $wgLang->timeanddate( $ts, true ),
"target=".$this->mTargetObj->getPrefixedUrl()."&file=$key" );
if( $file->isDeleted(File::DELETED_FILE) )
$link = '<span class="history-deleted">' . $link . '</span>';
* Fetch file's user id if it's available to this user
* @return string
*/
- function getFileUser( $file, $sk ) {
+ function getFileUser( $file, $sk ) {
if( !$file->userCan(File::DELETED_USER) ) {
return '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
} else {
- $link = $sk->userLink( $file->getRawUser(), $file->getRawUserText() ) .
+ $link = $sk->userLink( $file->getRawUser(), $file->getRawUserText() ) .
$sk->userToolLinks( $file->getRawUser(), $file->getRawUserText() );
if( $file->isDeleted(File::DELETED_USER) )
$link = '<span class="history-deleted">' . $link . '</span>';
if( is_array($ok) ) {
if ( $ok[1] ) // Undeleted file count
wfRunHooks( 'FileUndeleteComplete', array(
- $this->mTargetObj, $this->mFileVersions,
+ $this->mTargetObj, $this->mFileVersions,
$wgUser, $this->mComment) );
-
+
$skin = $wgUser->getSkin();
$link = $skin->makeKnownLinkObj( $this->mTargetObj );
$wgOut->addHtml( wfMsgWikiHtml( 'undeletedpage', $link ) );
dépôts / lhc / web / wiklou.git / blobdiff