1 files changed, 54 insertions, 17 deletions

diff --git a/maintenance/deleteArchivedRevisions.php b/maintenance/deleteArchivedRevisions.php
index 87eebfad..c3f8bf11 100644
--- a/maintenance/deleteArchivedRevisions.php
+++ b/maintenance/deleteArchivedRevisions.php
@@ -3,29 +3,66 @@
 /**
  * Delete archived (deleted from public) revisions from the database
  *
- * @file
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup Maintenance
  * @author Aaron Schulz
  * Shamelessly stolen from deleteOldRevisions.php by Rob Church :)
  */
 
-$options = array( 'delete', 'help' );
-require_once( 'commandLine.inc' );
-require_once( 'deleteArchivedRevisions.inc' );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
-echo( "Delete Archived Revisions\n\n" );
-
-if( @$options['help'] ) {
-	ShowUsage();
-} else {
-	DeleteArchivedRevisions( @$options['delete'] );
-}
+class DeleteArchivedRevisions extends Maintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Deletes all archived revisions\nThese revisions will no longer be restorable";
+		$this->addOption( 'delete', 'Performs the deletion' );
+	}
 
-function ShowUsage() {
-	echo( "Deletes all archived revisions.\n\n" );
-	echo( "These revisions will no longer be restorable.\n\n" );
-	echo( "Usage: php deleteArchivedRevisions.php [--delete|--help]\n\n" );
-	echo( "delete : Performs the deletion\n" );
-	echo( "  help : Show this usage information\n" );
+	public function execute() {
+		$this->output( "Delete archived revisions\n\n" );
+		# Data should come off the master, wrapped in a transaction
+		$dbw = wfGetDB( DB_MASTER );
+		if( $this->hasOption('delete') ) {
+			$dbw->begin();
+	
+			$tbl_arch = $dbw->tableName( 'archive' );
+	
+			# Delete as appropriate
+			$this->output( "Deleting archived revisions... " );
+			$dbw->query( "TRUNCATE TABLE $tbl_arch" );
+	
+			$count = $dbw->affectedRows();
+			$deletedRows = $count != 0;
+	
+			$this->output( "done. $count revisions deleted.\n" );
+	
+			# This bit's done
+			# Purge redundant text records
+			$dbw->commit();
+			if( $deletedRows ) {
+				$this->purgeRedundantText( true );
+			}
+		} else {
+			$res = $dbw->selectRow( 'archive', 'COUNT(*) as count', array(), __FUNCTION__ );
+			$this->output( "Found {$res->count} revisions to delete.\n" );
+			$this->output( "Please run the script again with the --delete option to really delete the revisions.\n" );
+		}
+	}
 }
 
+$maintClass = "DeleteArchivedRevisions";
+require_once( DO_MAINTENANCE );