X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fspecials%2FSpecialRecentchanges.php;h=6ef75e07c0b182bffa54ada73af7e948224124d6;hp=a05900b1e3f2b89159ee1975ba661cc3a0638283;hb=24ebca2251f94a20acee53e583d65aa7fac2c15d;hpb=3dce41fd3a778e720d7c7b2b7aa2ff53b0ec1542

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index a05900b1e3..6ef75e07c0 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -181,10 +181,6 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 				$this->getConfig()->get( 'StructuredChangeFiltersEnableExperimentalViews' );
 
 			$out->addJsConfigVars( 'wgStructuredChangeFilters', $jsData['groups'] );
-			$out->addJsConfigVars(
-				'wgStructuredChangeFiltersEnableSaving',
-				$this->getConfig()->get( 'StructuredChangeFiltersEnableSaving' )
-			);
 			$out->addJsConfigVars(
 				'wgStructuredChangeFiltersEnableExperimentalViews',
 				$experimentalStructuredChangeFilters
@@ -193,12 +189,18 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 				'wgStructuredChangeFiltersEnableLiveUpdate',
 				$this->getConfig()->get( 'StructuredChangeFiltersEnableLiveUpdate' )
 			);
-			if ( $experimentalStructuredChangeFilters ) {
-				$out->addJsConfigVars(
-					'wgRCFiltersChangeTags',
-					$this->buildChangeTagList()
-				);
-			}
+			$out->addJsConfigVars(
+				'wgRCFiltersChangeTags',
+				$this->buildChangeTagList()
+			);
+			$out->addJsConfigVars(
+				'StructuredChangeFiltersDisplayConfig',
+				[
+					'maxDays' => (int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days
+					'limitArray' => $this->getConfig()->get( 'RCLinkLimits' ),
+					'daysArray' => $this->getConfig()->get( 'RCLinkDays' ),
+				]
+			);
 		}
 	}
 
@@ -373,6 +375,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 
 	public function validateOptions( FormOptions $opts ) {
 		$opts->validateIntBounds( 'limit', 0, 5000 );
+		$opts->validateBounds( 'days', 0, $this->getConfig()->get( 'RCMaxAge' ) / ( 3600 * 24 ) );
 		parent::validateOptions( $opts );
 	}
 
@@ -387,7 +390,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			$query_options, $join_conds, $opts );
 
 		// Calculate cutoff
-		$cutoff_unixtime = time() - ( $opts['days'] * 86400 );
+		$cutoff_unixtime = time() - $opts['days'] * 3600 * 24;
 		$cutoff = $dbr->timestamp( $cutoff_unixtime );
 
 		$fromValid = preg_match( '/^[0-9]{14}$/', $opts['from'] );
@@ -429,13 +432,14 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		$fields[] = 'page_latest';
 		$join_conds['page'] = [ 'LEFT JOIN', 'rc_cur_id=page_id' ];
 
+		$tagFilter = $opts['tagfilter'] ? explode( '|', $opts['tagfilter'] ) : [];
 		ChangeTags::modifyDisplayQuery(
 			$tables,
 			$fields,
 			$conds,
 			$join_conds,
 			$query_options,
-			$opts['tagfilter']
+			$tagFilter
 		);
 
 		if ( !$this->runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds,
@@ -448,13 +452,24 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			return false;
 		}
 
+		$orderByAndLimit = [
+			'ORDER BY' => 'rc_timestamp DESC',
+			'LIMIT' => $opts['limit']
+		];
+		if ( in_array( 'DISTINCT', $query_options ) ) {
+			// ChangeTags::modifyDisplayQuery() adds DISTINCT when filtering on multiple tags.
+			// In order to prevent DISTINCT from causing query performance problems,
+			// we have to GROUP BY the primary key. This in turn requires us to add
+			// the primary key to the end of the ORDER BY, and the old ORDER BY to the
+			// start of the GROUP BY
+			$orderByAndLimit['ORDER BY'] = 'rc_timestamp DESC, rc_id DESC';
+			$orderByAndLimit['GROUP BY'] = 'rc_timestamp, rc_id';
+		}
 		// array_merge() is used intentionally here so that hooks can, should
 		// they so desire, override the ORDER BY / LIMIT condition(s); prior to
 		// MediaWiki 1.26 this used to use the plus operator instead, which meant
 		// that extensions weren't able to change these conditions
-		$query_options = array_merge( [
-			'ORDER BY' => 'rc_timestamp DESC',
-			'LIMIT' => $opts['limit'] ], $query_options );
+		$query_options = array_merge( $orderByAndLimit, $query_options );
 		$rows = $dbr->select(
 			$tables,
 			$fields,
@@ -705,17 +720,35 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 
 		$message = $this->msg( 'recentchangestext' )->inContentLanguage();
 		if ( !$message->isDisabled() ) {
-			$this->getOutput()->addWikiText(
-				Html::rawElement( 'div',
-					[
-						'class' => 'mw-recentchanges-toplinks',
-						'lang' => $wgContLang->getHtmlCode(),
-						'dir' => $wgContLang->getDir()
-					],
-					"\n" . $message->plain() . "\n"
-				),
-				/* $lineStart */ true,
-				/* $interface */ false
+			$content = $message->parse();
+
+			$langAttributes = [
+				'lang' => $wgContLang->getHtmlCode(),
+				'dir' => $wgContLang->getDir(),
+			];
+
+			$topLinksAttributes = [ 'class' => 'mw-recentchanges-toplinks' ];
+
+			if ( $this->getUser()->getOption( 'rcenhancedfilters' ) ) {
+				$contentTitle = Html::rawElement( 'div',
+					[ 'class' => 'mw-recentchanges-toplinks-title' ],
+					$this->msg( 'rcfilters-other-review-tools' )->parse()
+				);
+				$contentWrapper = Html::rawElement( 'div',
+					array_merge( [ 'class' => 'mw-collapsible-content' ], $langAttributes ),
+					$content
+				);
+				$content = $contentTitle . $contentWrapper;
+			} else {
+				// Language direction should be on the top div only
+				// if the title is not there. If it is there, it's
+				// interface direction, and the language/dir attributes
+				// should be on the content itself
+				$topLinksAttributes = array_merge( $topLinksAttributes, $langAttributes );
+			}
+
+			$this->getOutput()->addHTML(
+				Html::rawElement( 'div', $topLinksAttributes, $content )
 			);
 		}
 	}
@@ -942,15 +975,20 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			$resetLink = $this->makeOptionsLink( $this->msg( 'rclistfromreset' ),
 				[ 'from' => '' ], $nondefaults );
 
-			$note .= $this->msg( 'rcnotefrom' )
+			$noteFromMsg = $this->msg( 'rcnotefrom' )
 				->numParams( $options['limit'] )
 				->params(
 					$lang->userTimeAndDate( $options['from'], $user ),
 					$lang->userDate( $options['from'], $user ),
 					$lang->userTime( $options['from'], $user )
 				)
-				->numParams( $numRows )
-				->parse() . ' ' .
+				->numParams( $numRows );
+			$note .= Html::rawElement(
+					'span',
+					[ 'class' => 'rcnotefrom' ],
+					$noteFromMsg->parse()
+				) .
+				' ' .
 				Html::rawElement(
 					'span',
 					[ 'class' => 'rcoptions-listfromreset' ],