diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-04 17:19:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-04 17:19:33 +0000 |
| commit | 63c0c798c83df387bcb71f17c0b98120e89a5467 (patch) | |
| tree | b788476b60fd5c7e799590961cfcb5ce5108df74 /phpBB/install/install_install.php | |
| parent | 8b90d5998b944c055c24fd0d17dba25e2de9860c (diff) | |
| download | forums-63c0c798c83df387bcb71f17c0b98120e89a5467.tar forums-63c0c798c83df387bcb71f17c0b98120e89a5467.tar.gz forums-63c0c798c83df387bcb71f17c0b98120e89a5467.tar.bz2 forums-63c0c798c83df387bcb71f17c0b98120e89a5467.tar.xz forums-63c0c798c83df387bcb71f17c0b98120e89a5467.zip | |
- use the $var_ary for settings in a more logical way (hopefully removes the clutter and shows where which variable is set how)
- hopefully utf8 passwords are working too now
git-svn-id: file:///svn/phpbb/trunk@6552 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_install.php')
| -rwxr-xr-x | phpBB/install/install_install.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index df834a367e..ec1e4d776e 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -404,7 +404,7 @@ class install_install extends module // Obtain any submitted data foreach ($this->request_vars as $var) { - $$var = ($var == 'admin_name') ? request_var($var, '', true) : request_var($var, ''); + $$var = (in_array($var, array('admin_name', 'dbpasswd', 'admin_pass1', 'admin_pass2'))) ? request_var($var, '', true) : request_var($var, ''); } $connect_test = false; @@ -546,7 +546,7 @@ class install_install extends module // Obtain any submitted data foreach ($this->request_vars as $var) { - $$var = ($var == 'admin_name') ? request_var($var, '', true) : request_var($var, ''); + $$var = (in_array($var, array('admin_name', 'dbpasswd', 'admin_pass1', 'admin_pass2'))) ? request_var($var, '', true) : request_var($var, ''); } if ($dbms == '') @@ -718,7 +718,7 @@ class install_install extends module // Obtain any submitted data foreach ($this->request_vars as $var) { - $$var = ($var == 'admin_name') ? request_var($var, '', true) : request_var($var, ''); + $$var = (in_array($var, array('admin_name', 'dbpasswd', 'admin_pass1', 'admin_pass2'))) ? request_var($var, '', true) : request_var($var, ''); } if ($dbms == '') @@ -873,7 +873,7 @@ class install_install extends module // Obtain any submitted data foreach ($this->request_vars as $var) { - $$var = ($var == 'admin_name') ? request_var($var, '', true) : request_var($var, ''); + $$var = (in_array($var, array('admin_name', 'dbpasswd', 'admin_pass1', 'admin_pass2'))) ? request_var($var, '', true) : request_var($var, ''); } if ($dbms == '') @@ -957,7 +957,7 @@ class install_install extends module // Obtain any submitted data foreach ($this->request_vars as $var) { - $$var = ($var == 'admin_name') ? request_var($var, '', true) : request_var($var, ''); + $$var = (in_array($var, array('admin_name', 'dbpasswd', 'admin_pass1', 'admin_pass2'))) ? request_var($var, '', true) : request_var($var, ''); } if ($dbms == '') @@ -1231,7 +1231,7 @@ class install_install extends module // Obtain any submitted data foreach ($this->request_vars as $var) { - $$var = ($var == 'admin_name') ? request_var($var, '', true) : request_var($var, ''); + $$var = (in_array($var, array('admin_name', 'dbpasswd', 'admin_pass1', 'admin_pass2'))) ? request_var($var, '', true) : request_var($var, ''); } $dbpasswd = htmlspecialchars_decode($dbpasswd); @@ -1500,7 +1500,7 @@ class install_install extends module // Obtain any submitted data foreach ($this->request_vars as $var) { - $$var = ($var == 'admin_name') ? request_var($var, '', true) : request_var($var, ''); + $$var = (in_array($var, array('admin_name', 'dbpasswd', 'admin_pass1', 'admin_pass2'))) ? request_var($var, '', true) : request_var($var, ''); } // Fill the config array - it is needed by those functions we call @@ -1582,7 +1582,7 @@ class install_install extends module // Obtain any submitted data foreach ($this->request_vars as $var) { - $$var = ($var == 'admin_name') ? request_var($var, '', true) : request_var($var, ''); + $$var = (in_array($var, array('admin_name', 'dbpasswd', 'admin_pass1', 'admin_pass2'))) ? request_var($var, '', true) : request_var($var, ''); } // Load the basic configuration data |
