makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix img_imagick handling

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6041 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-06-10 16:16:38 +00:00
parent 349518c11f
commit 6bbeda9450
1 changed files with 32 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
phpBB/install/install_install.php
View file

@ -491,9 +491,7 @@ class install_install extends module
} }
$url = ($connect_test) ? $this->p_master->module_url . "?mode=$mode&sub=administrator" : $this->p_master->module_url . "?mode=$mode&sub=database"; $url = ($connect_test) ? $this->p_master->module_url . "?mode=$mode&sub=administrator" : $this->p_master->module_url . "?mode=$mode&sub=database";
// The road ahead is still under construction, follow the diversion back to the old installer..... ;)
$s_hidden_fields .= ($connect_test) ? '' : '<input type="hidden" name="testdb" value="true" />'; $s_hidden_fields .= ($connect_test) ? '' : '<input type="hidden" name="testdb" value="true" />';
// $url = ($connect_test) ? "install.$phpEx?stage=1" : $this->p_master->module_url . "?mode=$mode&amp;sub=database";
$submit = $lang['NEXT_STEP']; $submit = $lang['NEXT_STEP'];
@ -519,7 +517,7 @@ class install_install extends module
$$var = request_var($var, ''); $$var = request_var($var, '');
} }
$s_hidden_fields = ''; $s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : '';
$passed = false; $passed = false;
if (isset($_POST['check'])) if (isset($_POST['check']))
@ -670,7 +668,7 @@ class install_install extends module
$$var = request_var($var, ''); $$var = request_var($var, '');
} }
$s_hidden_fields = ''; $s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : '';
$written = false; $written = false;
// Create a list of any PHP modules we wish to have loaded // Create a list of any PHP modules we wish to have loaded
@ -806,42 +804,38 @@ class install_install extends module
$$var = request_var($var, ''); $$var = request_var($var, '');
} }
$s_hidden_fields = ''; $s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : '';
// $passed = false; $email_enable = ($email_enable !== '') ? $email_enable : true;
// if (!$passed) foreach ($this->advanced_config_options as $config_key => $vars)
// { {
$email_enable = ($email_enable !== '') ? $email_enable : true; if (!is_array($vars) && strpos($config_key, 'legend') === false)
foreach ($this->advanced_config_options as $config_key => $vars)
{ {
if (!is_array($vars) && strpos($config_key, 'legend') === false) continue;
{
continue;
}
if (strpos($config_key, 'legend') !== false)
{
$template->assign_block_vars('options', array(
'S_LEGEND' => true,
'LEGEND' => $lang[$vars])
);
continue;
}
$options = isset($vars['options']) ? $vars['options'] : '';
$template->assign_block_vars('options', array(
'KEY' => $config_key,
'TITLE' => $lang[$vars['lang']],
'S_EXPLAIN' => $vars['explain'],
'S_LEGEND' => false,
'TITLE_EXPLAIN' => ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '',
'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], $$config_key, $options),
)
);
} }
// }
if (strpos($config_key, 'legend') !== false)
{
$template->assign_block_vars('options', array(
'S_LEGEND' => true,
'LEGEND' => $lang[$vars])
);
continue;
}
$options = isset($vars['options']) ? $vars['options'] : '';
$template->assign_block_vars('options', array(
'KEY' => $config_key,
'TITLE' => $lang[$vars['lang']],
'S_EXPLAIN' => $vars['explain'],
'S_LEGEND' => false,
'TITLE_EXPLAIN' => ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '',
'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], $$config_key, $options),
)
);
}
$config_options = array_merge($this->db_config_options, $this->admin_config_options); $config_options = array_merge($this->db_config_options, $this->admin_config_options);
foreach ($config_options as $config_key => $vars) foreach ($config_options as $config_key => $vars)
@ -855,8 +849,6 @@ class install_install extends module
$submit = $lang['NEXT_STEP']; $submit = $lang['NEXT_STEP'];
// $url = ($passed) ? $this->p_master->module_url . "?mode=$mode&amp;sub=final" : $this->p_master->module_url . "?mode=$mode&amp;sub=advanced";
// $s_hidden_fields .= ($passed) ? '' : '<input type="hidden" name="check" value="true" />';
$url = $this->p_master->module_url . "?mode=$mode&amp;sub=final"; $url = $this->p_master->module_url . "?mode=$mode&amp;sub=final";
$template->assign_vars(array( $template->assign_vars(array(