2 files changed, 169 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 4a70aafc6f..300f1c2626 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -309,6 +309,8 @@ $lang = array_merge($lang, array(
 
 	'SHOW_ALL_OPERATIONS'	=> 'Show all operations',
 
+	'SUCCESS_ADD_USER'		=> 'Successfully added user %s.',
+
 	'TASKS_NOT_READY'			=> 'Not ready tasks:',
 	'TASKS_READY'			=> 'Ready tasks:',
 	'TOTAL_SIZE'			=> 'Total size',
diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php
new file mode 100644
index 0000000000..e7a94a74da
--- /dev/null
+++ b/phpBB/phpbb/console/command/user/add.php
@@ -0,0 +1,167 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\console\command\user;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class add extends \phpbb\console\command\command
+{
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\passwords\manager */
+	protected $password_manager;
+
+	/**
+	* Construct method
+	*
+	* @param \phpbb\user $user The user object used for language information
+	*/
+	public function __construct(\phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\passwords\manager $password_manager)
+	{
+		$this->user = $user;
+		$this->db = $db;
+		$this->config = $config;
+		$this->password_manager = $password_manager;
+
+		$this->user->add_lang('ucp');
+		parent::__construct();
+	}
+
+	/**
+	* Sets the command name and description
+	*
+	* @return null
+	*/
+	protected function configure()
+	{
+		$this
+			->setName('user:add')
+			->setDescription($this->user->lang('CLI_DESCRIPTION_USER_ADD'))
+			->addOption('username', null, InputOption::VALUE_REQUIRED, $this->user->lang('CLI_DESCRIPTION_USER_ADD_OPTION_USERNAME'))
+			->addOption('password', null, InputOption::VALUE_REQUIRED, $this->user->lang('CLI_DESCRIPTION_USER_ADD_OPTION_PASSWORD'))
+			->addOption('email', null, InputOption::VALUE_REQUIRED, $this->user->lang('CLI_DESCRIPTION_USER_ADD_OPTION_EMAIL'))
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$dialog = $this->getHelperSet()->get('dialog');
+
+		$username = $input->getOption('username');
+		if (!$username) {
+			$username = $dialog->ask(
+				$output,
+				$this->user->lang('USERNAME') . $this->user->lang('COLON') . ' ',
+				null
+			);
+		}
+
+		$password = $input->getOption('password');
+		if (!$password)
+		{
+			$password = $this->get_password($output, $dialog);
+		}
+
+		$email = $input->getOption('email');
+		if (!$email)
+		{
+			$email = $dialog->ask(
+				$output,
+				$this->user->lang('EMAIL_ADDRESS') . $this->user->lang('COLON') . ' ',
+				null
+			);
+		}
+
+		try
+		{
+			$group_id = $this->get_group_id();
+		}
+		catch (\RunTimeException $e)
+		{
+			$output->writeln($e->getMessage());
+			return 1;
+		}
+
+		$user_row = array(
+			'username'				=> $username,
+			'user_password'			=> $this->password_manager->hash($password),
+			'user_email'			=> $email,
+			'group_id'				=> $group_id,
+			'user_timezone'			=> $config['board_timezone'],
+			'user_lang'				=> $config['default_lang'],
+			'user_type'				=> USER_NORMAL,
+			'user_regdate'			=> time(),
+		);
+
+		if (!function_exists(user_add))
+		{
+			require_once dirname(__FILE__) . '/../../../../includes/functions_user.php';
+		}
+		user_add($user_row);
+
+		$output->writeln('<info>' . $this->user->lang('SUCCESS_ADD_USER', $username) . '</info>');
+		return 0;
+	}
+
+	protected function get_password($output, $dialog)
+	{
+		$current_user = $this->user;
+		return $dialog->askHiddenResponseAndValidate(
+			$output,
+			$current_user->lang('PASSWORD') . $current_user->lang('COLON') . ' ',
+			function ($answer) use ($dialog, $output, $current_user)
+			{
+				$confirm = $dialog->askHiddenResponse(
+					$output,
+					$current_user->lang('CONFIRM_PASSWORD') . $current_user->lang('COLON') . ' ',
+					null
+				);
+				if ($confirm != $answer)
+				{
+					throw new \RunTimeException($current_user->lang('NEW_PASSWORD_ERROR'));
+				}
+				return $answer;
+			},
+			false,
+			null
+		);
+	}
+
+	protected function get_group_id()
+	{
+		$sql = 'SELECT group_id
+			FROM ' . GROUPS_TABLE . "
+			WHERE group_name = '" . $this->db->sql_escape('REGISTERED') . "'
+				AND group_type = " . GROUP_SPECIAL;
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row)
+		{
+			throw new \RunTimeException($this->user->lang('NO_GROUP'));
+		}
+
+		return $row['group_id'];
+	}
+}