Merge "Remove user rights link from anonymous contributions pages Remove the user...

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

diff --git a/maintenance/changePassword.php b/maintenance/changePassword.php
index edc37de..cfcac40 100644 (file)
--- a/maintenance/changePassword.php
+++ b/maintenance/changePassword.php
@@ -29,14 +29,21 @@ require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 class ChangePassword extends Maintenance {
        public function __construct() {
                parent::__construct();
-               $this->addOption( "user", "The username to operate on", true, true );
+               $this->addOption( "user", "The username to operate on", false, true );
+               $this->addOption( "userid", "The user id to operate on", false, true );
                $this->addOption( "password", "The password to use", true, true );
                $this->mDescription = "Change a user's password";
        }
-       
+
        public function execute() {
-               $user = User::newFromName( $this->getOption( 'user' ) );
-               if ( !$user->getId() ) {
+               if ( $this->hasOption( "user" ) ) {
+                       $user = User::newFromName( $this->getOption( 'user' ) );
+               } elseif ( $this->hasOption( "userid" ) ) {
+                       $user = User::newFromId( $this->getOption( 'userid' ) );
+               } else {
+                       $this->error( "A \"user\" or \"userid\" must be set to change the password for" , true );
+               }
+               if ( !$user || !$user->getId() ) {
                        $this->error( "No such user: " . $this->getOption( 'user' ), true );
                }
                try {
@@ -50,4 +57,4 @@ class ChangePassword extends Maintenance {
 }
 
 $maintClass = "ChangePassword";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );