Pulling back r45388 "Don't needlessly shy from reuniting lost files with their descri...

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

diff --git a/maintenance/checkUsernames.php b/maintenance/checkUsernames.php
index 9f5f37c..77565b9 100644 (file)
--- a/maintenance/checkUsernames.php
+++ b/maintenance/checkUsernames.php
@@ -1,32 +1,42 @@
 <?php
+/**
+ * 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
+ * @ingroup Maintenance
+ */
+
 error_reporting(E_ALL ^ E_NOTICE);
 require_once 'commandLine.inc';
 
 class checkUsernames {
-       var $stderr;
+       var $stderr, $log;
 
        function checkUsernames() {
                $this->stderr = fopen( 'php://stderr', 'wt' );
        }
        function main() {
-               global $wgDBname;
                $fname = 'checkUsernames::main';
-               
-               $dbr =& wfGetDB( DB_SLAVE );
-               
+
+               $dbr = wfGetDB( DB_SLAVE );
+
                $res = $dbr->select( 'user',
                        array( 'user_id', 'user_name' ),
                        null,
                        $fname
                );
 
-               fwrite( $this->stderr, "Checking $wgDBname\n" );
                while ( $row = $dbr->fetchObject( $res ) ) {
-                       if ( ! User::isValidUserName( $row->user_name ) )
-                               printf( "%s: %6d: %s\n", $wgDBname, $row->user_id, $row->user_name );
+                       if ( ! User::isValidUserName( $row->user_name ) ) {
+                               $out = sprintf( "%s: %6d: '%s'\n", wfWikiID(), $row->user_id, $row->user_name );
+                               fwrite( $this->stderr, $out );
+                               wfDebugLog( 'checkUsernames', $out );
+                       }
                }
        }
 }
 
-$cun = new checkUsernames;
+$cun = new checkUsernames();
 $cun->main();
+