makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  [ticket/14595] Added smtp_port where places where smtp_host exists. PHPBB3-14595
  [ticket/14595] Added SMTP port to getConfigTreeBuilder PHPBB3-14595
This commit is contained in:
Tristan Darricau 2016-05-15 10:20:38 +02:00
commit ddcd458167
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
5 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/install-config.sample.yml
View file

@ -22,6 +22,7 @@ installer:
enabled: false enabled: false
smtp_delivery : ~ smtp_delivery : ~
smtp_host: ~ smtp_host: ~
smtp_port: ~
smtp_auth: ~ smtp_auth: ~
smtp_user: ~ smtp_user: ~
smtp_pass: ~ smtp_pass: ~

1
phpBB/phpbb/install/console/command/install/install.php
View file

@ -190,6 +190,7 @@ class install extends \phpbb\console\command\command
$iohandler->set_input('email_enable', $config['email']['enabled']); $iohandler->set_input('email_enable', $config['email']['enabled']);
$iohandler->set_input('smtp_delivery', $config['email']['smtp_delivery']); $iohandler->set_input('smtp_delivery', $config['email']['smtp_delivery']);
$iohandler->set_input('smtp_host', $config['email']['smtp_host']); $iohandler->set_input('smtp_host', $config['email']['smtp_host']);
$iohandler->set_input('smtp_port', $config['email']['smtp_port']);
$iohandler->set_input('smtp_auth', $config['email']['smtp_auth']); $iohandler->set_input('smtp_auth', $config['email']['smtp_auth']);
$iohandler->set_input('smtp_user', $config['email']['smtp_user']); $iohandler->set_input('smtp_user', $config['email']['smtp_user']);
$iohandler->set_input('smtp_pass', $config['email']['smtp_pass']); $iohandler->set_input('smtp_pass', $config['email']['smtp_pass']);

3
phpBB/phpbb/install/installer_configuration.php
View file

@ -93,6 +93,9 @@ class installer_configuration implements ConfigurationInterface
->scalarNode('smtp_host') ->scalarNode('smtp_host')
->defaultValue(null) ->defaultValue(null)
->end() ->end()
->scalarNode('smtp_port')
->defaultValue(null)
->end()
->scalarNode('smtp_auth') ->scalarNode('smtp_auth')
->defaultValue(null) ->defaultValue(null)
->end() ->end()

4
phpBB/phpbb/install/module/install_database/task/add_config_settings.php
View file

@ -190,6 +190,10 @@ class add_config_settings extends \phpbb\install\task_base
SET config_value = '" . $this->db->sql_escape($this->install_config->get('smtp_host')) . "' SET config_value = '" . $this->db->sql_escape($this->install_config->get('smtp_host')) . "'
WHERE config_name = 'smtp_host'", WHERE config_name = 'smtp_host'",
'UPDATE ' . $this->config_table . "
SET config_value = '" . $this->db->sql_escape($this->install_config->get('smtp_port')) . "'
WHERE config_name = 'smtp_port'",
'UPDATE ' . $this->config_table . " 'UPDATE ' . $this->config_table . "
SET config_value = '" . $this->db->sql_escape($this->install_config->get('smtp_auth')) . "' SET config_value = '" . $this->db->sql_escape($this->install_config->get('smtp_auth')) . "'
WHERE config_name = 'smtp_auth_method'", WHERE config_name = 'smtp_auth_method'",

7
phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php
View file

@ -51,6 +51,7 @@ class obtain_email_data extends \phpbb\install\task_base implements \phpbb\insta
$email_enable = $this->io_handler->get_input('email_enable', true); $email_enable = $this->io_handler->get_input('email_enable', true);
$smtp_delivery = $this->io_handler->get_input('smtp_delivery', ''); $smtp_delivery = $this->io_handler->get_input('smtp_delivery', '');
$smtp_host = $this->io_handler->get_input('smtp_host', ''); $smtp_host = $this->io_handler->get_input('smtp_host', '');
$smtp_port = $this->io_handler->get_input('smtp_port', '');
$smtp_auth = $this->io_handler->get_input('smtp_auth', ''); $smtp_auth = $this->io_handler->get_input('smtp_auth', '');
$smtp_user = $this->io_handler->get_input('smtp_user', ''); $smtp_user = $this->io_handler->get_input('smtp_user', '');
$smtp_passwd = $this->io_handler->get_input('smtp_pass', ''); $smtp_passwd = $this->io_handler->get_input('smtp_pass', '');
@ -63,6 +64,7 @@ class obtain_email_data extends \phpbb\install\task_base implements \phpbb\insta
$this->install_config->set('email_enable', $email_enable); $this->install_config->set('email_enable', $email_enable);
$this->install_config->set('smtp_delivery', $smtp_delivery); $this->install_config->set('smtp_delivery', $smtp_delivery);
$this->install_config->set('smtp_host', $smtp_host); $this->install_config->set('smtp_host', $smtp_host);
$this->install_config->set('smtp_port', $smtp_port);
$this->install_config->set('smtp_auth', $smtp_auth); $this->install_config->set('smtp_auth', $smtp_auth);
$this->install_config->set('smtp_user', $smtp_user); $this->install_config->set('smtp_user', $smtp_user);
$this->install_config->set('smtp_pass', $smtp_passwd); $this->install_config->set('smtp_pass', $smtp_passwd);
@ -119,6 +121,11 @@ class obtain_email_data extends \phpbb\install\task_base implements \phpbb\insta
'type' => 'text', 'type' => 'text',
'default' => $smtp_host, 'default' => $smtp_host,
), ),
'smtp_port' => array(
'label' => 'SMTP_PORT',
'type' => 'text',
'default' => $smtp_port,
),
'smtp_auth' => array( 'smtp_auth' => array(
'label' => 'SMTP_AUTH_METHOD', 'label' => 'SMTP_AUTH_METHOD',
'description' => 'SMTP_AUTH_METHOD_EXPLAIN', 'description' => 'SMTP_AUTH_METHOD_EXPLAIN',