From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 27 Jun 2007 20:36:03 +0000 (+0000)
Subject: Stripping out the year/month filter on contribs for the moment, since there's disagre... 
X-Git-Tag: 1.31.0-rc.0~52368
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=1a9f23e73ce0e3bf0cf32b975dce40c163efed9e;p=lhc%2Fweb%2Fwiklou.git

Stripping out the year/month filter on contribs for the moment, since there's disagreement over how it should work.
Rather than annoy everyone by having it one way and changing it, we'll put it back when it's changed.
---

diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index b5715c6272..511f46d1cd 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -9,19 +9,13 @@ class ContribsPager extends IndexPager {
 	var $messages, $target;
 	var $namespace = '', $mDb;
 
-	function __construct( $target, $namespace = false, $year = false, $month = false ) {
+	function __construct( $target, $namespace = false ) {
 		parent::__construct();
 		foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist minoreditletter' ) as $msg ) {
 			$this->messages[$msg] = wfMsgExt( $msg, array( 'escape') );
 		}
 		$this->target = $target;
 		$this->namespace = $namespace;
-		
-		$year = intval($year);
-		$month = intval($month);
-		
-		$this->year = ($year > 0 && $year < 10000) ? $year : false;
-		$this->month = ($month > 0 && $month < 13) ? $month : false;
 		$this->mDb = wfGetDB( DB_SLAVE, 'contributions' );
 	}
 
@@ -33,7 +27,7 @@ class ContribsPager extends IndexPager {
 
 	function getQueryInfo() {
 		list( $index, $userCond ) = $this->getUserCond();
-		$conds = array_merge( array('page_id=rev_page'), $userCond, $this->getNamespaceCond(), $this->GetDateCond() );
+		$conds = array_merge( array('page_id=rev_page'), $userCond, $this->getNamespaceCond() );
 
 		return array(
 			'tables' => array( 'page', 'revision' ),
@@ -69,39 +63,6 @@ class ContribsPager extends IndexPager {
 		}
 	}
 	
-	function getDateCond() {
-		$condition = array();
-		
-		if ( $this->year || $this->month ) {
-			// Assume this year if only a month is given
-			if ( $this->year ) {
-				$year_start = $this->year;
-			} else {
-				$year_start = substr( wfTimestampNow(), 0, 4 );
-			}
-			
-			if ( $this->month ) {
-				$month_start = str_pad($this->month, 2, '0', STR_PAD_LEFT);
-				$month_end = str_pad($this->month + 1, 2, '0', STR_PAD_LEFT);
-				$year_end = $year_start;
-			} else {
-				$month_start = 0;
-				$month_end = 0;
-				$year_end = $year_start + 1;
-			}
-			
-			$ts_start = str_pad($year_start . $month_start, 14, '0' );
-			$ts_end = str_pad($year_end . $month_end, 14, '0' );
-			
-			$condition[] = "rev_timestamp >= $ts_start";
-			# If just given the year 9999, we need not enforce an upper bound
-			if( strlen($year_end) <= 4 )
-				$condition[] = "rev_timestamp < $ts_end";
-		}
-		
-		return $condition;
-	}
-
 	function getIndexField() {
 		return 'rev_timestamp';
 	}
@@ -273,25 +234,11 @@ function wfSpecialContributions( $par = null ) {
 		$options['bot'] = '1';
 	}
 	
-	if ( ( $month = $wgRequest->getVal( 'month', null ) ) !== null && $month !== '' ) {
-		$options['month'] = intval( $month );
-	} else {
-		$options['month'] = '';
-	}
-	
-	if ( ( $year = $wgRequest->getVal( 'year', null ) ) !== null && $year !== '' ) {
-		$options['year'] = intval( $year );
-	} else if( $month ) {
-		$options['year'] = intval( substr( wfTimestampNow(), 0, 4 ) );   	
-	} else {
-		$options['year'] = '';
-	}
-
 	wfRunHooks( 'SpecialContributionsBeforeMainOutput', $id );
 
 	$wgOut->addHTML( contributionsForm( $options ) );
 
-	$pager = new ContribsPager( $target, $options['namespace'], $options['year'], $options['month'] );
+	$pager = new ContribsPager( $target, $options['namespace'] );
 	if ( !$pager->getNumRows() ) {
 		$wgOut->addWikiText( wfMsg( 'nocontribs' ) );
 		return;
@@ -388,14 +335,6 @@ function contributionsForm( $options ) {
 		$options['contribs'] = 'user';
 	}
 	
-	if ( !isset( $options['year'] ) ) {
-		$options['year'] = '';
-	}
-
-	if ( !isset( $options['month'] ) ) {
-		$options['month'] = '';
-	}
-
 	if ( $options['contribs'] == 'newbie' ) {
 		$options['target'] = '';
 	}
@@ -416,13 +355,7 @@ function contributionsForm( $options ) {
 		Xml::input( 'target', 20, $options['target']) . ' '.
 		Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
 		Xml::namespaceSelector( $options['namespace'], '' ) .
-		Xml::openElement( 'p' ) .
-		Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
-		Xml::input( 'year', 4, $options['year'], array('id' => 'year', 'maxlength' => 4) ) . ' '.
-		Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
-		xml::monthSelector( $options['month'], -1 ) .
 		Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
-		Xml::closeElement( 'p' ) .
 		'</fieldset>' .
 		Xml::closeElement( 'form' );
 	return $f;
diff --git a/includes/Xml.php b/includes/Xml.php
index 94d04b8360..b7a035ab26 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -123,28 +123,6 @@ class Xml {
 		$s .= "</select>\n";
 		return $s;
 	}
-	
-	/**
-	 * Create a date selector
-	 *
-	 * @param $selected Mixed: the month which should be selected, default ''
-	 * @param $allmonths String: value of a special item denoting all month. Null to not include (default)
-	 * @param string $id Element identifier
-	 * @return String: Html string containing the month selector
-	 */
-	public static function monthSelector( $selected = '', $allmonths = null, $id = 'month' ) {
-		global $wgLang;
-		$options = array();
-		if( is_null( $selected ) )
-			$selected = '';
-		if( !is_null( $allmonths ) )
-			$options[] = self::option( wfMsg( 'monthsall' ), $allmonths, $selected === $allmonths );
-		for( $i = 1; $i < 13; $i++ )
-			$options[] = self::option( $wgLang->getMonthName( $i ), $i, $selected === $i );
-		return self::openElement( 'select', array( 'id' => $id, 'name' => 'month' ) )
-			. implode( "\n", $options )
-			. self::closeElement( 'select' );
-	}
 
 	/**
 	 *
diff --git a/includes/XmlFunctions.php b/includes/XmlFunctions.php
index 8779b4fe00..326c495325 100644
--- a/includes/XmlFunctions.php
+++ b/includes/XmlFunctions.php
@@ -18,9 +18,6 @@ function wfCloseElement( $element ) {
 function HTMLnamespaceselector($selected = '', $allnamespaces = null, $includehidden=false) {
 	return Xml::namespaceSelector( $selected, $allnamespaces, $includehidden );
 }
-function HTMLmonthelector($selected = '', $allmonths = null) {
-	return Xml::monthSelector( $selected, $allmonths );
-}
 function wfSpan( $text, $class, $attribs=array() ) {
 	return Xml::span( $text, $class, $attribs );
 }