Mutualise create-user and update-user

1 files changed, 4 insertions, 38 deletions

diff --git a/cli/update-user.php b/cli/update-user.php
index f8ed26c8f..ac674484c 100755
--- a/cli/update-user.php
+++ b/cli/update-user.php
@@ -1,50 +1,16 @@
 #!/usr/bin/php
 <?php
-require('_cli.php');
-
-$options = getopt('', array(
-		'user:',
-		'password:',
-		'api-password:',
-		'language:',
-		'email:',
-		'token:',
-		'purge_after_months:',
-		'feed_min_articles_default:',
-		'feed_ttl_default:',
-		'since_hours_posts_per_rss:',
-		'min_posts_per_rss:',
-		'max_posts_per_rss:',
-	));
-
-if (empty($options['user'])) {
-	fail('Usage: ' . basename(__FILE__) . " --user username ( --password 'password' --api-password 'api_password'" .
-		" --language en --email user@example.net --token 'longRandomString' --purge_after_months 3 " .
-		" --feed_min_articles_default 50 --feed_ttl_default 3600 --since_hours_posts_per_rss 168 --min_posts_per_rss 2 --max_posts_per_rss 400 )");
-}
+$isUpdate = true;
+require('_update-or-create-user.php');
 
 $username = cliInitUser($options['user']);
 
 echo 'FreshRSS updating user “', $username, "”…\n";
 
-function intParam($name) {
-	return isset($options[$name]) && ctype_digit($options[$name]) ? intval($options[$name]) : null;
-}
-
 $ok = FreshRSS_user_Controller::updateContextUser(
 	empty($options['password']) ? '' : $options['password'],
-	empty($options['api-password']) ? '' : $options['api-password'],
-	array(
-		'language' => isset($options['language']) ? $options['language'] : null,
-		'mail_login' => isset($options['email']) ? $options['email'] : null,
-		'token' => isset($options['token']) ? $options['token'] : null,
-		'old_entries' => intParam('purge_after_months'),
-		'keep_history_default' => intParam('feed_min_articles_default'),
-		'ttl_default' => intParam('feed_ttl_default'),
-		'since_hours_posts_per_rss' => intParam('since_hours_posts_per_rss'),
-		'min_posts_per_rss' => intParam('min_posts_per_rss'),
-		'max_posts_per_rss' => intParam('max_posts_per_rss'),
-	));
+	empty($options['api_password']) ? '' : $options['api_password'],
+	$values);
 
 if (!$ok) {
 	fail('FreshRSS could not update user!');