From 91847ed1fd3953da70e8df7f55a0274bbd9ebccf Mon Sep 17 00:00:00 2001
From: rubencm <rubencm@gmail.com>
Date: Sun, 2 Dec 2018 10:26:19 +0000
Subject: [PATCH] [ticket/15869] Allow multibyte characters in more variables

PHPBB3-15869
---
 .../module/obtain_data/task/obtain_database_data.php      | 8 ++++----
 .../module/obtain_data/task/obtain_server_data.php        | 2 +-
 .../module/obtain_data/task/obtain_update_ftp_data.php    | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_database_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_database_data.php
index dc7b060746..6ec1e612b9 100644
--- a/phpBB/phpbb/install/module/obtain_data/task/obtain_database_data.php
+++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_database_data.php
@@ -78,10 +78,10 @@ class obtain_database_data extends \phpbb\install\task_base implements \phpbb\in
 		$dbms			= $this->io_handler->get_input('dbms', '');
 		$dbhost			= $this->io_handler->get_input('dbhost', '', true);
 		$dbport			= $this->io_handler->get_input('dbport', '');
-		$dbuser			= $this->io_handler->get_input('dbuser', '');
-		$dbpasswd		= $this->io_handler->get_raw_input('dbpasswd', '');
-		$dbname			= $this->io_handler->get_input('dbname', '');
-		$table_prefix	= $this->io_handler->get_input('table_prefix', '');
+		$dbuser			= $this->io_handler->get_input('dbuser', '', true);
+		$dbpasswd		= $this->io_handler->get_raw_input('dbpasswd', '', true);
+		$dbname			= $this->io_handler->get_input('dbname', '', true);
+		$table_prefix	= $this->io_handler->get_input('table_prefix', '', true);
 
 		// Check database data
 		$user_data_vaild = $this->check_database_data($dbms, $dbhost, $dbport, $dbuser, $dbpasswd, $dbname, $table_prefix);
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 135a75ff8c..5096ce284e 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
@@ -81,7 +81,7 @@ class obtain_server_data extends \phpbb\install\task_base implements \phpbb\inst
 		$force_server_vars	= $this->io_handler->get_input('force_server_vars', 0);
 		$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);
+		$script_path		= $this->io_handler->get_input('script_path', $script_path, true);
 
 		// Clean up script path
 		if ($script_path !== '/')
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_update_ftp_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_update_ftp_data.php
index f31472fc58..3c17576c13 100644
--- a/phpBB/phpbb/install/module/obtain_data/task/obtain_update_ftp_data.php
+++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_update_ftp_data.php
@@ -85,10 +85,10 @@ class obtain_update_ftp_data extends task_base
 				$method = $methods[0];
 			}
 
-			$ftp_host = $this->iohandler->get_input('ftp_host', '');
-			$ftp_user = $this->iohandler->get_input('ftp_user', '');
-			$ftp_pass = htmlspecialchars_decode($this->iohandler->get_input('ftp_pass', ''));
-			$ftp_path = $this->iohandler->get_input('ftp_path', '');
+			$ftp_host = $this->iohandler->get_input('ftp_host', '', true);
+			$ftp_user = $this->iohandler->get_input('ftp_user', '', true);
+			$ftp_pass = htmlspecialchars_decode($this->iohandler->get_input('ftp_pass', '', true));
+			$ftp_path = $this->iohandler->get_input('ftp_path', '', true);
 			$ftp_port = $this->iohandler->get_input('ftp_port', 21);
 			$ftp_time = $this->iohandler->get_input('ftp_timeout', 10);