Follow-up r62648: Add new message key to maintenance script

[lhc/web/wiklou.git] / maintenance / userOptions.inc

diff --git a/maintenance/userOptions.inc b/maintenance/userOptions.inc
index 9815061..d660019 100644 (file)
--- a/maintenance/userOptions.inc
+++ b/maintenance/userOptions.inc
@@ -1,10 +1,18 @@
 <?php
+/**
+ * @file
+ * @ingroup Maintenance
+ */
+
 // Options we will use
 $options = array( 'list', 'nowarn', 'quiet', 'usage', 'dry' );
 $optionsWithArgs = array( 'old', 'new' );
 
-require_once( 'commandLine.inc' );
+require_once( dirname(__FILE__) . '/commandLine.inc' );
 
+/**
+ * @ingroup Maintenance
+ */
 class userOptions {
        public $mQuick;
        public $mQuiet;
@@ -108,10 +116,25 @@ class userOptions {
                        $user = User::newFromId( $id->user_id );
 
                        // Get the options and update stats
-                       foreach( $defaultOptions as $name => $defaultValue ) {
-                               $userValue = $user->getOption( $name );
-                               if( $userValue <> $defaultValue ) {
-                                       @$ret[$name][$userValue]++;
+                       if( $this->mAnOption ) {
+
+                               if(!array_key_exists( $this->mAnOption, $defaultOptions ) ) {
+                                       print "Invalid user option. Use --list to see valid choices\n";
+                                       exit;
+                               }
+
+                               $userValue = $user->getOption( $this->mAnOption );
+                               if( $userValue <> $defaultOptions[$this->mAnOption] ) {
+                                       @$ret[$this->mAnOption][$userValue]++;
+                               }
+
+                       } else {
+
+                               foreach( $defaultOptions as $name => $defaultValue ) {
+                                       $userValue = $user->getOption( $name );
+                                       if( $userValue <> $defaultValue ) {
+                                               @$ret[$name][$userValue]++;
+                                       }
                                }
                        }
                }
@@ -223,15 +246,8 @@ Users with option <$this->mAnOption> = '$this->mOldValue' will be made to use '$
 
 Abort with control-c in the next five seconds....
 WARN;
-               require('counter.php');
-               for ($i=6;$i>=1;) {
-                       print_c($i, --$i);
-                       sleep(1);
-               }
-               print "\n";
-
+               wfCountDown( 5 );
                return true;
        }
 
 }
-?>