X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConsole%2FNewPassword.php;h=3cd96ad322bd5107be58c830b56b8d080000698c;hb=3aa77685fcccff9739384136b4894de43200fa8c;hp=54d10af2077768edf4735a787efd3175ab6b9ef9;hpb=4ae37c61966a7f4c055369ee8fd0d4bc20808fdb;p=friendica.git

diff --git a/src/Core/Console/NewPassword.php b/src/Core/Console/NewPassword.php
index 54d10af207..3cd96ad322 100644
--- a/src/Core/Console/NewPassword.php
+++ b/src/Core/Console/NewPassword.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Core\Console;
 
-use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
@@ -40,7 +39,7 @@ HELP;
 
 	protected function doExecute()
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		if ($this->getOption('v')) {
 			$this->out('Class: ' . __CLASS__);
@@ -74,20 +73,18 @@ HELP;
 			$password = \Seld\CliPrompt\CliPrompt::hiddenPrompt(true);
 		}
 
-		if (!$password) {
-			throw new RuntimeException(L10n::t('Password can\'t be empty'));
-		}
+		try {
+			$result = User::updatePassword($user['uid'], $password);
 
-		if (!Config::get('system', 'disable_password_exposed', false) && User::isPasswordExposed($password)) {
-			throw new RuntimeException(L10n::t('The new password has been exposed in a public data dump, please choose another.'));
-		}
+			if (!DBA::isResult($result)) {
+				throw new \Exception(L10n::t('Password update failed. Please try again.'));
+			}
 
-		if (!User::updatePassword($user['uid'], $password)) {
-			throw new RuntimeException(L10n::t('Password update failed. Please try again.'));
+			$this->out(L10n::t('Password changed.'));
+		} catch (\Exception $e) {
+			throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
 		}
 
-		$this->out(L10n::t('Password changed.'));
-
 		return 0;
 	}
 }