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

fixed display_fullname for missing parts of the name

Browse Source 
merged kneckes ldap-change too
This commit is contained in:
Ralf Becker 2003-05-17 20:34:55 +00:00
parent e51acc6ad8
commit 02c9cec298
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
phpgwapi/inc/class.common.inc.php
View File

@ -426,20 +426,27 @@
$a[] = $firstname;
}
$name = '';
switch($display)
{
case 'all':
$name = '['.$lid.'] ';
if ($lid)
{
$name = '['.$lid.'] ';
}
// fall-through
case 'lastname':
$name .= implode(', ',$a);
break;
case 'firstall':
$name = $firstname . ' ' . $lastname . ' ['.$lid.']';
break;
if ($lid)
{
$name = ' ['.$lid.']';
}
// fall-through
case 'firstname':
default:
$name = $firstname . ' ' . $lastname;
$name = $firstname . ' ' . $lastname . $name;
break;
}
return $name;
@ -1785,17 +1792,17 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info'
*/
function encrypt_password($password)
{
if($GLOBALS['phpgw_info']['server']['ldap_encryption_type'] == 'DES')
if (strtolower($GLOBALS['phpgw_info']['server']['ldap_encryption_type']) == 'des')
{
$salt = $this->randomstring(2);
$e_password = $this->des_cryptpasswd($password, $salt);
}
if($GLOBALS['phpgw_info']['server']['ldap_encryption_type'] == 'MD5')
elseif (strtolower($GLOBALS['phpgw_info']['server']['ldap_encryption_type']) == 'md5')
{
$salt = $this->randomstring(8);
$e_password = $this->md5_cryptpasswd($password, $salt);
}
if($GLOBALS['phpgw_info']['server']['ldap_encryption_type'] == 'SHA')
elseif(strtolower($GLOBALS['phpgw_info']['server']['ldap_encryption_type']) == 'sha')
{
if(@function_exists('mhash'))
{