X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=maintenance%2FremoveUnusedAccounts.php;h=e3c99ed5c90bf8077fc886f113b026fed6246fde;hb=a2e1e1fafff82cf84ee378a984095beb24e1e010;hp=55b23601ab7210eb626f1861dc6bfca9144b046c;hpb=7ee1504a9a34067fd5b3e1fc315ccaa99661cb44;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
index 55b23601ab..e3c99ed5c9 100644
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -44,13 +44,13 @@ class RemoveUnusedAccounts extends Maintenance {
 
 		# Do an initial scan for inactive accounts and report the result
 		$this->output( "Checking for unused user accounts...\n" );
-		$del = array();
-		$dbr = wfGetDB( DB_SLAVE );
-		$res = $dbr->select( 'user', array( 'user_id', 'user_name', 'user_touched' ), '', __METHOD__ );
+		$del = [];
+		$dbr = $this->getDB( DB_SLAVE );
+		$res = $dbr->select( 'user', [ 'user_id', 'user_name', 'user_touched' ], '', __METHOD__ );
 		if ( $this->hasOption( 'ignore-groups' ) ) {
 			$excludedGroups = explode( ',', $this->getOption( 'ignore-groups' ) );
 		} else {
-			$excludedGroups = array();
+			$excludedGroups = [];
 		}
 		$touched = $this->getOption( 'ignore-touched', "1" );
 		if ( !ctype_digit( $touched ) ) {
@@ -64,7 +64,7 @@ class RemoveUnusedAccounts extends Maintenance {
 			if ( count( array_intersect( $instance->getEffectiveGroups(), $excludedGroups ) ) == 0
 				&& $this->isInactiveAccount( $row->user_id, true )
 				&& wfTimestamp( TS_UNIX, $row->user_touched ) < wfTimestamp( TS_UNIX, time() - $touchedSeconds )
-				) {
+			) {
 				# Inactive; print out the name and flag it
 				$del[] = $row->user_id;
 				$this->output( $row->user_name . "\n" );
@@ -76,20 +76,20 @@ class RemoveUnusedAccounts extends Maintenance {
 		# If required, go back and delete each marked account
 		if ( $count > 0 && $this->hasOption( 'delete' ) ) {
 			$this->output( "\nDeleting unused accounts..." );
-			$dbw = wfGetDB( DB_MASTER );
-			$dbw->delete( 'user', array( 'user_id' => $del ), __METHOD__ );
-			$dbw->delete( 'user_groups', array( 'ug_user' => $del ), __METHOD__ );
-			$dbw->delete( 'user_former_groups', array( 'ufg_user' => $del ), __METHOD__ );
-			$dbw->delete( 'user_properties', array( 'up_user' => $del ), __METHOD__ );
-			$dbw->delete( 'logging', array( 'log_user' => $del ), __METHOD__ );
-			$dbw->delete( 'recentchanges', array( 'rc_user' => $del ), __METHOD__ );
+			$dbw = $this->getDB( DB_MASTER );
+			$dbw->delete( 'user', [ 'user_id' => $del ], __METHOD__ );
+			$dbw->delete( 'user_groups', [ 'ug_user' => $del ], __METHOD__ );
+			$dbw->delete( 'user_former_groups', [ 'ufg_user' => $del ], __METHOD__ );
+			$dbw->delete( 'user_properties', [ 'up_user' => $del ], __METHOD__ );
+			$dbw->delete( 'logging', [ 'log_user' => $del ], __METHOD__ );
+			$dbw->delete( 'recentchanges', [ 'rc_user' => $del ], __METHOD__ );
 			$this->output( "done.\n" );
 			# Update the site_stats.ss_users field
-			$users = $dbw->selectField( 'user', 'COUNT(*)', array(), __METHOD__ );
+			$users = $dbw->selectField( 'user', 'COUNT(*)', [], __METHOD__ );
 			$dbw->update(
 				'site_stats',
-				array( 'ss_users' => $users ),
-				array( 'ss_row_id' => 1 ),
+				[ 'ss_users' => $users ],
+				[ 'ss_row_id' => 1 ],
 				__METHOD__
 			);
 		} elseif ( $count > 0 ) {
@@ -107,26 +107,26 @@ class RemoveUnusedAccounts extends Maintenance {
 	 * @return bool
 	 */
 	private function isInactiveAccount( $id, $master = false ) {
-		$dbo = wfGetDB( $master ? DB_MASTER : DB_SLAVE );
-		$checks = array(
+		$dbo = $this->getDB( $master ? DB_MASTER : DB_SLAVE );
+		$checks = [
 			'revision' => 'rev',
 			'archive' => 'ar',
 			'image' => 'img',
 			'oldimage' => 'oi',
 			'filearchive' => 'fa'
-		);
+		];
 		$count = 0;
 
-		$dbo->begin( __METHOD__ );
+		$this->beginTransaction( $dbo, __METHOD__ );
 		foreach ( $checks as $table => $fprefix ) {
-			$conds = array( $fprefix . '_user' => $id );
+			$conds = [ $fprefix . '_user' => $id ];
 			$count += (int)$dbo->selectField( $table, 'COUNT(*)', $conds, __METHOD__ );
 		}
 
-		$conds = array( 'log_user' => $id, 'log_type != ' . $dbo->addQuotes( 'newusers' ) );
+		$conds = [ 'log_user' => $id, 'log_type != ' . $dbo->addQuotes( 'newusers' ) ];
 		$count += (int)$dbo->selectField( 'logging', 'COUNT(*)', $conds, __METHOD__ );
 
-		$dbo->commit( __METHOD__ );
+		$this->commitTransaction( $dbo, __METHOD__ );
 
 		return $count == 0;
 	}