X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FupdateRestrictions.php;h=f0567b5b8f1d8239af07e02115f412eb325b4683;hb=7bcf8450a1d488d909185a5cf4d3eff6058f2092;hp=7a26da4e3a98134d2e89e5f9630e537c5cc9864a;hpb=28df3d07e646e21ba2214827c16b446151c15db3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index 7a26da4e3a..f0567b5b8f 100644
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -1,72 +1,87 @@
-<?php
-
-/*
- * Makes the required database changes for the CheckUser extension
- */
-
-define( 'BATCH_SIZE', 100 );
-
-require_once 'commandLine.inc';
-	
-$db =& wfGetDB( DB_MASTER );
-if ( !$db->tableExists( 'page_restrictions' ) ) {
-	echo "page_restrictions does not exist\n";
-	exit( 1 );
-}
-
-migrate_page_restrictions( $db );
-
-function migrate_page_restrictions( $db ) {
-	
-	$start = $db->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
-	$end = $db->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
-	$blockStart = $start;
-	$blockEnd = $start + BATCH_SIZE - 1;
-	$encodedExpiry = Block::decodeExpiry('');
-	while ( $blockEnd <= $end ) {
-		$cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_rescrictions !=''";
-		$res = $db->select( 'page', array('page_id', 'page_restrictions'), $cond, __FUNCTION__ );
-		$batch = array();
-		while ( $row = $db->fetchObject( $res ) ) {
-			$oldRestrictions = array();
-			foreach( explode( ':', trim( $row->page_restrictions ) ) as $restrict ) {
-				$temp = explode( '=', trim( $restrict ) );
-				if(count($temp) == 1) {
-					// old old format should be treated as edit/move restriction
-					$oldRestrictions["edit"] = explode( ',', trim( $temp[0] ) );
-					$oldRestrictions["move"] = explode( ',', trim( $temp[0] ) );
-				} else {
-					$oldRestrictions[$temp[0]] = explode( ',', trim( $temp[1] ) );
-				}
-			}
-			# Update restrictions table
-			foreach( $oldRestrictions as $action => $restrictions ) {
-				$batch[] = array( 
-					'pr_page' => $row->page_id,
-					'pr_type' => $action,
-					'pr_level' => $restrictions,
-					'pr_cascade' => 0,
-					'pr_expiry' => $encodedExpiry
-				);
-			}
-			# Update page record
-			$db->update( 'page',
-				array( /* SET */
-					'page_restrictions' => ''
-				), array( /* WHERE */
-					'page_id' => $row->page_id
-				), 'migrate_restrictions'
-			);
-		}
-		# We use insert() and not replace() as Article.php replaces
-		# page_restrictions with '' when protected in the restrictions table
-		if ( count( $batch ) ) {
-			$db->insert( 'page_restictions', $batch, __FUNCTION__ );
-		}
-		$blockStart += BATCH_SIZE;
-		$blockEnd += BATCH_SIZE;
-		wfWaitForSlaves( 5 );
-	}
-}
-
-?>
+<?php
+/**
+ * Makes the required database updates for Special:ProtectedPages
+ * to show all protected pages, even ones before the page restrictions
+ * schema change. All remaining page_restriction column values are moved
+ * to the new table.
+ *
+ * @file
+ * @ingroup Maintenance
+ */
+
+define( 'BATCH_SIZE', 100 );
+
+require_once 'commandLine.inc';
+	
+$db =& wfGetDB( DB_MASTER );
+if ( !$db->tableExists( 'page_restrictions' ) ) {
+	echo "page_restrictions does not exist\n";
+	exit( 1 );
+}
+
+migrate_page_restrictions( $db );
+
+function migrate_page_restrictions( $db ) {
+	
+	$start = $db->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
+	$end = $db->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
+	
+	if( !$start ) {
+		die("Nothing to do.\n");
+	}
+	
+	# Do remaining chunk
+	$end += BATCH_SIZE - 1;
+	$blockStart = $start;
+	$blockEnd = $start + BATCH_SIZE - 1;
+	$encodedExpiry = 'infinity';
+	while ( $blockEnd <= $end ) {
+		echo "...doing page_id from $blockStart to $blockEnd\n";
+		$cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !=''";
+		$res = $db->select( 'page', array('page_id', 'page_restrictions'), $cond, __FUNCTION__ );
+		$batch = array();
+		while ( $row = $db->fetchObject( $res ) ) {
+			$oldRestrictions = array();
+			foreach( explode( ':', trim( $row->page_restrictions ) ) as $restrict ) {
+				$temp = explode( '=', trim( $restrict ) );
+				// Make sure we are not settings restrictions to ""
+				if( count($temp) == 1 && $temp[0] ) {
+					// old old format should be treated as edit/move restriction
+					$oldRestrictions["edit"] = trim( $temp[0] );
+					$oldRestrictions["move"] = trim( $temp[0] );
+				} else if( $temp[1] ) {
+					$oldRestrictions[$temp[0]] = trim( $temp[1] );
+				}
+			}
+			# Update restrictions table
+			foreach( $oldRestrictions as $action => $restrictions ) {
+				$batch[] = array( 
+					'pr_page' => $row->page_id,
+					'pr_type' => $action,
+					'pr_level' => $restrictions,
+					'pr_cascade' => 0,
+					'pr_expiry' => $encodedExpiry
+				);
+			}
+		}
+		# We use insert() and not replace() as Article.php replaces
+		# page_restrictions with '' when protected in the restrictions table
+		if ( count( $batch ) ) {
+			$ok = $db->deadlockLoop(
+				array( $db, 'insert' ),
+				'page_restrictions', $batch, __FUNCTION__, array( 'IGNORE' ) );
+			if( !$ok ) {
+				throw new MWException( "Deadlock loop failed wtf :(" );
+			}
+		}
+		$blockStart += BATCH_SIZE - 1;
+		$blockEnd += BATCH_SIZE - 1;
+		wfWaitForSlaves( 5 );
+	}
+	echo "...removing dead rows from page_restrictions\n";
+	// Kill any broken rows from previous imports
+	$db->delete( 'page_restrictions', array( 'pr_level' => '' ) );
+	echo "...Done!\n";
+}
+
+