Merge "AJAXify watchlist editor"

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

diff --git a/maintenance/fixTimestamps.php b/maintenance/fixTimestamps.php
index 61bec78..3a95251 100644 (file)
--- a/maintenance/fixTimestamps.php
+++ b/maintenance/fixTimestamps.php
@@ -1,10 +1,10 @@
 <?php
 /**
 <?php
 /**

- * This script fixes timestamp corruption caused by one or more webservers 
- * temporarily being set to the wrong time. The time offset must be known and
- * consistent. Start and end times (in 14-character format) restrict the search, 
- * and must bracket the damage. There must be a majority of good timestamps in the 
- * search period.
+ * Fixes timestamp corruption caused by one or more webservers temporarily
+ * being set to the wrong time.
+ * The time offset must be known and consistent. Start and end times
+ * (in 14-character format) restrict the search, and must bracket the damage.
+ * There must be a majority of good timestamps in the search period.

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -21,38 +21,47 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *

+ * @file

  * @ingroup Maintenance
  */
  * @ingroup Maintenance
  */

- 
-require_once( "Maintenance.php" );

 
 

+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+
+/**
+ * Maintenance script that fixes timestamp corruption caused by one or
+ * more webservers temporarily being set to the wrong time.
+ *
+ * @ingroup Maintenance
+ */

 class FixTimestamps extends Maintenance {
        public function __construct() {
                parent::__construct();
                $this->mDescription = "";
 class FixTimestamps extends Maintenance {
        public function __construct() {
                parent::__construct();
                $this->mDescription = "";

-               $this->addArgs( array( 'offset', 'start', 'end' ) );
+               $this->addArg( 'offset', '' );
+               $this->addArg( 'start', 'Starting timestamp' );
+               $this->addArg( 'end', 'Ending timestamp' );

        }
 
        public function execute() {
        }
 
        public function execute() {

-               $offset = $this->getArg(0) * 3600;
-               $start = $this->getArg(1);
-               $end = $this->getArg(2);
+               $offset = $this->getArg( 0 ) * 3600;
+               $start = $this->getArg( 1 );
+               $end = $this->getArg( 2 );

                $grace = 60; // maximum normal clock offset
                $grace = 60; // maximum normal clock offset

-       
+

                # Find bounding revision IDs
                $dbw = wfGetDB( DB_MASTER );
                $revisionTable = $dbw->tableName( 'revision' );
                $res = $dbw->query( "SELECT MIN(rev_id) as minrev, MAX(rev_id) as maxrev FROM $revisionTable " .
                        "WHERE rev_timestamp BETWEEN '{$start}' AND '{$end}'", __METHOD__ );
                $row = $dbw->fetchObject( $res );
                # Find bounding revision IDs
                $dbw = wfGetDB( DB_MASTER );
                $revisionTable = $dbw->tableName( 'revision' );
                $res = $dbw->query( "SELECT MIN(rev_id) as minrev, MAX(rev_id) as maxrev FROM $revisionTable " .
                        "WHERE rev_timestamp BETWEEN '{$start}' AND '{$end}'", __METHOD__ );
                $row = $dbw->fetchObject( $res );

-       
+

                if ( is_null( $row->minrev ) ) {
                if ( is_null( $row->minrev ) ) {

-                       $this->error( "No revisions in search period.\n", true );
+                       $this->error( "No revisions in search period.", true );

                }
                }

-       
+

                $minRev = $row->minrev;
                $maxRev = $row->maxrev;
                $minRev = $row->minrev;
                $maxRev = $row->maxrev;

-       
+

                # Select all timestamps and IDs
                $sql = "SELECT rev_id, rev_timestamp FROM $revisionTable " .
                        "WHERE rev_id BETWEEN $minRev AND $maxRev";
                # Select all timestamps and IDs
                $sql = "SELECT rev_id, rev_timestamp FROM $revisionTable " .
                        "WHERE rev_id BETWEEN $minRev AND $maxRev";


@@ -62,14 +71,14 @@ class FixTimestamps extends Maintenance {
                } else {
                        $expectedSign = 1;
                }
                } else {
                        $expectedSign = 1;
                }

-       
+

                $res = $dbw->query( $sql, __METHOD__ );
                $res = $dbw->query( $sql, __METHOD__ );

-       
+

                $lastNormal = 0;
                $badRevs = array();
                $numGoodRevs = 0;
                $lastNormal = 0;
                $badRevs = array();
                $numGoodRevs = 0;

-       
-               while ( $row = $dbw->fetchObject( $res ) ) {
+
+               foreach ( $res as $row ) {

                        $timestamp = wfTimestamp( TS_UNIX, $row->rev_timestamp );
                        $delta = $timestamp - $lastNormal;
                        $sign = $delta == 0 ? 0 : $delta / abs( $delta );
                        $timestamp = wfTimestamp( TS_UNIX, $row->rev_timestamp );
                        $delta = $timestamp - $lastNormal;
                        $sign = $delta == 0 ? 0 : $delta / abs( $delta );


@@ -87,27 +96,25 @@ class FixTimestamps extends Maintenance {
                                $badRevs[] = $row->rev_id;
                        }
                }
                                $badRevs[] = $row->rev_id;
                        }
                }

-               $dbw->freeResult( $res );
-       
+

                $numBadRevs = count( $badRevs );
                if ( $numBadRevs > $numGoodRevs ) {
                $numBadRevs = count( $badRevs );
                if ( $numBadRevs > $numGoodRevs ) {

-                       $this->error( 
+                       $this->error(

                "The majority of revisions in the search interval are marked as bad.
 
                "The majority of revisions in the search interval are marked as bad.
 

-               Are you sure the offset ($offset) has the right sign? Positive means the clock 
+               Are you sure the offset ($offset) has the right sign? Positive means the clock

                was incorrectly set forward, negative means the clock was incorrectly set back.
 
                was incorrectly set forward, negative means the clock was incorrectly set back.
 

-               If the offset is right, then increase the search interval until there are enough 
-               good revisions to provide a majority reference.
-               ", true );
+               If the offset is right, then increase the search interval until there are enough
+               good revisions to provide a majority reference.", true );

                } elseif ( $numBadRevs == 0 ) {
                        $this->output( "No bad revisions found.\n" );
                } elseif ( $numBadRevs == 0 ) {
                        $this->output( "No bad revisions found.\n" );

-                       exit(0);
+                       exit( 0 );

                }
                }

-       
-               $this->output( sprintf( "Fixing %d revisions (%.2f%% of revisions in search interval)\n", 
-                       $numBadRevs, $numBadRevs / ($numGoodRevs + $numBadRevs) * 100 ) );
-       
+
+               $this->output( sprintf( "Fixing %d revisions (%.2f%% of revisions in search interval)\n",
+                       $numBadRevs, $numBadRevs / ( $numGoodRevs + $numBadRevs ) * 100 ) );
+

                $fixup = -$offset;
                $sql = "UPDATE $revisionTable " .
                        "SET rev_timestamp=DATE_FORMAT(DATE_ADD(rev_timestamp, INTERVAL $fixup SECOND), '%Y%m%d%H%i%s') " .
                $fixup = -$offset;
                $sql = "UPDATE $revisionTable " .
                        "SET rev_timestamp=DATE_FORMAT(DATE_ADD(rev_timestamp, INTERVAL $fixup SECOND), '%Y%m%d%H%i%s') " .


@@ -118,4 +125,4 @@ class FixTimestamps extends Maintenance {
 }
 
 $maintClass = "FixTimestamps";
 }
 
 $maintClass = "FixTimestamps";

-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );