1 files changed, 28 insertions, 16 deletions

diff --git a/maintenance/checkUsernames.php b/maintenance/checkUsernames.php
index 77565b99..85a3d157 100644
--- a/maintenance/checkUsernames.php
+++ b/maintenance/checkUsernames.php
@@ -3,40 +3,52 @@
  * This script verifies that database usernames are actually valid.
  * An existing usernames can become invalid if User::isValidUserName()
  * is altered or if we change the $wgMaxNameChars
- * @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
  */
 
-error_reporting(E_ALL ^ E_NOTICE);
-require_once 'commandLine.inc';
 
-class checkUsernames {
-	var $stderr, $log;
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
-	function checkUsernames() {
-		$this->stderr = fopen( 'php://stderr', 'wt' );
+class CheckUsernames extends Maintenance {
+
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Verify that database usernames are actually valid";
 	}
-	function main() {
-		$fname = 'checkUsernames::main';
 
+	function execute() {
 		$dbr = wfGetDB( DB_SLAVE );
 
 		$res = $dbr->select( 'user',
 			array( 'user_id', 'user_name' ),
 			null,
-			$fname
+			__METHOD__
 		);
 
-		while ( $row = $dbr->fetchObject( $res ) ) {
+		foreach ( $res as $row ) {
 			if ( ! User::isValidUserName( $row->user_name ) ) {
-				$out = sprintf( "%s: %6d: '%s'\n", wfWikiID(), $row->user_id, $row->user_name );
-				fwrite( $this->stderr, $out );
+				$this->error( sprintf( "%s: %6d: '%s'\n", wfWikiID(), $row->user_id, $row->user_name ) );
 				wfDebugLog( 'checkUsernames', $out );
 			}
 		}
 	}
 }
 
-$cun = new checkUsernames();
-$cun->main();
-
+$maintClass = "CheckUsernames";
+require_once( DO_MAINTENANCE );