diff --git a/config/config.php.example b/config/config.php.example index 5b6fdb8..973eef3 100644 --- a/config/config.php.example +++ b/config/config.php.example @@ -379,7 +379,7 @@ $servers->setValue('server','name','My LDAP Server'); /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5, blowfish, crypt or leave blank for now default algorithm. */ -// $servers->setValue('appearance','password_hash','md5'); +// $servers->setValue('appearance','pla_password_hash','md5'); /* If you specified 'cookie' or 'session' as the auth_type above, you can optionally specify here an attribute to use when logging in. If you enter @@ -546,7 +546,7 @@ $servers->setValue('sasl','authz_id_regex','/^uid=([^,]+)(.+)/i'); $servers->setValue('sasl','authz_id_replacement','$1'); $servers->setValue('sasl','props',null); -$servers->setValue('appearance','password_hash','md5'); +$servers->setValue('appearance','pla_password_hash','md5'); $servers->setValue('login','attr','dn'); $servers->setValue('login','fallback_dn',false); $servers->setValue('login','class',null); diff --git a/lib/PageRender.php b/lib/PageRender.php index 6cc571e..d905c96 100644 --- a/lib/PageRender.php +++ b/lib/PageRender.php @@ -957,7 +957,7 @@ class PageRender extends Visitor { if (trim($val)) $enc_type = get_enc_type($val); else - $enc_type = $server->getValue('appearance','password_hash'); + $enc_type = $server->getValue('appearance','pla_password_hash'); $obfuscate_password = obfuscate_password_display($enc_type); @@ -982,7 +982,7 @@ class PageRender extends Visitor { if (trim($val)) $enc_type = get_enc_type($val); else - $enc_type = $server->getValue('appearance','password_hash'); + $enc_type = $server->getValue('appearance','pla_password_hash'); echo '
'; diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php index aaa7308..bf6e99d 100644 --- a/lib/TemplateRender.php +++ b/lib/TemplateRender.php @@ -2466,7 +2466,7 @@ function deleteAttribute(attrName,friendlyName,i) if ($val = $attribute->getValue($i)) $default = get_enc_type($val); else - $default = $this->getServer()->getValue('appearance','password_hash'); + $default = $this->getServer()->getValue('appearance','pla_password_hash'); if (! $attribute->getPostValue()) printf('',$attribute->getName(),$i); diff --git a/lib/ds_ldap_pla.php b/lib/ds_ldap_pla.php index 7ece393..4065109 100644 --- a/lib/ds_ldap_pla.php +++ b/lib/ds_ldap_pla.php @@ -16,7 +16,7 @@ class ldap_pla extends ldap { function __construct($index) { parent::__construct($index); - $this->default->appearance['password_hash'] = array( + $this->default->appearance['pla_password_hash'] = array( 'desc'=>'Default HASH to use for passwords', 'default'=>'md5'); |