X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FremoveUnusedAccounts.php;h=90dc62204a9d6ee5c1ca9b123eff028e11fcc24d;hb=d0e47d475cd7efd7541d51e02ab216a966da8b1f;hp=24c66b1f09af745e0167b39956bbd9771f703907;hpb=417e346059bac2c1a8f1fc1e2aad4dff2a6afd41;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php index 24c66b1f09..90dc62204a 100644 --- a/maintenance/removeUnusedAccounts.php +++ b/maintenance/removeUnusedAccounts.php @@ -58,12 +58,13 @@ class RemoveUnusedAccounts extends Maintenance { } $touchedSeconds = 86400 * $touched; foreach ( $res as $row ) { - # Check the account, but ignore it if it's within a $excludedGroups group or if it's touched within the $touchedSeconds seconds. + # Check the account, but ignore it if it's within a $excludedGroups + # group or if it's touched within the $touchedSeconds seconds. $instance = User::newFromId( $row->user_id ); 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" ); @@ -74,7 +75,7 @@ class RemoveUnusedAccounts extends Maintenance { # If required, go back and delete each marked account if ( $count > 0 && $this->hasOption( 'delete' ) ) { - $this->output( "\nDeleting inactive accounts..." ); + $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__ ); @@ -85,7 +86,12 @@ class RemoveUnusedAccounts extends Maintenance { $this->output( "done.\n" ); # Update the site_stats.ss_users field $users = $dbw->selectField( 'user', 'COUNT(*)', array(), __METHOD__ ); - $dbw->update( 'site_stats', array( 'ss_users' => $users ), array( 'ss_row_id' => 1 ), __METHOD__ ); + $dbw->update( + 'site_stats', + array( 'ss_users' => $users ), + array( 'ss_row_id' => 1 ), + __METHOD__ + ); } elseif ( $count > 0 ) { $this->output( "\nRun the script again with --delete to remove them from the database.\n" ); } @@ -96,8 +102,8 @@ class RemoveUnusedAccounts extends Maintenance { * Could the specified user account be deemed inactive? * (No edits, no deleted edits, no log entries, no current/old uploads) * - * @param $id User's ID - * @param $master bool Perform checking on the master + * @param int $id User's ID + * @param bool $master Perform checking on the master * @return bool */ private function isInactiveAccount( $id, $master = false ) {