* Remove deprecated $wgOnlySysopsCanPatrol references; use User::isAllowed( 'patrol...

[lhc/web/wiklou.git] / includes / SpecialContributions.php

diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 7a637af..f627ca6 100644 (file)
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -128,7 +128,7 @@ class contribs_finder {
                $use_index = $this->dbr->useIndexClause($index);
                $sql = "SELECT
                        page_namespace,page_title,page_is_new,page_latest,
-                       rev_id,rev_timestamp,rev_comment,rev_minor_edit,rev_user_text,
+                       rev_id,rev_page,rev_text_id,rev_timestamp,rev_comment,rev_minor_edit,rev_user,rev_user_text,
                        rev_deleted
                        FROM $page,$revision $use_index
                        WHERE page_id=rev_page AND $userCond $nscond $offsetQuery
@@ -155,8 +155,7 @@ class contribs_finder {
  * @param      string  $par    (optional) user name of the user for which to show the contributions
  */
 function wfSpecialContributions( $par = null ) {
-       global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest, $wgTitle,
-              $wgScript;
+       global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest, $wgTitle, $wgScript;
        $fname = 'wfSpecialContributions';
 
        $target = isset($par) ? $par : $wgRequest->getVal( 'target' );
@@ -194,16 +193,20 @@ function wfSpecialContributions( $par = null ) {
                $finder->set_namespace($ns);
        }
 
+       $boturl = '';
+       if ($wgUser->isAllowed('rollback') && $wgRequest->getBool( 'bot' ))
+               $boturl = '&bot=1';
+
        if ($wgRequest->getText('go') == 'prev') {
                $prevts = $finder->get_previous_offset_for_paging();
-               $prevurl = $title->getLocalURL($urlbits . "&offset=$prevts&limit=$limit$nsurl");
+               $prevurl = $title->getLocalURL($urlbits . "&offset=$prevts&limit=$limit$nsurl$boturl");
                $wgOut->redirect($prevurl);
                return;
        }
 
        if ($wgRequest->getText('go') == 'first' && $target != 'newbies') {
-                $prevts = $finder->get_first_offset_for_paging();
-               $prevurl = $title->getLocalURL($urlbits . "&offset=$prevts&limit=$limit$nsurl");
+               $prevts = $finder->get_first_offset_for_paging();
+               $prevurl = $title->getLocalURL($urlbits . "&offset=$prevts&limit=$limit$nsurl$boturl");
                $wgOut->redirect($prevurl);
                return;
        }
@@ -220,7 +223,14 @@ function wfSpecialContributions( $par = null ) {
        }
        $talk = $nt->getTalkPage();
        if( $talk ) {
-               $ul .= ' (' . $sk->makeLinkObj( $talk, $wgLang->getNsText( NS_TALK ) ) . ')';
+               $ul .= ' (' . $sk->makeLinkObj( $talk, $wgLang->getNsText( NS_TALK ) );
+               if( ( $id != 0 ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
+                       if( $wgUser->isAllowed( 'block' ) ) {
+                               $ul .= ' | ' . $sk->makeLinkObj( Title::makeTitle( NS_SPECIAL, 'Blockip/' . $nt->getText() ), wfMsgHtml( 'blocklink' ) );
+                       }
+                       $ul .= ' | ' . $sk->makeLinkObj( Title::makeTitle( NS_SPECIAL, 'Log' ), LogPage::logName( 'block' ), 'type=block&page=' . urlencode( $nt->getPrefixedText() ) );
+               }
+               $ul .= ')';
        }
 
        if ($target == 'newbies') {
@@ -252,6 +262,7 @@ function wfSpecialContributions( $par = null ) {
        $nsform .= '<p>';
        $nsform .= wfMsgHtml('namespace');
 
+       $nsform .= ' ';
        $nsform .= HTMLnamespaceselector( $ns, '' );
 
        $nsform .= wfElement('input', array(
@@ -274,8 +285,6 @@ function wfSpecialContributions( $par = null ) {
        $atstart = (!count($contribs) || $late == $contribs[0]->rev_timestamp);
        $atend = (!count($contribs) || $early == $lastts);
 
-       $lasturl = $wgTitle->escapeLocalURL("action=history&limit={$limit}");
-
        $firsttext = wfMsgHtml('histfirst');
        $lasttext = wfMsgHtml('histlast');
 
@@ -284,8 +293,8 @@ function wfSpecialContributions( $par = null ) {
                $lastlink = $lasttext;
                $prevlink = $prevtext;
        } else {
-               $lastlink = "<a href=\"$myurl&amp;limit=$limit$xnsurl\">$lasttext</a>";
-               $prevlink = "<a href=\"$myurl&amp;offset=$offset&amp;limit=$limit$xnsurl&amp;go=prev\">$prevtext</a>";
+               $lastlink = "<a href=\"$myurl&amp;limit=$limit$xnsurl$boturl\">$lasttext</a>";
+               $prevlink = "<a href=\"$myurl&amp;offset=$offset&amp;limit=$limit$xnsurl$boturl&amp;go=prev\">$prevtext</a>";
        }
 
        $nexttext = wfMsg('nextn', $limit);
@@ -293,18 +302,18 @@ function wfSpecialContributions( $par = null ) {
                $firstlink = $firsttext;
                $nextlink = $nexttext;
        } else {
-               $firstlink = "<a href=\"$myurl&amp;limit=$limit$xnsurl&amp;go=first\">$firsttext</a>";
-               $nextlink = "<a href=\"$myurl&amp;offset=$lastts&amp;limit=$limit$xnsurl\">$nexttext</a>";
+               $firstlink = "<a href=\"$myurl&amp;limit=$limit$xnsurl$boturl&amp;go=first\">$firsttext</a>";
+               $nextlink = "<a href=\"$myurl&amp;offset=$lastts&amp;limit=$limit$xnsurl$boturl\">$nexttext</a>";
+       }
+       if ($target == 'newbies') {
+               $firstlast ="($lastlink)";
+       } else {
+               $firstlast = "($lastlink | $firstlink)";
        }
-        if ($target == 'newbies') {
-            $firstlast ="($lastlink)";
-        } else {
-            $firstlast = "($lastlink | $firstlink)";
-        }
 
        $urls = array();
        foreach (array(20, 50, 100, 250, 500) as $num)
-               $urls[] = "<a href=\"$myurl&amp;offset=$offset&amp;limit={$num}$xnsurl\">".$wgLang->formatNum($num)."</a>";
+               $urls[] = "<a href=\"$myurl&amp;offset=$offset&amp;limit={$num}$xnsurl$boturl\">".$wgLang->formatNum($num)."</a>";
        $bits = implode($urls, ' | ');
 
        $prevnextbits = $firstlast .' '. wfMsgHtml('viewprevnext', $prevlink, $nextlink, $bits);
@@ -341,7 +350,7 @@ function ucListEdit( $sk, $row ) {
        $fname = 'ucListEdit';
        wfProfileIn( $fname );
 
-       global $wgLang, $wgOut, $wgUser, $wgRequest;
+       global $wgLang, $wgUser, $wgRequest;
        static $messages;
        if( !isset( $messages ) ) {
                foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist minoreditletter' ) as $msg ) {
@@ -349,8 +358,10 @@ function ucListEdit( $sk, $row ) {
                }
        }
 
-       $page =& Title::makeTitle( $row->page_namespace, $row->page_title );
-       $link = $sk->makeKnownLinkObj( $page, '' );
+       $rev = new Revision( $row );
+       
+       $page = Title::makeTitle( $row->page_namespace, $row->page_title );
+       $link = $sk->makeKnownLinkObj( $page );
        $difftext = $topmarktext = '';
        if( $row->rev_id == $row->page_latest ) {
                $topmarktext .= '<strong>' . $messages['uctop'] . '</strong>';
@@ -370,15 +381,19 @@ function ucListEdit( $sk, $row ) {
                }
 
        }
-       if( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) {
-               $difftext = '(' . $messages['diff'] . ')';
-       } else {
+       if( $rev->userCan( MW_REV_DELETED_TEXT ) ) {
                $difftext = '(' . $sk->makeKnownLinkObj( $page, $messages['diff'], 'diff=prev&oldid='.$row->rev_id ) . ')';
+       } else {
+               $difftext = '(' . $messages['diff'] . ')';
        }
        $histlink='('.$sk->makeKnownLinkObj( $page, $messages['hist'], 'action=history' ) . ')';
 
-       $comment = $sk->commentBlock( $row->rev_comment, $page );
+       $comment = $sk->revComment( $rev );
        $d = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->rev_timestamp), true );
+       
+       if( $rev->isDeleted( MW_REV_DELETED_TEXT ) ) {
+               $d = '<span class="history-deleted">' . $d . '</span>';
+       }
 
        if( $row->rev_minor_edit ) {
                $mflag = '<span class="minor">' . $messages['minoreditletter'] . '</span> ';
@@ -387,8 +402,8 @@ function ucListEdit( $sk, $row ) {
        }
 
        $ret = "{$d} {$histlink} {$difftext} {$mflag} {$link} {$comment} {$topmarktext}";
-       if( $row->rev_deleted ) {
-               $ret = '<span class="deleted">' . $ret . '</span> ' . htmlspecialchars( wfMsg( 'deletedrev' ) );
+       if( $rev->isDeleted( MW_REV_DELETED_TEXT ) ) {
+               $ret .= ' ' . wfMsgHtml( 'deletedrev' );
        }
        $ret = "<li>$ret</li>\n";
        wfProfileOut( $fname );