X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FchangePassword.php;h=d61212803571e6de37097c12bc47313a0fda0148;hb=3f65433da78582804a672fd503ae3bf562dee38e;hp=1e015fdcb4847f191df51f82b7748989b107a7ff;hpb=7b9d10e1683ca21ecbd30c6e15466c5dc3caca31;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/changePassword.php b/maintenance/changePassword.php
index 1e015fdcb4..d612128035 100644
--- a/maintenance/changePassword.php
+++ b/maintenance/changePassword.php
@@ -2,28 +2,52 @@
 /**
  * Change the password of a given user
  *
- * @package MediaWiki
- * @subpackage Maintenance
+ * @addtogroup Maintenance
  *
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
  * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
 
+$optionsWithArgs = array( 'user', 'password' );
+require_once 'commandLine.inc';
+
+$USAGE = 
+	"Usage: php changePassword.php [--user=user --password=password | --help]\n" .
+	"\toptions:\n" .
+	"\t\t--help      show this message\n" .
+	"\t\t--user      the username to operate on\n" .
+	"\t\t--password  the password to use\n";
+
+if( in_array( '--help', $argv ) )
+	wfDie( $USAGE );
+
+$cp = new ChangePassword( @$options['user'], @$options['password'] );
+$cp->main();
+
 class ChangePassword {
 	var $dbw;
 	var $user, $password;
-	
+
 	function ChangePassword( $user, $password ) {
+		global $USAGE;
+		if( !strlen( $user ) or !strlen( $password ) ) {
+			wfDie( $USAGE );
+		}
+
 		$this->user = User::newFromName( $user );
+		if ( !$this->user->getID() ) {
+			die ( "No such user: $user\n" );
+		}
+
 		$this->password = $password;
-		
-		$this->dbw =& wfGetDB( DB_MASTER );
+
+		$this->dbw = wfGetDB( DB_MASTER );
 	}
 
 	function main() {
 		$fname = 'ChangePassword::main';
-		
+
 		$this->dbw->update( 'user',
 			array(
 				'user_password' => wfEncryptPassword( $this->user->getID(), $this->password )
@@ -35,17 +59,5 @@ class ChangePassword {
 		);
 	}
 }
-if ( in_array( '--help', $argv ) )
-	die(
-		"Usage: php changePassword.php [--user=user --password=password | --help]\n" .
-		"\toptions:\n" .
-		"\t\t--help\tshow this message\n" .
-		"\t\t--user\tthe username to operate on\n" .
-		"\t\t--password\tthe password to use\n"
-	);
 
-$optionsWithArgs = array( 'user', 'password' );
-require_once 'commandLine.inc';
 
-$cp = new ChangePassword( @$options['user'], @$options['password'] );
-$cp->main();