|
@@ -515,7 +515,7 @@ function ModifyLoadBalancingSettings($return_config = false)
|
|
|
*/
|
|
*/
|
|
|
function prepareServerSettingsContext(&$config_vars)
|
|
function prepareServerSettingsContext(&$config_vars)
|
|
|
{
|
|
{
|
|
|
- global $context, $modSettings;
|
|
+ global $context, $modSettings, $smcFunc;
|
|
|
|
|
|
|
|
$context['config_vars'] = array();
|
|
$context['config_vars'] = array();
|
|
|
foreach ($config_vars as $identifier => $config_var)
|
|
foreach ($config_vars as $identifier => $config_var)
|
|
@@ -544,7 +544,7 @@ function prepareServerSettingsContext(&$config_vars)
|
|
|
'size' => empty($config_var[4]) ? 0 : $config_var[4],
|
|
'size' => empty($config_var[4]) ? 0 : $config_var[4],
|
|
|
'data' => isset($config_var[4]) && is_array($config_var[4]) && $config_var[3] != 'select' ? $config_var[4] : array(),
|
|
'data' => isset($config_var[4]) && is_array($config_var[4]) && $config_var[3] != 'select' ? $config_var[4] : array(),
|
|
|
'name' => $config_var[0],
|
|
'name' => $config_var[0],
|
|
|
- 'value' => $config_var[2] == 'file' ? htmlspecialchars($$varname) : (isset($modSettings[$config_var[0]]) ? htmlspecialchars($modSettings[$config_var[0]]) : (in_array($config_var[3], array('int', 'float')) ? 0 : '')),
|
|
+ 'value' => $config_var[2] == 'file' ? $smcFunc['htmlspecialchars']($$varname) : (isset($modSettings[$config_var[0]]) ? $smcFunc['htmlspecialchars']($modSettings[$config_var[0]]) : (in_array($config_var[3], array('int', 'float')) ? 0 : '')),
|
|
|
'disabled' => !empty($context['settings_not_writable']) || !empty($config_var['disabled']),
|
|
'disabled' => !empty($context['settings_not_writable']) || !empty($config_var['disabled']),
|
|
|
'invalid' => false,
|
|
'invalid' => false,
|
|
|
'subtext' => !empty($config_var['subtext']) ? $config_var['subtext'] : $subtext,
|
|
'subtext' => !empty($config_var['subtext']) ? $config_var['subtext'] : $subtext,
|
|
@@ -583,6 +583,7 @@ function prepareServerSettingsContext(&$config_vars)
|
|
|
function prepareDBSettingContext(&$config_vars)
|
|
function prepareDBSettingContext(&$config_vars)
|
|
|
{
|
|
{
|
|
|
global $txt, $helptxt, $context, $modSettings, $sourcedir;
|
|
global $txt, $helptxt, $context, $modSettings, $sourcedir;
|
|
|
|
|
+ global $smcFunc;
|
|
|
|
|
|
|
|
loadLanguage('Help');
|
|
loadLanguage('Help');
|
|
|
|
|
|
|
@@ -617,7 +618,7 @@ function prepareDBSettingContext(&$config_vars)
|
|
|
'size' => !empty($config_var[2]) && !is_array($config_var[2]) ? $config_var[2] : (in_array($config_var[0], array('int', 'float')) ? 6 : 0),
|
|
'size' => !empty($config_var[2]) && !is_array($config_var[2]) ? $config_var[2] : (in_array($config_var[0], array('int', 'float')) ? 6 : 0),
|
|
|
'data' => array(),
|
|
'data' => array(),
|
|
|
'name' => $config_var[1],
|
|
'name' => $config_var[1],
|
|
|
- 'value' => isset($modSettings[$config_var[1]]) ? ($config_var[0] == 'select' ? $modSettings[$config_var[1]] : htmlspecialchars($modSettings[$config_var[1]])) : (in_array($config_var[0], array('int', 'float')) ? 0 : (!empty($config_var['multiple']) ? serialize(array()) : '')),
|
|
+ 'value' => isset($modSettings[$config_var[1]]) ? ($config_var[0] == 'select' ? $modSettings[$config_var[1]] : $smcFunc['htmlspecialchars']($modSettings[$config_var[1]])) : (in_array($config_var[0], array('int', 'float')) ? 0 : (!empty($config_var['multiple']) ? serialize(array()) : '')),
|
|
|
'disabled' => false,
|
|
'disabled' => false,
|
|
|
'invalid' => !empty($config_var['invalid']),
|
|
'invalid' => !empty($config_var['invalid']),
|
|
|
'javascript' => '',
|
|
'javascript' => '',
|
Suki