Fix regression probably from r50975 - link was not parsed

[lhc/web/wiklou.git] / maintenance / removeUnusedAccounts.php

diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
index 33b9a0c..5f74b65 100644 (file)
--- a/maintenance/removeUnusedAccounts.php
+++ b/maintenance/removeUnusedAccounts.php
@@ -1,18 +1,13 @@
 <?php
-
 /**
  * Remove unused user accounts from the database
  * An unused account is one which has made no edits
  *
- * @package MediaWiki
- * @subpackage Maintenance
+ * @file
+ * @ingroup Maintenance
  * @author Rob Church <robchur@gmail.com>
  */
 
-/**
- * @todo Don't delete sysops or bureaucrats
- */
-
 $options = array( 'help', 'delete' );
 require_once( 'commandLine.inc' );
 require_once( 'removeUnusedAccounts.inc' );
@@ -21,17 +16,36 @@ $fname = 'removeUnusedAccounts';
 
 if( isset( $options['help'] ) ) {
        showHelp();
-       exit();
+       exit(1);
 }
 
 # Do an initial scan for inactive accounts and report the result
 echo( "Checking for unused user accounts...\n" );
 $del = array();
-$dbr =& wfGetDB( DB_SLAVE );
-$res = $dbr->select( 'user', array( 'user_id', 'user_name' ), '', $fname );
+$dbr = wfGetDB( DB_SLAVE );
+$res = $dbr->select( 'user', array( 'user_id', 'user_name', 'user_touched' ), '', $fname );
+if( isset( $options['ignore-groups'] ) ) {
+       $excludedGroups = explode( ',', $options['ignore-groups'] );
+} else { $excludedGroups = array(); }
+$touchedSeconds = 0;
+if( isset( $options['ignore-touched'] ) ) {
+       $touchedParamError = 0;
+       if( ctype_digit( $options['ignore-touched'] ) ) {
+               if( $options['ignore-touched'] <= 0 ) {
+                       $touchedParamError = 1;
+               }
+       } else { $touchedParamError = 1; }
+       if( $touchedParamError == 1 ) {
+               die( "Please put a valid positive integer on the --ignore-touched parameter.\n" );
+       } else { $touchedSeconds = 86400 * $options['ignore-touched']; }
+}
 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 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
+               && 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;
                echo( $row->user_name . "\n" );
@@ -43,7 +57,7 @@ echo( "...found {$count}.\n" );
 # If required, go back and delete each marked account
 if( $count > 0 && isset( $options['delete'] ) ) {
        echo( "\nDeleting inactive accounts..." );
-       $dbw =& wfGetDB( DB_MASTER );
+       $dbw = wfGetDB( DB_MASTER );
        $dbw->delete( 'user', array( 'user_id' => $del ), $fname );
        echo( "done.\n" );
        # Update the site_stats.ss_users field
@@ -54,5 +68,3 @@ if( $count > 0 && isset( $options['delete'] ) ) {
                echo( "\nRun the script again with --delete to remove them from the database.\n" );
 }
 echo( "\n" );
-
-?>