Merge "Non-word characters don't terminate tag names."

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

diff --git a/maintenance/resetUserTokens.php b/maintenance/resetUserTokens.php
index 52407f4..241d632 100644 (file)
--- a/maintenance/resetUserTokens.php
+++ b/maintenance/resetUserTokens.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Script to reset the user_token for all users on the wiki. Useful if you
- * believe that your user table was acidentally leaked to an external source.
+ * Reset the user_token for all users on the wiki. Useful if you believe
+ * that your user table was acidentally leaked to an external source.
  *
  * 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
@@ -23,31 +23,31 @@
  * @author Daniel Friesen <mediawiki@danielfriesen.name>
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
+/**
+ * Maintenance script to reset the user_token for all users on the wiki.
+ *
+ * @ingroup Maintenance
+ */
 class ResetUserTokens extends Maintenance {
        public function __construct() {
                parent::__construct();
                $this->mDescription = "Reset the user_token of all users on the wiki. Note that this may log some of them out.";
                $this->addOption( 'nowarn', "Hides the 5 seconds warning", false, false );
-               $this->addOption( 'quiet', "Do not print what is happening", false, false );
        }
 
        public function execute() {
-               $nowarn = $this->getOption( 'nowarn' );
-               $quiet = $this->getOption( 'quiet' );
-               
-               if ( !$nowarn ) {
-                       echo <<<WARN
-The script is about to reset the user_token for ALL USERS in the database.
-This may log some of them out and is not necessary unless you believe your
-user table has been compromised.
 
-Abort with control-c in the next five seconds....
-WARN;
+               if ( !$this->getOption( 'nowarn' ) ) {
+                       $this->output( "The script is about to reset the user_token for ALL USERS in the database.\n" );
+                       $this->output( "This may log some of them out and is not necessary unless you believe your\n" );
+                       $this->output( "user table has been compromised.\n" );
+                       $this->output( "\n" );
+                       $this->output( "Abort with control-c in the next five seconds (skip this countdown with --nowarn) ... " );
                        wfCountDown( 5 );
                }
-               
+
                // We list user by user_id from one of the slave database
                $dbr = wfGetDB( DB_SLAVE );
                $result = $dbr->select( 'user',
@@ -58,25 +58,21 @@ WARN;
 
                foreach ( $result as $id ) {
                        $user = User::newFromId( $id->user_id );
-                       
+
                        $username = $user->getName();
-                       
-                       if ( !$quiet ) {
-                               echo "Resetting user_token for $username: ";
-                       }
-                       
+
+                       $this->output( "Resetting user_token for $username: " );
+
                        // Change value
                        $user->setToken();
                        $user->saveSettings();
-                       
-                       if ( !$quiet ) {
-                               echo " OK\n";
-                       }
-                       
+
+                       $this->output( " OK\n" );
+
                }
-               
+
        }
 }
 
 $maintClass = "ResetUserTokens";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;