Fix line removedfor no explicit reason from r85771

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

diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php
index 78f117c..8561281 100644 (file)
--- a/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@ -17,21 +17,22 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class CleanupSpam extends Maintenance {
        public function __construct() {
                parent::__construct();
                $this->mDescription = "Cleanup all spam from a given hostname";
                $this->addOption( 'all', 'Check all wikis in $wgLocalDatabases' );
-               $this->addArgs( array( 'hostname' ) );
+               $this->addArg( 'hostname', 'Hostname that was spamming' );
        }
 
        public function execute() {
-               global $wgLocalDatabases;
+               global $wgLocalDatabases, $wgUser;
 
                $username = wfMsg( 'spambot_username' );
                $wgUser = User::newFromName( $username );
@@ -40,24 +41,23 @@ class CleanupSpam extends Maintenance {
                        $wgUser->addToDatabase();
                }
                $spec = $this->getArg();
-               $like = LinkFilter::makeLike( $spec );
+               $like = LinkFilter::makeLikeArray( $spec );
                if ( !$like ) {
                        $this->error( "Not a valid hostname specification: $spec", true );
                }
 
-               $dbr = wfGetDB( DB_SLAVE );
-       
-               if ( $this->hasOption('all') ) {
+               if ( $this->hasOption( 'all' ) ) {
                        // Clean up spam on all wikis
-                       $dbr = wfGetDB( DB_SLAVE );
-                       $this->output( "Finding spam on " . count($wgLocalDatabases) . " wikis\n" );
+                       $this->output( "Finding spam on " . count( $wgLocalDatabases ) . " wikis\n" );
                        $found = false;
-                       foreach ( $wgLocalDatabases as $db ) {
-                               $count = $dbr->selectField( "`$db`.externallinks", 'COUNT(*)', 
-                                       array( 'el_index LIKE ' . $dbr->addQuotes( $like ) ), __METHOD__ );
+                       foreach ( $wgLocalDatabases as $wikiID ) {
+                               $dbr = wfGetDB( DB_SLAVE, array(), $wikiID );
+
+                               $count = $dbr->selectField( 'externallinks', 'COUNT(*)',
+                                       array( 'el_index' . $dbr->buildLike( $like ) ), __METHOD__ );
                                if ( $count ) {
                                        $found = true;
-                                       passthru( "php cleanupSpam.php $db $spec | sed s/^/$db:  /" );
+                                       passthru( "php cleanupSpam.php --wiki='$wikiID' $spec | sed 's/^/$wikiID:  /'" );
                                }
                        }
                        if ( $found ) {
@@ -67,11 +67,13 @@ class CleanupSpam extends Maintenance {
                        }
                } else {
                        // Clean up spam on this wiki
-                       $res = $dbr->select( 'externallinks', array( 'DISTINCT el_from' ), 
-                               array( 'el_index LIKE ' . $dbr->addQuotes( $like ) ), __METHOD__ );
+
+                       $dbr = wfGetDB( DB_SLAVE );
+                       $res = $dbr->select( 'externallinks', array( 'DISTINCT el_from' ),
+                               array( 'el_index' . $dbr->buildLike( $like ) ), __METHOD__ );
                        $count = $dbr->numRows( $res );
                        $this->output( "Found $count articles containing $spec\n" );
-                       while ( $row = $dbr->fetchObject( $res ) ) {
+                       foreach ( $res as $row ) {
                                $this->cleanupArticle( $row->el_from, $spec );
                        }
                        if ( $count ) {
@@ -86,15 +88,15 @@ class CleanupSpam extends Maintenance {
                        $this->error( "Internal error: no page for ID $id" );
                        return;
                }
-       
+
                $this->output( $title->getPrefixedDBkey() . " ..." );
                $rev = Revision::newFromTitle( $title );
                $revId = $rev->getId();
                $currentRevId = $revId;
-       
+
                while ( $rev && LinkFilter::matchEntry( $rev->getText() , $domain ) ) {
                        # Revision::getPrevious can't be used in this way before MW 1.6 (Revision.php 1.26)
-                       #$rev = $rev->getPrevious();
+                       # $rev = $rev->getPrevious();
                        $revId = $title->getPreviousRevisionID( $revId );
                        if ( $revId ) {
                                $rev = Revision::newFromTitle( $title, $revId );
@@ -108,25 +110,22 @@ class CleanupSpam extends Maintenance {
                        $this->output( "False match\n" );
                } else {
                        $dbw = wfGetDB( DB_MASTER );
-                       $dbw->immediateBegin();
+                       $dbw->begin();
                        if ( !$rev ) {
                                // Didn't find a non-spammy revision, blank the page
                                $this->output( "blanking\n" );
                                $article = new Article( $title );
-                               $article->updateArticle( '', wfMsg( 'spam_blanking', $domain ),
-                                       false, false );
-       
+                               $article->doEdit( '', wfMsg( 'spam_blanking', $domain ) );
                        } else {
                                // Revert to this revision
                                $this->output( "reverting\n" );
                                $article = new Article( $title );
-                               $article->updateArticle( $rev->getText(), wfMsg( 'spam_reverting', $domain ), false, false );
+                               $article->doEdit( $rev->getText(), wfMsg( 'spam_reverting', $domain ), EDIT_UPDATE );
                        }
-                       $dbw->immediateCommit();
-                       wfDoUpdates();
+                       $dbw->commit();
                }
        }
 }
 
 $maintClass = "CleanupSpam";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );