[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.209,1.210

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv4545

Modified Files:
        class.common.inc.php 
Log Message:
fixed display_fullname for missing parts of the name
merged kneckes ldap-change too

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.209
retrieving revision 1.210
diff -C2 -r1.209 -r1.210
*** class.common.inc.php        4 May 2003 15:13:07 -0000       1.209
--- class.common.inc.php        17 May 2003 20:34:55 -0000      1.210
***************
*** 427,434 ****
                        }
  
                        switch($display)
                        {
                                case 'all':
!                                       $name = '['.$lid.'] ';
                                        // fall-through
                                case 'lastname':
--- 427,438 ----
                        }
  
+                       $name = '';
                        switch($display)
                        {
                                case 'all':
!                                       if ($lid)
!                                       {
!                                               $name = '['.$lid.'] ';
!                                       }
                                        // fall-through
                                case 'lastname':
***************
*** 436,444 ****
                                        break;
                                case 'firstall':
!                                       $name = $firstname . ' ' . $lastname . 
' ['.$lid.']';
!                                       break;
                                case 'firstname':
                                default:
!                                       $name = $firstname . ' ' . $lastname;
                                        break;
                        }
--- 440,451 ----
                                        break;
                                case 'firstall':
!                                       if ($lid) 
!                                       {
!                                               $name = ' ['.$lid.']';
!                                       }
!                                       // fall-through
                                case 'firstname':
                                default:
!                                       $name = $firstname . ' ' . $lastname . 
$name;
                                        break;
                        }
***************
*** 1786,1800 ****
                function encrypt_password($password)
                {
!                       
if($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')
                        {
                                $salt       = $this->randomstring(8);
                                $e_password = $this->md5_cryptpasswd($password, 
$salt);
                        }
!                       
if($GLOBALS['phpgw_info']['server']['ldap_encryption_type'] == 'SHA')
                        {
                                if(@function_exists('mhash'))
--- 1793,1807 ----
                function encrypt_password($password)
                {
!                       if 
(strtolower($GLOBALS['phpgw_info']['server']['ldap_encryption_type']) == 'des')
                        {
                                $salt       = $this->randomstring(2);
                                $e_password = $this->des_cryptpasswd($password, 
$salt);
                        }
!                       elseif 
(strtolower($GLOBALS['phpgw_info']['server']['ldap_encryption_type']) == 'md5')
                        {
                                $salt       = $this->randomstring(8);
                                $e_password = $this->md5_cryptpasswd($password, 
$salt);
                        }
!                       
elseif(strtolower($GLOBALS['phpgw_info']['server']['ldap_encryption_type']) == 
'sha')
                        {
                                if(@function_exists('mhash'))