Update usages of User::updatePassword

[friendica.git] / src / Core / Console / NewPassword.php

diff --git a/src/Core/Console/NewPassword.php b/src/Core/Console/NewPassword.php
index 54d10af2077768edf4735a787efd3175ab6b9ef9..ddbbc780cf406355df941e42da1fba709a810fcb 100644 (file)
--- 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;
@@ -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;
        }
 }