coding style tweaks

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

diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index 6e68a82..df4ba36 100644 (file)
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -27,7 +27,7 @@
  * @ingroup Maintenance
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class Orphans extends Maintenance {
        public function __construct() {
@@ -55,7 +55,7 @@ class Orphans extends Maintenance {
         */
        private function lockTables( &$db, $extraTable = null ) {
                $tbls = array( 'page', 'revision', 'redirect' );
-               if( $extraTable )
+               if ( $extraTable )
                        $tbls[] = $extraTable;
                $db->lockTables( array(), $tbls, __METHOD__, false );
        }
@@ -69,7 +69,7 @@ class Orphans extends Maintenance {
                $page = $dbw->tableName( 'page' );
                $revision = $dbw->tableName( 'revision' );
        
-               if( $fix ) {
+               if ( $fix ) {
                        $this->lockTables( $dbw );
                }
        
@@ -78,13 +78,13 @@ class Orphans extends Maintenance {
                        SELECT *
                        FROM $revision LEFT OUTER JOIN $page ON rev_page=page_id
                        WHERE page_id IS NULL
-               ");
+               " );
                $orphans = $dbw->numRows( $result );
-               if( $orphans > 0 ) {
+               if ( $orphans > 0 ) {
                        global $wgContLang;
                        $this->output( "$orphans orphan revisions...\n" );
                        $this->output( sprintf( "%10s %10s %14s %20s %s\n", 'rev_id', 'rev_page', 'rev_timestamp', 'rev_user_text', 'rev_comment' ) );
-                       while( $row = $dbw->fetchObject( $result ) ) {
+                       foreach ( $result as $row ) {
                                $comment = ( $row->rev_comment == '' )
                                        ? ''
                                        : '(' . $wgContLang->truncate( $row->rev_comment, 40 ) . ')';
@@ -94,19 +94,19 @@ class Orphans extends Maintenance {
                                        $row->rev_timestamp,
                                        $wgContLang->truncate( $row->rev_user_text, 17 ),
                                        $comment ) );
-                               if( $fix ) {
+                               if ( $fix ) {
                                        $dbw->delete( 'revision', array( 'rev_id' => $row->rev_id ) );
                                }
                        }
-                       if( !$fix ) {
+                       if ( !$fix ) {
                                $this->output( "Run again with --fix to remove these entries automatically.\n" );
                        }
                } else {
                        $this->output( "No orphans! Yay!\n" );
                }
        
-               if( $fix ) {
-                       $dbw->unlockTables();
+               if ( $fix ) {
+                       $dbw->unlockTables( __METHOD__ );
                }
        }
 
@@ -121,7 +121,7 @@ class Orphans extends Maintenance {
                $page = $dbw->tableName( 'page' );
                $revision = $dbw->tableName( 'revision' );
 
-               if( $fix ) {
+               if ( $fix ) {
                        $this->lockTables( $dbw );
                }
 
@@ -130,31 +130,30 @@ class Orphans extends Maintenance {
                        SELECT *
                        FROM $page LEFT OUTER JOIN $revision ON page_latest=rev_id
                        WHERE rev_id IS NULL
-               ");
+               " );
                $widows = $dbw->numRows( $result );
-               if( $widows > 0 ) {
-                       global $wgContLang;
+               if ( $widows > 0 ) {
                        $this->output( "$widows childless pages...\n" );
                        $this->output( sprintf( "%10s %11s %2s %s\n", 'page_id', 'page_latest', 'ns', 'page_title' ) );
-                       while( $row = $dbw->fetchObject( $result ) ) {
+                       foreach ( $result as $row ) {
                                printf( "%10d %11d %2d %s\n",
                                        $row->page_id,
                                        $row->page_latest,
                                        $row->page_namespace,
                                        $row->page_title );
-                               if( $fix ) {
+                               if ( $fix ) {
                                        $dbw->delete( 'page', array( 'page_id' => $row->page_id ) );
                                }
                        }
-                       if( !$fix ) {
+                       if ( !$fix ) {
                                $this->output( "Run again with --fix to remove these entries automatically.\n" );
                        }
                } else {
                        $this->output( "No childless pages! Yay!\n" );
                }
        
-               if( $fix ) {
-                       $dbw->unlockTables();
+               if ( $fix ) {
+                       $dbw->unlockTables( __METHOD__ );
                }
        }
 
@@ -168,7 +167,7 @@ class Orphans extends Maintenance {
                $revision = $dbw->tableName( 'revision' );
                $text     = $dbw->tableName( 'text' );
        
-               if( $fix ) {
+               if ( $fix ) {
                        $dbw->lockTables( $dbw, 'text' );
                }
        
@@ -176,19 +175,18 @@ class Orphans extends Maintenance {
                $result = $dbw->query( "
                        SELECT *
                        FROM $page LEFT OUTER JOIN $revision ON page_latest=rev_id
-               ");
+               " );
                $found = 0;
-               while( $row = $dbw->fetchObject( $result ) ) {
+               foreach ( $result as $row ) {
                        $result2 = $dbw->query( "
                                SELECT MAX(rev_timestamp) as max_timestamp
                                FROM $revision
                                WHERE rev_page=$row->page_id
                        " );
                        $row2 = $dbw->fetchObject( $result2 );
-                       $dbw->freeResult( $result2 );
-                       if( $row2 ) {
-                               if( $row->rev_timestamp != $row2->max_timestamp ) {
-                                       if( $found == 0 ) {
+                       if ( $row2 ) {
+                               if ( $row->rev_timestamp != $row2->max_timestamp ) {
+                                       if ( $found == 0 ) {
                                                $this->output( sprintf( "%10s %10s %14s %14s\n",
                                                        'page_id', 'rev_id', 'timestamp', 'max timestamp' ) );
                                        }
@@ -198,7 +196,7 @@ class Orphans extends Maintenance {
                                                $row->page_latest,
                                                $row->rev_timestamp,
                                                $row2->max_timestamp ) );
-                                       if( $fix ) {
+                                       if ( $fix ) {
                                                # ...
                                                $maxId = $dbw->selectField(
                                                        'revision',
@@ -218,17 +216,17 @@ class Orphans extends Maintenance {
                        }
                }
        
-               if( $found ) {
+               if ( $found ) {
                        $this->output( "Found $found pages with incorrect latest revision.\n" );
                } else {
                        $this->output( "No pages with incorrect latest revision. Yay!\n" );
                }
-               if( !$fix && $found > 0 ) {
+               if ( !$fix && $found > 0 ) {
                        $this->output( "Run again with --fix to remove these entries automatically.\n" );
                }
        
-               if( $fix ) {
-                       $dbw->unlockTables();
+               if ( $fix ) {
+                       $dbw->unlockTables( __METHOD__ );
                }
        }
 }