[Phpgroupware-cvs] CVS: phpgwapi/inc class.accounts_ldap.inc.php,1.101.2.12,1.101.2.13

[Lars Kneschke <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.accounts_ldap.inc.php 
Log Message:
store firstname and lastname in utf8 format in ldap

when we rework ldap support, we need to add it for any field


Index: class.accounts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_ldap.inc.php,v
retrieving revision 1.101.2.12
retrieving revision 1.101.2.13
diff -C2 -r1.101.2.12 -r1.101.2.13
*** class.accounts_ldap.inc.php 21 Mar 2003 01:36:47 -0000      1.101.2.12
--- class.accounts_ldap.inc.php 23 Mar 2003 10:03:47 -0000      1.101.2.13
***************
*** 59,63 ****
                                $this->data['account_id']   = 
$allValues[0]['gidnumber'][0];
                                $this->data['account_lid']  = 
$allValues[0]['cn'][0];
!                               $this->data['firstname']    = 
$allValues[0]['cn'][0];
                                $this->data['lastname']     = 'Group';
                        }
--- 59,63 ----
                                $this->data['account_id']   = 
$allValues[0]['gidnumber'][0];
                                $this->data['account_lid']  = 
$allValues[0]['cn'][0];
!                               $this->data['firstname']    = 
utf8_decode($allValues[0]['cn'][0]);
                                $this->data['lastname']     = 'Group';
                        }
***************
*** 66,71 ****
                                $this->data['account_id']   = 
$allValues[0]['uidnumber'][0];
                                $this->data['account_lid']  = 
$allValues[0]['uid'][0];
!                               $this->data['firstname']    = 
$allValues[0]['givenname'][0];
!                               $this->data['lastname']     = 
$allValues[0]['sn'][0];
                        }
                        $this->data['account_dn']  = $allValues[0]['dn'];
--- 66,71 ----
                                $this->data['account_id']   = 
$allValues[0]['uidnumber'][0];
                                $this->data['account_lid']  = 
$allValues[0]['uid'][0];
!                               $this->data['firstname']    = 
utf8_decode($allValues[0]['givenname'][0]);
!                               $this->data['lastname']     = 
utf8_decode($allValues[0]['sn'][0]);
                        }
                        $this->data['account_dn']  = $allValues[0]['dn'];
***************
*** 107,119 ****
                        if($acct_type == 'u')
                        {
!                               $entry['cn']                 = sprintf("%s %s", 
$this->data['firstname'], $this->data['lastname']);
                        }
                        else
                        {
!                               $entry['cn']                  = 
$this->data['firstname'];
                        }
  
!                       $entry['sn']                    = 
$this->data['lastname'];
!                       $entry['givenname']             = 
$this->data['firstname'];
                        $entry['phpgwaccountlastlogin']     = 
$this->data['lastlogin'];
                        $entry['phpgwaccountlastloginfrom'] = 
$this->data['lastloginfrom'];
--- 107,119 ----
                        if($acct_type == 'u')
                        {
!                               $entry['cn']                 = 
utf8_encode(sprintf("%s %s", $this->data['firstname'], 
$this->data['lastname']));
                        }
                        else
                        {
!                               $entry['cn']                  = 
utf8_encode($this->data['firstname']);
                        }
  
!                       $entry['sn']                    = 
utf8_encode($this->data['lastname']);
!                       $entry['givenname']             = 
utf8_encode($this->data['firstname']);
                        $entry['phpgwaccountlastlogin']     = 
$this->data['lastlogin'];
                        $entry['phpgwaccountlastloginfrom'] = 
$this->data['lastloginfrom'];
***************
*** 181,185 ****
                                {
                                        $dn = 
'cn='.$this->data['account_lid'].','.$this->group_context;
!                                       $entry['cn'] = 
$this->data['account_lid'];
                                        $entry['gidnumber'] = 
$this->data['account_id'];
                                        /* $entry["objectclass"] = ''; */
--- 181,185 ----
                                {
                                        $dn = 
'cn='.$this->data['account_lid'].','.$this->group_context;
!                                       $entry['cn'] = 
utf8_encode($this->data['account_lid']);
                                        $entry['gidnumber'] = 
$this->data['account_id'];
                                        /* $entry["objectclass"] = ''; */
***************
*** 202,209 ****
                                        $dn = 
'uid='.$this->data['account_lid'].','.$this->user_context;
                                        $entry['uidnumber']      = 
$this->data['account_id'];
!                                       $entry['cn'] = sprintf("%s %s", 
$this->data['firstname'], $this->data['lastname']);
                                        $entry['uid']       = 
$this->data['account_lid'];
!                                       $entry['givenname']      = 
$this->data['firstname'];
!                                       $entry['sn']             = 
$this->data['lastname'];
                                        $entry['objectclass']    = '';
                                        $entry['objectclass'][0] = 'top';
--- 202,209 ----
                                        $dn = 
'uid='.$this->data['account_lid'].','.$this->user_context;
                                        $entry['uidnumber']      = 
$this->data['account_id'];
!                                       $entry['cn'] = utf8_encode(sprintf("%s 
%s", $this->data['firstname'], $this->data['lastname']));
                                        $entry['uid']       = 
$this->data['account_lid'];
!                                       $entry['givenname']      = 
utf8_encode($this->data['firstname']);
!                                       $entry['sn']             = 
utf8_encode($this->data['lastname']);
                                        $entry['objectclass']    = '';
                                        $entry['objectclass'][0] = 'top';