dont show vfs_storage_mode "custom", if not custom

This commit is contained in:
Ralf Becker 2011-03-07 14:15:44 +00:00
parent 00dd0b090b
commit ea989a2af8

View File

@ -43,8 +43,11 @@ function vfs_storage_mode_options($config)
'custom' => lang('Custom set via %1','filemanager/cli.php mount'), 'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
) as $name => $label) ) as $name => $label)
{ {
$options .= '<option value="'.$name.($name === $config['vfs_storage_mode'] ? '" selected="selected' : ''). if ($name != 'custom' || $name === $config['vfs_storage_mode']) // dont show custom, if not custom
'">'.htmlspecialchars($label)."</options>\n"; {
$options .= '<option value="'.$name.($name === $config['vfs_storage_mode'] ? '" selected="selected' : '').
'">'.htmlspecialchars($label)."</options>\n";
}
} }
//echo "<pre>".htmlspecialchars($options)."</pre>\n"; //echo "<pre>".htmlspecialchars($options)."</pre>\n";
return $options; return $options;
@ -233,7 +236,7 @@ function sql_passwdhashes($config)
/** /**
* Make mail-login-types from emailadmin available to config template * Make mail-login-types from emailadmin available to config template
* *
* @param array $config * @param array $config
* @return string * @return string
*/ */
@ -244,7 +247,7 @@ function mail_login_type($config)
/** /**
* Make auth-types from setup_cmd_config available * Make auth-types from setup_cmd_config available
* *
* @param array $config * @param array $config
* @return string * @return string
*/ */
@ -263,7 +266,7 @@ function auth_type_groupdav($config)
/** /**
* Returns options string * Returns options string
* *
* @param array $options value => label pairs * @param array $options value => label pairs
* @param string $selected value of selected optino * @param string $selected value of selected optino
* @return string * @return string
@ -272,7 +275,7 @@ function _options_from(array $options,$selected)
{ {
foreach($options as $value => $label) foreach($options as $value => $label)
{ {
$out .= '<option value="' . htmlspecialchars($value) . '"' . $out .= '<option value="' . htmlspecialchars($value) . '"' .
($selected == $value ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n"; ($selected == $value ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n";
} }
return $out; return $out;