* (bug 7681, 11559) Cookie values no longer override GET and POST variables.

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

diff --git a/maintenance/checkUsernames.php b/maintenance/checkUsernames.php
index 479f327..3441aee 100644 (file)
--- a/maintenance/checkUsernames.php
+++ b/maintenance/checkUsernames.php
@@ -7,25 +7,23 @@ class checkUsernames {
 
        function checkUsernames() {
                $this->stderr = fopen( 'php://stderr', 'wt' );
-               $this->log = fopen( '/home/wikipedia/logs/checkUsernames.log', 'at' );
        }
        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 ) ) {
-                               $out = sprintf( "%s: %6d: %s\n", $wgDBname, $row->user_id, $row->user_name );
-                               fwrite( $this->log, $out );
+                               $out = sprintf( "%s: %6d: '%s'\n", wfWikiID(), $row->user_id, $row->user_name );
+                               fwrite( $this->stderr, $out );
+                               wfDebugLog( 'checkUsernames', $out );
                        }
                }
        }
@@ -33,3 +31,4 @@ class checkUsernames {
 
 $cun = new checkUsernames();
 $cun->main();
+