diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-11-25 22:15:13 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-11-25 22:15:13 +0100 |
| commit | 9aa017d0f7ce13a11114cbae24b694e935931342 (patch) | |
| tree | a6ad083b93deb4e335bf76b33a4c816340059bc1 /phpBB/phpbb/install/module | |
| parent | 23f5b6debdd24cc1caefd3bb8cd6da96a88abe9a (diff) | |
| download | forums-9aa017d0f7ce13a11114cbae24b694e935931342.tar forums-9aa017d0f7ce13a11114cbae24b694e935931342.tar.gz forums-9aa017d0f7ce13a11114cbae24b694e935931342.tar.bz2 forums-9aa017d0f7ce13a11114cbae24b694e935931342.tar.xz forums-9aa017d0f7ce13a11114cbae24b694e935931342.zip | |
[ticket/14875] Add method for raw input to request and add to installer
A method for retrieving raw input has been added to the request class.
This will be used in the installer to retrieve the datatabase password
while also allowing utf8 characters. Not escaping the input is ok in
this case as it won't be put anywhere in this raw form and only be
used to populate the entry for the password field in config.php.
PHPBB3-14875
Diffstat (limited to 'phpBB/phpbb/install/module')
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_database_data.php | 11 |
1 files changed, 1 insertions, 10 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 9019cf4332..dc7b060746 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 @@ -79,19 +79,10 @@ class obtain_database_data extends \phpbb\install\task_base implements \phpbb\in $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', ''); - // Need to get untrimmed password when using ajax IO handler - if ($this->io_handler instanceof \phpbb\install\helper\iohandler\ajax_iohandler) - { - $dbpasswd = htmlspecialchars_decode(htmlspecialchars_decode($this->io_handler->get_untrimmed_input('dbpasswd', '', true))); - } - else - { - $dbpasswd = $this->io_handler->get_input('dbpasswd', '', true); - } - // Check database data $user_data_vaild = $this->check_database_data($dbms, $dbhost, $dbport, $dbuser, $dbpasswd, $dbname, $table_prefix); |