holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keeping the old defaults to not break existing installs

Browse Source
This commit is contained in:
Ralf Becker 2011-05-04 17:57:12 +00:00
parent 45855d6b6e
commit e0614a8a6a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup/inc/hook_config.inc.php
View File

@ -166,13 +166,17 @@ function passwdhashes($config,$return_hashes=false)
{
$hashes['ext_crypt'] = 'ext_crypt';
}
if(@defined('CRYPT_STD_DES') && CRYPT_STD_DES == 1)
{
$hashes['crypt'] = 'crypt';
}
$hashes += array(
'md5' => 'md5',
'plain' => 'plain',
);
return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type']);
return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type'] ? $config['ldap_encryption_type'] : 'crypt');
}
function sql_passwdhashes($config,$return_hashes=false)
@ -206,7 +210,7 @@ function sql_passwdhashes($config,$return_hashes=false)
'plain' => 'plain',
);
return $return_hashes ? $hashes : _options_from($hashes, $config['sql_encryption_type']);
return $return_hashes ? $hashes : _options_from($hashes, $config['sql_encryption_type'] ? $config['sql_encryption_type'] : 'md5');
}
/**