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

Fix: clear passwords were being encoded with blowfish by default

Browse Source
This commit is contained in:
Deon George 2009-08-28 23:57:45 +10:00
parent c69cd68fcb
commit 96bad27d64
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/TemplateRender.php
View File

@ -2376,8 +2376,8 @@ function deleteAttribute(attrName,friendlyName,i)
$id,htmlspecialchars($attribute->getName()),$i, $id,htmlspecialchars($attribute->getName()),$i,
$id,htmlspecialchars($attribute->getName()),$i); $id,htmlspecialchars($attribute->getName()),$i);
foreach (password_types() as $v) foreach (password_types() as $v => $display)
printf('<option value="%s" %s>%s</option>',$v,($v == $default) ? 'selected' : '',$v); printf('<option value="%s" %s>%s</option>',$v,($v == $default) ? 'selected' : '',$display);
echo '</select>'; echo '</select>';
} }

18
lib/functions.php
View File

@ -2085,15 +2085,15 @@ function password_types() {
debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs); debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
return array( return array(
'blowfish', 'blowfish'=>'blowfish',
'clear', ''=>'clear',
'crypt', 'crypt'=>'crypt',
'ext_des', 'ext_des'=>'ext_des',
'md5', 'md5'=>'md5',
'md5crypt', 'md5crypt'=>'md5crypt',
'sha', 'sha'=>'sha',
'smd5', 'smd5'=>'smd5',
'ssha' 'ssha'=>'ssha'
); );
} }