diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2001-11-01 10:43:30 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2001-11-01 10:43:30 +0000 |
| commit | a03691ca8e98e1161bff8cb6dd8efba0e505411e (patch) | |
| tree | c2e5c940df3b1aa229f3d15770d3d005306773b8 /phpBB | |
| parent | bd54224f2a6f2abda9f2a234cd3a3a1fa5802217 (diff) | |
| download | forums-a03691ca8e98e1161bff8cb6dd8efba0e505411e.tar forums-a03691ca8e98e1161bff8cb6dd8efba0e505411e.tar.gz forums-a03691ca8e98e1161bff8cb6dd8efba0e505411e.tar.bz2 forums-a03691ca8e98e1161bff8cb6dd8efba0e505411e.tar.xz forums-a03691ca8e98e1161bff8cb6dd8efba0e505411e.zip | |
Ok, this gets all the area it needs..heh
git-svn-id: file:///svn/phpbb/trunk@1253 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install.php | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/phpBB/install.php b/phpBB/install.php index da5df793b5..996837e822 100644 --- a/phpBB/install.php +++ b/phpBB/install.php @@ -212,10 +212,12 @@ else if( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == header("Content-Type: text/x-delimtext; name=\"config.php\""); header("Content-disposition: attachment; filename=config.php"); - if( get_magic_quotes_gpc() ) - { - $HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']); - } + // + // We need to stripslashes no matter what the setting of magic_quotes_gpc is + // because we add slahes at the top if its off, and they are added automaticlly + // if it is on. + // + $HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']); echo $HTTP_POST_VARS['config_data']; @@ -226,10 +228,9 @@ else if( !empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == // // Ok we couldn't write the config file so let's try ftping it. // - if ( get_magic_quotes_gpc() ) - { - $HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']); - } + + $HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']); + $s_hidden_fields = '<input type="hidden" name="config_data" value="'.htmlspecialchars($HTTP_POST_VARS['config_data']).'" />'; $s_hidden_fields .= '<input type="hidden" name="ftp_file" value="1" />'; $template->assign_block_vars("switch_ftp_file", array()); @@ -252,10 +253,6 @@ else if( !empty($HTTP_POST_VARS['ftp_file']) ) // // Here we'll actually send the file... // - // We need to stripslashes no matter what the setting of magic_quotes_gpc is - // because we add slahes at the top if its off, and they are added automaticlly - // if it is on. - // $HTTP_POST_VARS['config_data'] = stripslashes($HTTP_POST_VARS['config_data']); $conn_id = ftp_connect('localhost'); |