deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13 from DevoKun/master

Browse Source 
Changed password_hash to pla_password_hash in a few places where it was still password_hash.
This commit is contained in:
Deon George 2014-10-08 12:30:58 +11:00
commit 9e283f369f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.php.example
View File

@ -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);

4
lib/PageRender.php
View File

@ -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 '<table cellspacing="0" cellpadding="0"><tr><td valign="top">';

2
lib/TemplateRender.php
View File

@ -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('<input type="hidden" name="post_value[%s][]" value="%s" />',$attribute->getName(),$i);

2
lib/ds_ldap_pla.php
View File

@ -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');