X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FpopulateLogSearch.php;h=ce2d95ccf13c15bcf14b67c8e1785af917ed6945;hb=376bf1794fe809cf3c3e7199f2bf288aa876ac2a;hp=0e53e1e6fd3cdced15ed031389cd5071937a55d7;hpb=567f244e3611c9e020bc69446a77a10c21257f84;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateLogSearch.php b/maintenance/populateLogSearch.php
index 0e53e1e6fd..ce2d95ccf1 100644
--- a/maintenance/populateLogSearch.php
+++ b/maintenance/populateLogSearch.php
@@ -21,12 +21,14 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class PopulateLogSearch extends Maintenance {
 
 	const LOG_SEARCH_BATCH_SIZE = 100;
 
+	static $tableMap = array( 'rev' => 'revision', 'fa' => 'filearchive', 'oi' => 'oldimage', 'ar' => 'archive' );
+
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Migrate log params to new table and index for searching";
@@ -38,57 +40,99 @@ class PopulateLogSearch extends Maintenance {
 			$this->error( "log_search does not exist", true );
 		}
 		$start = $db->selectField( 'logging', 'MIN(log_id)', false, __FUNCTION__ );
-		if( !$start ) {
+		if ( !$start ) {
 			$this->output( "Nothing to do.\n" );
 			return true;
 		}
 		$end = $db->selectField( 'logging', 'MAX(log_id)', false, __FUNCTION__ );
-	
+
 		# Do remaining chunk
 		$end += self::LOG_SEARCH_BATCH_SIZE - 1;
 		$blockStart = $start;
 		$blockEnd = $start + self::LOG_SEARCH_BATCH_SIZE - 1;
-		while( $blockEnd <= $end ) {
+
+		$delTypes = array( 'delete', 'suppress' ); // revisiondelete types
+		while ( $blockEnd <= $end ) {
 			$this->output( "...doing log_id from $blockStart to $blockEnd\n" );
 			$cond = "log_id BETWEEN $blockStart AND $blockEnd";
 			$res = $db->select( 'logging', '*', $cond, __FUNCTION__ );
-			$batch = array();
-			while( $row = $db->fetchObject( $res ) ) {
+			foreach ( $res as $row ) {
 				// RevisionDelete logs - revisions
-				if( LogEventsList::typeAction( $row, array('delete','suppress'), 'revision' ) ) {
+				if ( LogEventsList::typeAction( $row, $delTypes, 'revision' ) ) {
 					$params = LogPage::extractParams( $row->log_params );
 					// Param format: <urlparam> <item CSV> [<ofield> <nfield>]
-					if( count($params) >= 2 ) {
-						$field = RevisionDeleter::getRelationType($params[0]);
-						// B/C, the params may start with a title key
-						if( $field == null ) {
-							array_shift($params);
-							$field = RevisionDeleter::getRelationType($params[0]);
-						}
-						if( $field == null ) {
-							$this->output( "Invalid param type for $row->log_id\n" );
+					if ( count( $params ) < 2 ) continue; // bad row?
+					$field = RevisionDeleter::getRelationType( $params[0] );
+					// B/C, the params may start with a title key (<title> <urlparam> <CSV>)
+					if ( $field == null ) {
+						array_shift( $params ); // remove title param
+						$field = RevisionDeleter::getRelationType( $params[0] );
+						if ( $field == null ) {
+							$this->output( "Invalid param type for {$row->log_id}\n" );
 							continue; // skip this row
+						} else {
+							// Clean up the row...
+							$db->update( 'logging',
+								array( 'log_params' => implode( ',', $params ) ),
+								array( 'log_id' => $row->log_id ) );
 						}
-						$items = explode(',',$params[1]);
-						$log = new LogPage( $row->log_type );
-						$log->addRelations( $field, $items, $row->log_id );
 					}
+					$items = explode( ',', $params[1] );
+					$log = new LogPage( $row->log_type );
+					// Add item relations...
+					$log->addRelations( $field, $items, $row->log_id );
+					// Determine what table to query...
+					$prefix = substr( $field, 0, strpos( $field, '_' ) ); // db prefix
+					if ( !isset( self::$tableMap[$prefix] ) )
+						continue; // bad row?
+					$table = self::$tableMap[$prefix];
+					$userField = $prefix . '_user';
+					$userTextField = $prefix . '_user_text';
+					// Add item author relations...
+					$userIds = $userIPs = array();
+					$sres = $db->select( $table,
+						array( $userField, $userTextField ),
+						array( $field => $items )
+					);
+					foreach ( $sres as $srow ) {
+						if ( $srow->$userField > 0 )
+							$userIds[] = intval( $srow->$userField );
+						else if ( $srow->$userTextField != '' )
+							$userIPs[] = $srow->$userTextField;
+					}
+					// Add item author relations...
+					$log->addRelations( 'target_author_id', $userIds, $row->log_id );
+					$log->addRelations( 'target_author_ip', $userIPs, $row->log_id );
 				// RevisionDelete logs - log events
-				} else if( LogEventsList::typeAction( $row, array('delete','suppress'), 'event' ) ) {
+				} else if ( LogEventsList::typeAction( $row, $delTypes, 'event' ) ) {
 					$params = LogPage::extractParams( $row->log_params );
 					// Param format: <item CSV> [<ofield> <nfield>]
-					if( count($params) >= 1 ) {
-						$items = explode(',',$params[0]);
-						$log = new LogPage( $row->log_type );
-						$log->addRelations( 'log_id', $items, $row->log_id );
+					if ( count( $params ) < 1 ) continue; // bad row
+					$items = explode( ',', $params[0] );
+					$log = new LogPage( $row->log_type );
+					// Add item relations...
+					$log->addRelations( 'log_id', $items, $row->log_id );
+					// Add item author relations...
+					$userIds = $userIPs = array();
+					$sres = $db->select( 'logging',
+						array( 'log_user', 'log_user_text' ),
+						array( 'log_id' => $items )
+					);
+					foreach ( $sres as $srow ) {
+						if ( $srow->log_user > 0 )
+							$userIds[] = intval( $srow->log_user );
+						else if ( IP::isIPAddress( $srow->log_user_text ) )
+							$userIPs[] = $srow->log_user_text;
 					}
+					$log->addRelations( 'target_author_id', $userIds, $row->log_id );
+					$log->addRelations( 'target_author_ip', $userIPs, $row->log_id );
 				}
 			}
 			$blockStart += self::LOG_SEARCH_BATCH_SIZE;
 			$blockEnd += self::LOG_SEARCH_BATCH_SIZE;
 			wfWaitForSlaves( 5 );
 		}
-		if( $db->insert(
+		if ( $db->insert(
 				'updatelog',
 				array( 'ul_key' => 'populate log_search' ),
 				__FUNCTION__,
@@ -105,4 +149,4 @@ class PopulateLogSearch extends Maintenance {
 }
 
 $maintClass = "PopulateLogSearch";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );