Ignore sysops+bcrats and accounts touched in the last week. Patch by Louperivois.

diff --git a/maintenance/removeUnusedAccounts.inc b/maintenance/removeUnusedAccounts.inc
index 8f90027..a21dcc7 100644 (file)
--- a/maintenance/removeUnusedAccounts.inc
+++ b/maintenance/removeUnusedAccounts.inc
@@ -38,6 +38,8 @@ function isInactiveAccount( $id, $master = false ) {
  */
 function showHelp() {
        echo( "Delete unused user accounts from the database.\n\n" );
+       echo( "Accounts touched within the last week will be ignored.\n\n" );
+       echo( "Sysops and bureaucrats will be ignored.\n\n" );
        echo( "USAGE: php removeUnusedAccounts.php [--delete]\n\n" );
        echo( "  --delete : Delete accounts which are discovered to be inactive\n" );
        echo( "\n" );

diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
index 636832c..324f3c7 100644 (file)
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -8,9 +8,6 @@
  * @author Rob Church <robchur@gmail.com>
  */
 
-/**
- * @todo Don't delete sysops or bureaucrats
- */
 
 $options = array( 'help', 'delete' );
 require_once( 'commandLine.inc' );
@@ -27,10 +24,15 @@ if( isset( $options['help'] ) ) {
 echo( "Checking for unused user accounts...\n" );
 $del = array();
 $dbr = wfGetDB( DB_SLAVE );
-$res = $dbr->select( 'user', array( 'user_id', 'user_name' ), '', $fname );
+$res = $dbr->select( 'user', array( 'user_id', 'user_name', 'user_touched' ), '', $fname );
+$excludedGroups = array( 'sysop', 'bureaucrat' );
 while( $row = $dbr->fetchObject( $res ) ) {
-       # Check the account, but ignore it if it's the primary administrator
-       if( $row->user_id > 1 && isInactiveAccount( $row->user_id, true ) ) {
+       # Check the account, but ignore it if it's within the "sysop" or "bureaucrat" group.
+       $instance = User::newFromId( $row->user_id );
+       if( count( array_intersect( $instance->getGroups(), $excludedGroups ) ) == 0
+               && isInactiveAccount( $row->user_id, true ) 
+               && wfTimestamp( TS_UNIX, $row->user_touched ) < wfTimestamp( TS_UNIX, time() - 604800 ) 
+               ) {
                # Inactive; print out the name and flag it
                $del[] = $row->user_id;
                echo( $row->user_name . "\n" );
@@ -53,5 +55,3 @@ if( $count > 0 && isset( $options['delete'] ) ) {
                echo( "\nRun the script again with --delete to remove them from the database.\n" );
 }
 echo( "\n" );
-
-