diff --git a/setup/inc/hook_config.inc.php b/setup/inc/hook_config.inc.php index 58b5aa99b2..f286e33359 100644 --- a/setup/inc/hook_config.inc.php +++ b/setup/inc/hook_config.inc.php @@ -172,23 +172,7 @@ function passwdhashes($config,$return_hashes=false) 'plain' => 'plain', ); - if ($return_hashes) return $hashes; - - foreach($hashes as $key => $value) - { - if($config['ldap_encryption_type'] == $value) - { - $selected = ' selected="selected"'; - } - else - { - $selected = ''; - } - $descr = strtoupper($value); - - $out .= '' . "\n"; - } - return $out; + return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type']); } function sql_passwdhashes($config,$return_hashes=false) @@ -222,23 +206,7 @@ function sql_passwdhashes($config,$return_hashes=false) 'plain' => 'plain', ); - if ($return_hashes) return $hashes; - - foreach($hashes as $key => $value) - { - if($config['sql_encryption_type'] == $value) - { - $selected = ' selected="selected"'; - } - else - { - $selected = ''; - } - $descr = strtoupper($value); - - $out .= '' . "\n"; - } - return $out; + return $return_hashes ? $hashes : _options_from($hashes, $config['sql_encryption_type']); } /**