[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.contacts_ldap.inc.php, 1.11.2
From: |
Lars Kneschke <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.contacts_ldap.inc.php, 1.11.2.5.2.1, 1.11.2.5.2.2 |
Date: |
Fri, 29 Aug 2003 01:02:36 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv30213
Modified Files:
Tag: Version-0_9_16-branch
class.contacts_ldap.inc.php
Log Message:
applied [ Patch #1868 ]
Bugfix for decoding Unicode responses from LDAP-Server
Index: class.contacts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_ldap.inc.php,v
retrieving revision 1.11.2.5.2.1
retrieving revision 1.11.2.5.2.2
diff -C2 -r1.11.2.5.2.1 -r1.11.2.5.2.2
*** class.contacts_ldap.inc.php 30 Apr 2003 23:30:46 -0000 1.11.2.5.2.1
--- class.contacts_ldap.inc.php 29 Aug 2003 05:02:34 -0000 1.11.2.5.2.2
***************
*** 455,464 ****
if ($i<$this->total_records &&
$ldap_fields[$i]['uid'][0])
{
! $return_fields[$j]['id'] =
$ldap_fields[$i]['uidnumber'][0];
! $return_fields[$j]['lid'] =
$ldap_fields[$i]['uid'][0];
! $return_fields[$j]['tid'] =
$ldap_fields[$i]['phpgwcontacttypeid'][0];
! $return_fields[$j]['owner'] =
$ldap_fields[$i]['phpgwcontactowner'][0];
! $return_fields[$j]['access'] =
$ldap_fields[$i]['phpgwcontactaccess'][0];
! $return_fields[$j]['cat_id'] =
$ldap_fields[$i]['phpgwcontactcatid'][0];
if (gettype($stock_fieldnames) ==
'array')
--- 455,464 ----
if ($i<$this->total_records &&
$ldap_fields[$i]['uid'][0])
{
! $return_fields[$j]['id'] =
utf8_decode($ldap_fields[$i]['uidnumber'][0]);
! $return_fields[$j]['lid'] =
utf8_decode($ldap_fields[$i]['uid'][0]);
! $return_fields[$j]['tid'] =
utf8_decode($ldap_fields[$i]['phpgwcontacttypeid'][0]);
! $return_fields[$j]['owner'] =
utf8_decode($ldap_fields[$i]['phpgwcontactowner'][0]);
! $return_fields[$j]['access'] =
utf8_decode($ldap_fields[$i]['phpgwcontactaccess'][0]);
! $return_fields[$j]['cat_id'] =
utf8_decode($ldap_fields[$i]['phpgwcontactcatid'][0]);
if (gettype($stock_fieldnames) ==
'array')
***************
*** 708,712 ****
if ($ldap_fields[0]['dn'])
{
! $dn = $ldap_fields[0]['dn'];
list($stock_fields,$stock_fieldnames,$extra_fields) =
$this->split_stock_and_extras($fields);
if (gettype($stock_fieldnames) == 'array')
--- 708,712 ----
if ($ldap_fields[0]['dn'])
{
! $dn = utf8_decode($ldap_fields[0]['dn']);
list($stock_fields,$stock_fieldnames,$extra_fields) =
$this->split_stock_and_extras($fields);
if (gettype($stock_fieldnames) == 'array')
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.contacts_ldap.inc.php, 1.11.2.5.2.1, 1.11.2.5.2.2,
Lars Kneschke <address@hidden> <=