X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FUser.php;h=1c1d26b0a9d773bffeab5d6a800a844e012301f7;hb=7dadc7f6dc0b1e68bfa5937b3a3fa3fd9cdcacd1;hp=89a9ad6032bc3154480917319d00f8c440ca1c95;hpb=471bb53746b9b31481f797c1dfcfd2eb33ca975d;p=friendica.git diff --git a/src/Console/User.php b/src/Console/User.php index 89a9ad6032..1c1d26b0a9 100644 --- a/src/Console/User.php +++ b/src/Console/User.php @@ -1,6 +1,6 @@ [-h|--help|-?] [-v] bin/console user search mail [-h|--help|-?] [-v] bin/console user search guid [-h|--help|-?] [-v] + bin/console user config list [] [] [-h|--help|-?] [-v] + bin/console user config get [] [] [] [-h|--help|-?] [-v] + bin/console user config set [] [] [] [] [-h|--help|-?] [-v] + bin/console user config delete [] [] [] [-h|--help|-?] [-v] Description Modify user settings per console commands. @@ -84,13 +88,13 @@ HELP; return $help; } - public function __construct(App\Mode $appMode, L10n $l10n, Database $dba, array $argv = null) + public function __construct(App\Mode $appMode, L10n $l10n, IManagePersonalConfigValues $pConfig, array $argv = null) { parent::__construct($argv); - $this->appMode = $appMode; - $this->l10n = $l10n; - $this->dba = $dba; + $this->appMode = $appMode; + $this->l10n = $l10n; + $this->pConfig = $pConfig; } protected function doExecute() @@ -131,6 +135,8 @@ HELP; return $this->listUser(); case 'search': return $this->searchUser(); + case 'config': + return $this->configUser(); default: throw new \Asika\SimpleConsole\CommandArgsException('Wrong command.'); } @@ -164,15 +170,15 @@ HELP; * * @param int $arg_index Index of the nick argument in the arguments list * - * @return mixed user data or dba failure result + * @return array|boolean User record with uid field, or false if user is not found * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private function getUserByNick($arg_index) { $nick = $this->getNick($arg_index); - $user = $this->dba->selectFirst('user', ['uid'], ['nickname' => $nick]); - if (!$this->dba->isResult($user)) { + $user = UserModel::getByNickname($nick, ['uid']); + if (empty($user)) { throw new RuntimeException($this->l10n->t('User not found')); } @@ -200,7 +206,7 @@ HELP; try { $result = UserModel::updatePassword($user['uid'], $password); - if (!$this->dba->isResult($result)) { + if (empty($result)) { throw new \Exception($this->l10n->t('Password update failed. Please try again.')); } @@ -331,8 +337,8 @@ HELP; private function listUser() { $subCmd = $this->getArgument(1); - $start = $this->getOption(['s', 'start'], 0); - $count = $this->getOption(['c', 'count'], Pager::ITEMS_PER_PAGE); + $start = $this->getOption(['s', 'start'], 0); + $count = $this->getOption(['c', 'count'], Pager::ITEMS_PER_PAGE); $table = new Console_Table(); @@ -396,7 +402,7 @@ HELP; ]; $subCmd = $this->getArgument(1); - $param = $this->getArgument(2); + $param = $this->getArgument(2); $table = new Console_Table(); $table->setHeaders(['UID', 'GUID', 'Name', 'Nick', 'E-Mail', 'Register', 'Login', 'Verified', 'Blocked']); @@ -419,9 +425,100 @@ HELP; return false; } - $table->addRow($user); + if (!empty($user)) { + $table->addRow($user); + } $this->out($table->getTable()); return true; } + + /** + * Queries and modifies user-specific configuration + * + * @return bool True, if the command was successful + */ + private function configUser() + { + $subCmd = $this->getArgument(1); + + $user = $this->getUserByNick(2); + + $category = $this->getArgument(3); + + if (is_null($category)) { + $this->out($this->l10n->t('Enter category: '), false); + $category = CliPrompt::prompt(); + if (empty($category)) { + throw new RuntimeException('A category must be selected.'); + } + } + + $key = $this->getArgument(4); + + if ($subCmd != 'list' and is_null($key)) { + $this->out($this->l10n->t('Enter key: '), false); + $key = CliPrompt::prompt(); + if (empty($key)) { + throw new RuntimeException('A key must be selected.'); + } + } + + $values = $this->pConfig->load($user['uid'], $category); + + switch ($subCmd) { + case 'list': + $table = new Console_Table(); + $table->setHeaders(['Key', 'Value']); + if (array_key_exists($category, $values)) { + foreach (array_keys($values[$category]) as $key) { + $table->addRow([$key, $values[$category][$key]]); + } + } + $this->out($table->getTable()); + break; + case 'get': + if (!array_key_exists($category, $values)) { + throw new RuntimeException('Category does not exist'); + } + if (!array_key_exists($key, $values[$category])) { + throw new RuntimeException('Key does not exist'); + } + + $this->out($this->pConfig->get($user['uid'], $category, $key)); + break; + case 'set': + $value = $this->getArgument(5); + + if (is_null($value)) { + $this->out($this->l10n->t('Enter value: '), false); + $value = CliPrompt::prompt(); + if (empty($value)) { + throw new RuntimeException('A value must be specified.'); + } + } + + if (array_key_exists($category, $values) and + array_key_exists($key, $values[$category]) and + $values[$category][$key] == $value) { + throw new RuntimeException('Value not changed'); + } + + $this->pConfig->set($user['uid'], $category, $key, $value); + break; + case 'delete': + if (!array_key_exists($category, $values)) { + throw new RuntimeException('Category does not exist'); + } + if (!array_key_exists($key, $values[$category])) { + throw new RuntimeException('Key does not exist'); + } + + $this->pConfig->delete($user['uid'], $category, $key); + break; + default: + $this->out($this->getHelp()); + return false; + } + } }