X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialContributions.php;h=00864da5e53924187edbfa67333cfdcce10d75ba;hb=e03fdc5ac5be1cb2e43f33885580c773289b2150;hp=3a5c90e1ae11c038f50efacd0e3ca347957e5757;hpb=9a16c8035ad7d437d325f2e719a2e3e7340af1f8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 3a5c90e1ae..00864da5e5 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -6,14 +6,19 @@
 
 /** @package MediaWiki */
 class contribs_finder {
-	var $username, $offset, $limit;
+	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;
 	}
@@ -24,12 +29,12 @@ class contribs_finder {
 
 	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 " . $usercond .
+			" 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");
@@ -46,32 +51,42 @@ class contribs_finder {
 	}
 
 	function get_user_cond() {
-		$condition = "";
+		$condition = '';
 
 		if ($this->username == 'newbies') {
-			$max = $this->dbr->selectField('user', 'max(user_id)', false, "make_sql");
+			$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);
+		if ($condition == '') {
+			$condition = ' rev_user_text=' . $this->dbr->addQuotes($this->username);
 			$index = 'usertext_timestamp';
 		} else {
-			$condition = " rev_user {$condition}";
+			$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);
-		$sql .=	" ORDER BY rev_timestamp ASC LIMIT " . ($this->limit+1);
+			"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))
@@ -84,11 +99,13 @@ class contribs_finder {
 		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);
-		$sql .=	" ORDER BY rev_timestamp ASC LIMIT " . ($this->limit + 1);
+			"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))
@@ -103,24 +120,26 @@ class contribs_finder {
 		extract($this->dbr->tableNames('page', 'revision'));
 		list($index, $userCond) = $this->get_user_cond();
 
-		$limitQuery = "LIMIT {$this->limit}";
+		$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 $offsetQuery
-		 	ORDER BY rev_timestamp DESC $limitQuery";
+			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");
+		$res = $this->dbr->query($this->make_sql(), 'contribs_finder::find');
 		while ($c = $this->dbr->fetchObject($res))
 			$contribs[] = $c;
 		$this->dbr->freeResult($res);
@@ -136,7 +155,8 @@ 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;
+	global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest, $wgTitle,
+	       $wgScript;
 	$fname = 'wfSpecialContributions';
 
 	$target = isset($par) ? $par : $wgRequest->getVal( 'target' );
@@ -152,14 +172,14 @@ function wfSpecialContributions( $par = null ) {
 	}
 	$nt =& Title::makeTitle(NS_USER, $nt->getDBkey());
 
-	$limit = min($wgRequest->getInt('limit', 50), 500);
+	list( $limit, $offset) = wfCheckLimits();
 	$offset = $wgRequest->getVal('offset');
 	/* Offset must be an integral. */
-	if (!strlen($offset) || !preg_match("/^[0-9]+$/", $offset))
+	if (!strlen($offset) || !preg_match('/^[0-9]+$/', $offset))
 		$offset = 0;
 
-	$title = Title::makeTitle(NS_SPECIAL, "Contributions");
-	$urlbits = "target=" . wfUrlEncode($target);
+	$title = Title::makeTitle(NS_SPECIAL, 'Contributions');
+	$urlbits = 'target=' . wfUrlEncode($target);
 	$myurl = $title->escapeLocalURL($urlbits);
 
 	$finder = new contribs_finder(($target == 'newbies') ? 'newbies' : $nt->getText());
@@ -167,16 +187,27 @@ function wfSpecialContributions( $par = null ) {
 	$finder->set_limit($limit);
 	$finder->set_offset($offset);
 
-	if ($wgRequest->getText('go') == "prev") {
+	$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 = '&amp;bot=1';
+
+	if ($wgRequest->getText('go') == 'prev') {
 		$prevts = $finder->get_previous_offset_for_paging();
-		$prevurl = $title->getLocalURL($urlbits . "&offset=$prevts&limit=$limit");
+		$prevurl = $title->getLocalURL($urlbits . "&offset=$prevts&limit=$limit$nsurl$boturl");
 		$wgOut->redirect($prevurl);
 		return;
 	}
 
-	if ($wgRequest->getText('go') == "first") {
-		$prevts = $finder->get_first_offset_for_paging();
-		$prevurl = $title->getLocalURL($urlbits . "&offset=$prevts&limit=$limit");
+	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;
 	}
@@ -202,11 +233,43 @@ function wfSpecialContributions( $par = null ) {
 
 	$wgOut->setSubtitle( wfMsgHtml( 'contribsub', $ul ) );
 
+	wfRunHooks('SpecialContributionsBeforeMainOutput', $id );
+
+	$arr =  $wgContLang->getFormattedNamespaces();
+	$nsform = "<form method='get' action=\"$wgScript\">\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 .= '<p>';
+	$nsform .= wfMsgHtml('namespace');
+
+	$nsform .= HTMLnamespaceselector( $ns, '' );
+
+	$nsform .= wfElement('input', array(
+			'type' => 'submit',
+			'value' => wfMsg('allpagessubmit')));
+	$nsform .= "</p></form>\n";
+
+	$wgOut->addHTML($nsform);
+
 	$contribsPage = Title::makeTitle( NS_SPECIAL, 'Contributions' );
 	$contribs = $finder->find();
 
 	if (count($contribs) == 0) {
-		$wgOut->addWikiText( wfMsg( "nocontribs" ) );
+		$wgOut->addWikiText( wfMsg( 'nocontribs' ) );
 		return;
 	}
 
@@ -217,34 +280,38 @@ function wfSpecialContributions( $par = null ) {
 
 	$lasturl = $wgTitle->escapeLocalURL("action=history&limit={$limit}");
 
-	$firsttext = wfMsgHtml("histfirst");
-	$lasttext = wfMsgHtml("histlast");
+	$firsttext = wfMsgHtml('histfirst');
+	$lasttext = wfMsgHtml('histlast');
 
-	$prevtext = wfMsg("prevn", $limit);
+	$prevtext = wfMsg('prevn', $limit);
 	if ($atstart) {
 		$lastlink = $lasttext;
 		$prevlink = $prevtext;
 	} else {
-		$lastlink = "<a href=\"$myurl&amp;limit=$limit\">$lasttext</a>";
-		$prevlink = "<a href=\"$myurl&amp;offset=$offset&amp;limit=$limit&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);
+	$nexttext = wfMsg('nextn', $limit);
 	if ($atend) {
 		$firstlink = $firsttext;
 		$nextlink = $nexttext;
 	} else {
-		$firstlink = "<a href=\"$myurl&amp;limit=$limit&amp;go=first\">$firsttext</a>";
-		$nextlink = "<a href=\"$myurl&amp;offset=$lastts&amp;limit=$limit\">$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>";
 	}
-	$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}\">".$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);
+	$prevnextbits = $firstlast .' '. wfMsgHtml('viewprevnext', $prevlink, $nextlink, $bits);
 
 	$wgOut->addHTML( "<p>{$prevnextbits}</p>\n");
 
@@ -292,7 +359,7 @@ function ucListEdit( $sk, $row ) {
 	if( $row->rev_id == $row->page_latest ) {
 		$topmarktext .= '<strong>' . $messages['uctop'] . '</strong>';
 		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'];
 		}
@@ -310,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 = '<span class="minor">' . $messages['minoreditletter'] . '</span> ';