AutoInstall Test fix

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

diff --git a/src/Core/Console/NewPassword.php b/src/Core/Console/NewPassword.php
index f5698ba716ff62b1cf0e3258c2155436ca208769..54d10af2077768edf4735a787efd3175ab6b9ef9 100644 (file)
--- a/src/Core/Console/NewPassword.php
+++ b/src/Core/Console/NewPassword.php
@@ -2,12 +2,11 @@
 
 namespace Friendica\Core\Console;
 
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Model\Contact;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
-use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use dba;
+use RuntimeException;
 
 /**
  * @brief tool to set a new password for a user
@@ -58,19 +57,15 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               require_once '.htconfig.php';
-               $result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
-
-               if (!$result) {
-                       throw new \RuntimeException('Unable to connect to database');
+               if ($a->getMode()->isInstall()) {
+                       throw new RuntimeException('Database isn\'t ready or populated yet');
                }
 
                $nick = $this->getArgument(0);
 
-               $user = dba::selectFirst('user', ['uid'], ['nickname' => $nick]);
-               if (!DBM::is_result($user)) {
-                       throw new \RuntimeException(L10n::t('User not found'));
+               $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nick]);
+               if (!DBA::isResult($user)) {
+                       throw new RuntimeException(L10n::t('User not found'));
                }
 
                $password = $this->getArgument(1);
@@ -80,15 +75,15 @@ HELP;
                }
 
                if (!$password) {
-                       throw new \RuntimeException(L10n::t('Password can\'t be empty'));
+                       throw new RuntimeException(L10n::t('Password can\'t be empty'));
                }
 
                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.'));
+                       throw new RuntimeException(L10n::t('The new password has been exposed in a public data dump, please choose another.'));
                }
 
                if (!User::updatePassword($user['uid'], $password)) {
-                       throw new \RuntimeException(L10n::t('Password update failed. Please try again.'));
+                       throw new RuntimeException(L10n::t('Password update failed. Please try again.'));
                }
 
                $this->out(L10n::t('Password changed.'));