Revert r97788

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

diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index 0d6dac9..14db164 100644 (file)
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -26,39 +26,40 @@
  *
  * @ingroup Maintenance
  */
- 
-require_once( "Maintenance.php" );
+
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class DeleteBatch extends Maintenance {
-       
+
        public function __construct() {
                parent::__construct();
                $this->mDescription = "Deletes a batch of pages";
                $this->addOption( 'u', "User to perform deletion", false, true );
                $this->addOption( 'r', "Reason to delete page", false, true );
                $this->addOption( 'i', "Interval to sleep between deletions" );
-               $this->addArgs( array( 'listfile' ) );
+               $this->addArg( 'listfile', 'File with titles to delete, separated by newlines. ' .
+                       'If not given, stdin will be used.', false );
        }
-       
+
        public function execute() {
                global $wgUser;
 
                # Change to current working directory
                $oldCwd = getcwd();
                chdir( $oldCwd );
-       
+
                # Options processing
                $user = $this->getOption( 'u', 'Delete page script' );
                $reason = $this->getOption( 'r', '' );
                $interval = $this->getOption( 'i', 0 );
-               if( $this->hasArg() ) {
+               if ( $this->hasArg() ) {
                        $file = fopen( $this->getArg(), 'r' );
                } else {
                        $file = $this->getStdin();
                }
 
                # Setup
-               if( !$file ) {
+               if ( !$file ) {
                        $this->error( "Unable to read file, exiting", true );
                }
                $wgUser = User::newFromName( $user );
@@ -75,38 +76,39 @@ class DeleteBatch extends Maintenance {
                                $this->output( "Invalid title '$line' on line $linenum\n" );
                                continue;
                        }
-                       if( !$page->exists() ) {
+                       if ( !$page->exists() ) {
                                $this->output( "Skipping nonexistent page '$line'\n" );
                                continue;
                        }
-       
-       
+
                        $this->output( $page->getPrefixedText() );
                        $dbw->begin();
-                       if( $page->getNamespace() == NS_FILE ) {
+                       if ( $page->getNamespace() == NS_FILE ) {
                                $art = new ImagePage( $page );
                                $img = wfFindFile( $art->mTitle );
-                               if( !$img || !$img->delete( $reason ) ) {
-                                       $this->output( "FAILED to delete image file... " );
+                               if ( !$img
+                                       || !$img->isLocal()
+                                       || !$img->delete( $reason ) ) {
+                                       $this->output( " FAILED to delete image file... " );
                                }
                        } else {
                                $art = new Article( $page );
                        }
                        $success = $art->doDeleteArticle( $reason );
-                       $dbw->immediateCommit();
+                       $dbw->commit();
                        if ( $success ) {
-                               $this->output( "\n" );
+                               $this->output( " Deleted!\n" );
                        } else {
                                $this->output( " FAILED to delete article\n" );
                        }
-       
+
                        if ( $interval ) {
                                sleep( $interval );
                        }
-                       wfWaitForSlaves( 5 );
-}
+                       wfWaitForSlaves();
+               }
        }
 }
 
 $maintClass = "DeleteBatch";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );