X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialContributions.php;h=00864da5e53924187edbfa67333cfdcce10d75ba;hb=e03fdc5ac5be1cb2e43f33885580c773289b2150;hp=8e9eced1801802ef4d0bdb6162e709280764c7fa;hpb=b3a7224c2b8d118a74420869d5fa9461be923c6b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php index 8e9eced180..00864da5e5 100644 --- a/includes/SpecialContributions.php +++ b/includes/SpecialContributions.php @@ -4,6 +4,149 @@ * @subpackage SpecialPage */ +/** @package MediaWiki */ +class contribs_finder { + var $username, $offset, $limit, $namespace; + var $dbr; + + function contribs_finder($username) { + $this->username = $username; + $this->namespace = false; + $this->dbr =& wfGetDB(DB_SLAVE); + } + + function set_namespace($ns) { + $this->namespace = $ns; + } + + function set_limit($limit) { + $this->limit = $limit; + } + + function set_offset($offset) { + $this->offset = $offset; + } + + function get_edit_limit($dir) { + list($index, $usercond) = $this->get_user_cond(); + $nscond = $this->get_namespace_cond(); + $use_index = $this->dbr->useIndexClause($index); + extract($this->dbr->tableNames('revision', 'page')); + $sql = "SELECT rev_timestamp " . + " FROM $page,$revision $use_index " . + " WHERE rev_page=page_id AND $usercond $nscond" . + " ORDER BY rev_timestamp $dir LIMIT 1"; + + $res = $this->dbr->query($sql, "contribs_finder::get_edit_limit"); + while ($o = $this->dbr->fetchObject($res)) + $row = $o; + return $row->rev_timestamp; + } + + function get_edit_limits() { + return array( + $this->get_edit_limit("ASC"), + $this->get_edit_limit("DESC") + ); + } + + function get_user_cond() { + $condition = ''; + + if ($this->username == 'newbies') { + $max = $this->dbr->selectField('user', 'max(user_id)', false, 'make_sql'); + $condition = '>' . (int)($max - $max / 100); + } + + if ($condition == '') { + $condition = ' rev_user_text=' . $this->dbr->addQuotes($this->username); + $index = 'usertext_timestamp'; + } else { + $condition = ' rev_user '.$condition ; + $index = 'user_timestamp'; + } + return array($index, $condition); + } + + function get_namespace_cond() { + if ($this->namespace !== false) + return ' AND page_namespace = ' . (int)$this->namespace; + return ''; + } + + function get_previous_offset_for_paging() { + list($index, $usercond) = $this->get_user_cond(); + $nscond = $this->get_namespace_cond(); + + $use_index = $this->dbr->useIndexClause($index); + extract($this->dbr->tableNames('page', 'revision')); + + $sql = "SELECT rev_timestamp FROM $page, $revision $use_index " . + "WHERE page_id = rev_page AND rev_timestamp > '" . $this->offset . "' AND " . + "rev_user_text = " . $this->dbr->addQuotes($this->username) + . $nscond; + $sql .= " ORDER BY rev_timestamp ASC"; + $sql = $this->dbr->limitResult($sql, $this->limit, 0); + $res = $this->dbr->query($sql); + $rows = array(); + while ($obj = $this->dbr->fetchObject($res)) + $rows[] = $obj; + $this->dbr->freeResult($res); + return $rows[count($rows) - 1]->rev_timestamp; + } + + function get_first_offset_for_paging() { + list($index, $usercond) = $this->get_user_cond(); + $use_index = $this->dbr->useIndexClause($index); + extract($this->dbr->tableNames('page', 'revision')); + $nscond = $this->get_namespace_cond(); + $sql = "SELECT rev_timestamp FROM $page, $revision $use_index " . + "WHERE page_id = rev_page AND " . + "rev_user_text = " . $this->dbr->addQuotes($this->username) + . $nscond; + $sql .= " ORDER BY rev_timestamp ASC"; + $sql = $this->dbr->limitResult($sql, $this->limit, 0); + $res = $this->dbr->query($sql); + $rows = array(); + while ($obj = $this->dbr->fetchObject($res)) + $rows[] = $obj; + $this->dbr->freeResult($res); + return $rows[count($rows) - 1]->rev_timestamp; + } + + /* private */ function make_sql() { + $userCond = $condition = $index = $offsetQuery = $limitQuery = ""; + + extract($this->dbr->tableNames('page', 'revision')); + list($index, $userCond) = $this->get_user_cond(); + + $limitQuery = 'LIMIT '.$this->limit; + if ($this->offset) + $offsetQuery = "AND rev_timestamp <= '{$this->offset}'"; + + $nscond = $this->get_namespace_cond(); + $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_deleted + FROM $page,$revision $use_index + WHERE page_id=rev_page AND $userCond $nscond $offsetQuery + ORDER BY rev_timestamp DESC"; + $sql = $this->dbr->limitResult($sql, $this->limit, 0); + return $sql; + } + + function find() { + $contribs = array(); + $res = $this->dbr->query($this->make_sql(), 'contribs_finder::find'); + while ($c = $this->dbr->fetchObject($res)) + $contribs[] = $c; + $this->dbr->freeResult($res); + return $contribs; + } +}; + /** * Special page "user contributions". * Shows a list of the contributions of a user. @@ -11,38 +154,67 @@ * @return none * @param string $par (optional) user name of the user for which to show the contributions */ -function wfSpecialContributions( $par = '' ) { - global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest; +function wfSpecialContributions( $par = null ) { + global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest, $wgTitle, + $wgScript; $fname = 'wfSpecialContributions'; - // GET values - $target = $par ? $par : $wgRequest->getVal( 'target' ); - $namespace = $wgRequest->getInt( 'namespace', '' ); - $namespace = ($namespace == '') ? NULL : $namespace; - $invert = $wgRequest->getBool( 'invert' ); - $hideminor = ($wgRequest->getBool( 'hideminor' ) ? true : false); - - if ( '' == $target ) { - $wgOut->errorpage( 'notargettitle', 'notargettext' ); + $target = isset($par) ? $par : $wgRequest->getVal( 'target' ); + if (!strlen($target)) { + $wgOut->errorpage('notargettitle', 'notargettext'); return; } - # FIXME: Change from numeric offsets to date offsets - list( $limit, $offset ) = wfCheckLimits( 50, '' ); - $offlimit = $limit + $offset; - $querylimit = $offlimit + 1; - $sk = $wgUser->getSkin(); - $dbr =& wfGetDB( DB_SLAVE ); - $userCond = ""; - $nt = Title::newFromURL( $target ); - if ( !$nt ) { + if (!$nt) { $wgOut->errorpage( 'notargettitle', 'notargettext' ); return; } - $nt =& Title::makeTitle( NS_USER, $nt->getDBkey() ); + $nt =& Title::makeTitle(NS_USER, $nt->getDBkey()); + + list( $limit, $offset) = wfCheckLimits(); + $offset = $wgRequest->getVal('offset'); + /* Offset must be an integral. */ + if (!strlen($offset) || !preg_match('/^[0-9]+$/', $offset)) + $offset = 0; + + $title = Title::makeTitle(NS_SPECIAL, 'Contributions'); + $urlbits = 'target=' . wfUrlEncode($target); + $myurl = $title->escapeLocalURL($urlbits); - $id = User::idFromName( $nt->getText() ); + $finder = new contribs_finder(($target == 'newbies') ? 'newbies' : $nt->getText()); + + $finder->set_limit($limit); + $finder->set_offset($offset); + + $nsurl = $xnsurl = ''; + if (($ns = $wgRequest->getVal('namespace', null)) !== null && $ns !== '') { + $nsurl = '&namespace='.$ns; + $xnsurl = htmlspecialchars($nsurl); + $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$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$boturl"); + $wgOut->redirect($prevurl); + return; + } + + $sk = $wgUser->getSkin(); + + $id = User::idFromName($nt->getText()); if ( 0 == $id ) { $ul = $nt->getText(); @@ -55,80 +227,101 @@ function wfSpecialContributions( $par = '' ) { $ul .= ' (' . $sk->makeLinkObj( $talk, $wgLang->getNsText( NS_TALK ) ) . ')'; } - - if ( $target == 'newbies' ) { - # View the contributions of all recently created accounts - $max = $dbr->selectField( 'user', 'max(user_id)', false, $fname ); - $userCond = '>' . ($max - $max / 100); - $ul = wfMsg ( 'newbies' ); - $id = 0; + if ($target == 'newbies') { + $ul = wfMsg ('newbies'); } - $wgOut->setSubtitle( wfMsg( 'contribsub', $ul ) ); + $wgOut->setSubtitle( wfMsgHtml( 'contribsub', $ul ) ); - if ( $hideminor ) { - $minorQuery = "AND rev_minor_edit=0"; - $mlink = $sk->makeKnownLink( $wgContLang->specialPage( "Contributions" ), - WfMsg( "show" ), "target=" . htmlspecialchars( $nt->getPrefixedURL() ) . - "&offset={$offset}&limit={$limit}&hideminor=0&namespace={$namespace}" ); - } else { - $minorQuery = ""; - $mlink = $sk->makeKnownLink( $wgContLang->specialPage( "Contributions" ), - WfMsg( 'hide' ), 'target=' . htmlspecialchars( $nt->getPrefixedURL() ) . - "&offset={$offset}&limit={$limit}&hideminor=1&namespace={$namespace}" ); - } - - if( !is_null($namespace) ) { - $minorQuery .= ' AND page_namespace ' . ($invert ? '!' : '') . "= {$namespace}"; - } - - extract( $dbr->tableNames( 'page', 'revision' ) ); - if ( $userCond == "" ) { - $condition = "rev_user_text=" . $dbr->addQuotes( $nt->getText() ); - $index = 'usertext_timestamp'; - } else { - $condition = "rev_user {$userCond}"; - $index = 'user_timestamp'; - } + wfRunHooks('SpecialContributionsBeforeMainOutput', $id ); + + $arr = $wgContLang->getFormattedNamespaces(); + $nsform = "
\n"; + $nsform .= wfElement('input', array( + 'name' => 'title', + 'type' => 'hidden', + 'value' => $wgTitle->getPrefixedText())); + $nsform .= wfElement('input', array( + 'name' => 'offset', + 'type' => 'hidden', + 'value' => $offset)); + $nsform .= wfElement('input', array( + 'name' => 'limit', + 'type' => 'hidden', + 'value' => $limit)); + $nsform .= wfElement('input', array( + 'name' => 'target', + 'type' => 'hidden', + 'value' => $target)); + $nsform .= '

'; + $nsform .= wfMsgHtml('namespace'); + $nsform .= HTMLnamespaceselector( $ns, '' ); - $use_index = $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_deleted - FROM $page,$revision $use_index - WHERE page_id=rev_page AND $condition $minorQuery " . - "ORDER BY rev_timestamp DESC LIMIT {$querylimit}"; - $res = $dbr->query( $sql, $fname ); - $numRows = $dbr->numRows( $res ); + $nsform .= wfElement('input', array( + 'type' => 'submit', + 'value' => wfMsg('allpagessubmit'))); + $nsform .= "

\n"; - $wgOut->addHTML( namespaceForm( $target, $hideminor, $namespace, $invert ) ); + $wgOut->addHTML($nsform); - $top = wfShowingResults( $offset, $limit ); - $wgOut->addHTML( "

{$top}\n" ); + $contribsPage = Title::makeTitle( NS_SPECIAL, 'Contributions' ); + $contribs = $finder->find(); - $sl = wfViewPrevNext( $offset, $limit, - $wgContLang->specialpage( "Contributions" ), - "hideminor={$hideminor}&namespace={$namespace}&target=" . wfUrlEncode( $target ), - ($numRows) <= $offlimit); + if (count($contribs) == 0) { + $wgOut->addWikiText( wfMsg( 'nocontribs' ) ); + return; + } - $shm = wfMsg( "showhideminor", $mlink ); - $wgOut->addHTML( "
{$sl} ($shm)

\n"); + list($early, $late) = $finder->get_edit_limits(); + $lastts = count($contribs) ? $contribs[count($contribs) - 1]->rev_timestamp : 0; + $atstart = (!count($contribs) || $late == $contribs[0]->rev_timestamp); + $atend = (!count($contribs) || $early == $lastts); + $lasturl = $wgTitle->escapeLocalURL("action=history&limit={$limit}"); - if ( 0 == $numRows ) { - $wgOut->addHTML( "\n

" . wfMsg( "nocontribs" ) . "

\n" ); - return; + $firsttext = wfMsgHtml('histfirst'); + $lasttext = wfMsgHtml('histlast'); + + $prevtext = wfMsg('prevn', $limit); + if ($atstart) { + $lastlink = $lasttext; + $prevlink = $prevtext; + } else { + $lastlink = "$lasttext"; + $prevlink = "$prevtext"; } - $wgOut->addHTML( "\n" ); + if ($target == 'newbies') { + $firstlast ="($lastlink)"; + } else { + $firstlast = "($lastlink | $firstlink)"; + } + + $urls = array(); + foreach (array(20, 50, 100, 250, 500) as $num) + $urls[] = "".$wgLang->formatNum($num).""; + $bits = implode($urls, ' | '); + + $prevnextbits = $firstlast .' '. wfMsgHtml('viewprevnext', $prevlink, $nextlink, $bits); + + $wgOut->addHTML( "

{$prevnextbits}

\n"); - $wgOut->addHTML( "
{$sl} ($shm)\n"); + $wgOut->addHTML( "\n" ); + $wgOut->addHTML( "

{$prevnextbits}

\n"); } @@ -139,19 +332,19 @@ function wfSpecialContributions( $par = '' ) { * For these contributions, a [rollback] link is shown for users with sysop * privileges. The rollback link restores the most recent version that was not * written by the target user. - * + * * If the contributions page is called with the parameter &bot=1, all rollback * links also get that parameter. It causes the edit itself and the rollback * to be marked as "bot" edits. Bot edits are hidden by default from recent * changes, so this allows sysops to combat a busy vandal without bothering * other users. - * + * * @todo This would probably look a lot nicer in a table. */ function ucListEdit( $sk, $row ) { $fname = 'ucListEdit'; wfProfileIn( $fname ); - + global $wgLang, $wgOut, $wgUser, $wgRequest; static $messages; if( !isset( $messages ) ) { @@ -159,18 +352,18 @@ function ucListEdit( $sk, $row ) { $messages[$msg] = wfMsg( $msg ); } } - + $page =& Title::makeTitle( $row->page_namespace, $row->page_title ); $link = $sk->makeKnownLinkObj( $page, '' ); $difftext = $topmarktext = ''; if( $row->rev_id == $row->page_latest ) { $topmarktext .= '' . $messages['uctop'] . ''; if( !$row->page_is_new ) { - $difftext .= $sk->makeKnownLinkObj( $page, '(' . $messages['diff'] . ')', 'diff=0' ); + $difftext .= '(' . $sk->makeKnownLinkObj( $page, $messages['diff'], 'diff=0' ) . ')'; } else { $difftext .= $messages['newarticle']; } - + if( $wgUser->isAllowed('rollback') ) { $extraRollback = $wgRequest->getBool( 'bot' ) ? '&bot=1' : ''; $extraRollback .= '&token=' . urlencode( @@ -184,12 +377,12 @@ function ucListEdit( $sk, $row ) { if( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) { $difftext = '(' . $messages['diff'] . ')'; } else { - $difftext = $sk->makeKnownLinkObj( $page, '(' . $messages['diff'].')', 'diff=prev&oldid='.$row->rev_id ); + $difftext = '(' . $sk->makeKnownLinkObj( $page, $messages['diff'], 'diff=prev&oldid='.$row->rev_id ) . ')'; } $histlink='('.$sk->makeKnownLinkObj( $page, $messages['hist'], 'action=history' ) . ')'; $comment = $sk->commentBlock( $row->rev_comment, $page ); - $d = $wgLang->timeanddate( $row->rev_timestamp, true ); + $d = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->rev_timestamp), true ); if( $row->rev_minor_edit ) { $mflag = '' . $messages['minoreditletter'] . ' '; @@ -206,42 +399,4 @@ function ucListEdit( $sk, $row ) { return $ret; } -/** - * Generates a form used to restrict display of contributions - * to a specific namespace - * - * @return none - * @param string $target target user to show contributions for - * @param string $hideminor whether minor contributions are hidden - * @param string $namespace currently selected namespace, NULL for show all - * @param bool $invert inverts the namespace selection on true (default null) - */ -function namespaceForm ( $target, $hideminor, $namespace, $invert ) { - global $wgContLang, $wgScript; - - $namespaceselect = ''; - - $submitbutton = ''; - $invertbox = "'; - - $out = "
"; - $out .= ''; - $out .= ''; - $out .= ''; - $out .= wfMsg ( 'contributionsformtext', $namespaceselect, $submitbutton, $invertbox ); - $out .= '
'; - return $out; -} ?>