diff options
| author | rubencm <rubencm@gmail.com> | 2018-12-01 20:51:59 +0000 |
|---|---|---|
| committer | rubencm <rubencm@gmail.com> | 2018-12-01 20:51:59 +0000 |
| commit | 47acbdd1388096586294cad6f93f62fdccd90b9c (patch) | |
| tree | 65fe2eedc3fae4a52735cd350a1947f99ad970c9 | |
| parent | 73fd2f357323bc3690ce15be23a54ef1896f87fa (diff) | |
| download | forums-47acbdd1388096586294cad6f93f62fdccd90b9c.tar forums-47acbdd1388096586294cad6f93f62fdccd90b9c.tar.gz forums-47acbdd1388096586294cad6f93f62fdccd90b9c.tar.bz2 forums-47acbdd1388096586294cad6f93f62fdccd90b9c.tar.xz forums-47acbdd1388096586294cad6f93f62fdccd90b9c.zip | |
[ticket/15869] Allow multibyte characters in hostname during installation
PHPBB3-15869
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php index e8a9c971b7..7cd0d7bf23 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php @@ -50,11 +50,11 @@ class obtain_email_data extends \phpbb\install\task_base implements \phpbb\insta // E-mail data $email_enable = $this->io_handler->get_input('email_enable', true); $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', '', true); $smtp_port = $this->io_handler->get_input('smtp_port', ''); $smtp_auth = $this->io_handler->get_input('smtp_auth', ''); - $smtp_user = $this->io_handler->get_input('smtp_user', ''); - $smtp_passwd = $this->io_handler->get_input('smtp_pass', ''); + $smtp_user = $this->io_handler->get_input('smtp_user', '', true); + $smtp_passwd = $this->io_handler->get_input('smtp_pass', '', true); $auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP'); diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php index 1ef70eae08..135a75ff8c 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php @@ -79,7 +79,7 @@ class obtain_server_data extends \phpbb\install\task_base implements \phpbb\inst $cookie_secure = $this->io_handler->get_input('cookie_secure', $cookie_secure); $server_protocol = $this->io_handler->get_input('server_protocol', $server_protocol); $force_server_vars = $this->io_handler->get_input('force_server_vars', 0); - $server_name = $this->io_handler->get_input('server_name', $server_name); + $server_name = $this->io_handler->get_input('server_name', $server_name, true); $server_port = $this->io_handler->get_input('server_port', $server_port); $script_path = $this->io_handler->get_input('script_path', $script_path); |