Actually declare $wgOut ;)

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

diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index 3f29d31..ea01ba7 100644 (file)
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -24,23 +24,19 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @file
  * @author Brion Vibber <brion at pobox.com>
  * @ingroup Maintenance
  */
 
-require_once( 'commandLine.inc' );
-require_once( 'cleanupTable.inc' );
+require_once( dirname(__FILE__) . '/cleanupTable.inc' );
 
-/**
- * @ingroup Maintenance
- */
 class TitleCleanup extends TableCleanup {
-       function __construct( $dryrun = false ) {
-               parent::__construct( 'page', $dryrun );
+       public function __construct() {
+               parent::__construct();
+               $this->mDescription = "Script to clean up broken, unparseable titles";
        }
 
-       function processPage( $row ) {
+       protected function processPage( $row ) {
                $current = Title::makeTitle( $row->page_namespace, $row->page_title );
                $display = $current->getPrefixedText();
 
@@ -48,25 +44,25 @@ class TitleCleanup extends TableCleanup {
 
                $title = Title::newFromText( $verified );
 
-               if( !is_null( $title ) && $title->equals( $current ) ) {
+               if( !is_null( $title ) && $title->equals( $current ) && $title->canExist() ) {
                        return $this->progress( 0 );  // all is fine
                }
 
                if( $row->page_namespace == NS_FILE && $this->fileExists( $row->page_title ) ) {
-                       $this->log( "file $row->page_title needs cleanup, please run cleanupImages.php." );
+                       $this->output( "file $row->page_title needs cleanup, please run cleanupImages.php.\n" );
                        return $this->progress( 0 );
                } elseif( is_null( $title ) ) {
-                       $this->log( "page $row->page_id ($display) is illegal." );
+                       $this->output( "page $row->page_id ($display) is illegal.\n" );
                        $this->moveIllegalPage( $row );
                        return $this->progress( 1 );
                } else {
-                       $this->log( "page $row->page_id ($display) doesn't match self." );
+                       $this->output( "page $row->page_id ($display) doesn't match self.\n" );
                        $this->moveInconsistentPage( $row, $title );
                        return $this->progress( 1 );
                }
        }
 
-       function fileExists( $name ) {
+       protected function fileExists( $name ) {
                // XXX: Doesn't actually check for file existence, just presence of image record.
                // This is reasonable, since cleanupImages.php only iterates over the image table.
                $dbr = wfGetDB( DB_SLAVE );
@@ -74,7 +70,7 @@ class TitleCleanup extends TableCleanup {
                return $row !== false;
        }
 
-       function moveIllegalPage( $row ) {
+       protected function moveIllegalPage( $row ) {
                $legal = 'A-Za-z0-9_/\\\\-';
                $legalized = preg_replace_callback( "!([^$legal])!",
                        array( &$this, 'hexChar' ),
@@ -86,28 +82,28 @@ class TitleCleanup extends TableCleanup {
                $title = Title::newFromText( $legalized );
                if( is_null( $title ) ) {
                        $clean = 'Broken/id:' . $row->page_id;
-                       $this->log( "Couldn't legalize; form '$legalized' still invalid; using '$clean'" );
+                       $this->output( "Couldn't legalize; form '$legalized' still invalid; using '$clean'\n" );
                        $title = Title::newFromText( $clean );
                } elseif( $title->exists() ) {
                        $clean = 'Broken/id:' . $row->page_id;
-                       $this->log( "Legalized for '$legalized' exists; using '$clean'" );
+                       $this->output( "Legalized for '$legalized' exists; using '$clean'\n" );
                        $title = Title::newFromText( $clean );
                }
 
                $dest = $title->getDBkey();
                if( $this->dryrun ) {
-                       $this->log( "DRY RUN: would rename $row->page_id ($row->page_namespace,'$row->page_title') to ($row->page_namespace,'$dest')" );
+                       $this->output( "DRY RUN: would rename $row->page_id ($row->page_namespace,'$row->page_title') to ($row->page_namespace,'$dest')\n" );
                } else {
-                       $this->log( "renaming $row->page_id ($row->page_namespace,'$row->page_title') to ($row->page_namespace,'$dest')" );
+                       $this->output( "renaming $row->page_id ($row->page_namespace,'$row->page_title') to ($row->page_namespace,'$dest')\n" );
                        $dbw = wfGetDB( DB_MASTER );
                        $dbw->update( 'page',
                                array( 'page_title' => $dest ),
                                array( 'page_id' => $row->page_id ),
-                               'cleanupTitles::moveInconsistentPage' );
+                               __METHOD__ );
                }
        }
 
-       function moveInconsistentPage( $row, $title ) {
+       protected function moveInconsistentPage( $row, $title ) {
                if( $title->exists() || $title->getInterwiki() ) {
                        if( $title->getInterwiki() ) {
                                $prior = $title->getPrefixedDbKey();
@@ -118,20 +114,20 @@ class TitleCleanup extends TableCleanup {
                        $verified = Title::makeTitleSafe( $row->page_namespace, $clean );
                        if( $verified->exists() ) {
                                $blah = "Broken/id:" . $row->page_id;
-                               $this->log( "Couldn't legalize; form '$clean' exists; using '$blah'" );
+                               $this->output( "Couldn't legalize; form '$clean' exists; using '$blah'\n" );
                                $verified = Title::makeTitleSafe( $row->page_namespace, $blah );
                        }
                        $title = $verified;
                }
                if( is_null( $title ) ) {
-                       wfDie( "Something awry; empty title.\n" );
+                       $this->error( "Something awry; empty title.", true );
                }
                $ns = $title->getNamespace();
                $dest = $title->getDBkey();
                if( $this->dryrun ) {
-                       $this->log( "DRY RUN: would rename $row->page_id ($row->page_namespace,'$row->page_title') to ($row->page_namespace,'$dest')" );
+                       $this->output( "DRY RUN: would rename $row->page_id ($row->page_namespace,'$row->page_title') to ($row->page_namespace,'$dest')\n" );
                } else {
-                       $this->log( "renaming $row->page_id ($row->page_namespace,'$row->page_title') to ($ns,'$dest')" );
+                       $this->output( "renaming $row->page_id ($row->page_namespace,'$row->page_title') to ($ns,'$dest')\n" );
                        $dbw = wfGetDB( DB_MASTER );
                        $dbw->update( 'page',
                                array(
@@ -139,15 +135,12 @@ class TitleCleanup extends TableCleanup {
                                        'page_title' => $dest
                                ),
                                array( 'page_id' => $row->page_id ),
-                               'cleanupTitles::moveInconsistentPage' );
+                               __METHOD__ );
                        $linkCache = LinkCache::singleton();
                        $linkCache->clear();
                }
        }
 }
 
-$wgUser->setName( 'Conversion script' );
-$caps = new TitleCleanup( !isset( $options['fix'] ) );
-$caps->cleanup();
-
-
+$maintClass = "TitleCleanup";
+require_once( DO_MAINTENANCE );