Merge pull request #1651 from FreshRSS/dev1.8.0

Release 1.8.0

1 files changed, 7 insertions, 22 deletions

diff --git a/cli/create-user.php b/cli/create-user.php
index c9e350c14..1b6be3153 100755
--- a/cli/create-user.php
+++ b/cli/create-user.php
@@ -1,24 +1,12 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
-
-$options = getopt('', array(
-		'user:',
-		'password:',
-		'api-password:',
-		'language:',
-		'email:',
-		'token:',
-		'no-default-feeds',
-	));
-
-if (empty($options['user'])) {
-	fail('Usage: ' . basename(__FILE__) . " --user username ( --password 'password' --api-password 'api_password'" .
-		" --language en --email user@example.net --token 'longRandomString --no-default-feeds' )");
-}
+$isUpdate = false;
+require('_update-or-create-user.php');
+
 $username = $options['user'];
 if (!FreshRSS_user_Controller::checkUsername($username)) {
-	fail('FreshRSS error: invalid username “' . $username . '”');
+	fail('FreshRSS error: invalid username “' . $username .
+		'”! Must be matching ' . FreshRSS_user_Controller::USERNAME_PATTERN);
 }
 
 $usernames = listUsers();
@@ -30,11 +18,8 @@ echo 'FreshRSS creating user “', $username, "”…\n";
 
 $ok = FreshRSS_user_Controller::createUser($username,
 	empty($options['password']) ? '' : $options['password'],
-	empty($options['api-password']) ? '' : $options['api-password'],
-	array(
-		'language' => empty($options['language']) ? '' : $options['language'],
-		'token' => empty($options['token']) ? '' : $options['token'],
-	),
+	empty($options['api_password']) ? '' : $options['api_password'],
+	$values,
 	!isset($options['no-default-feeds']));
 
 if (!$ok) {