[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: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.contacts_ldap.inc.php,1.11.2.4,1.11.2.5 |
Date: |
Sun, 23 Mar 2003 06:47:33 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv29076
Modified Files:
Tag: Version-0_9_14-branch
class.contacts_ldap.inc.php
Log Message:
applied patch for gnu bug #2016: search with multiple cats in ldap
Index: class.contacts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_ldap.inc.php,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -C2 -r1.11.2.4 -r1.11.2.5
*** class.contacts_ldap.inc.php 23 Mar 2003 10:51:44 -0000 1.11.2.4
--- class.contacts_ldap.inc.php 23 Mar 2003 11:47:31 -0000 1.11.2.5
***************
*** 539,545 ****
{
/* exact value (filtering based on tid,
etc...) */
! if($name == $lastname)
{
! $aquery .= '(' . $name . '=' .
$value . ')';
}
else
--- 539,546 ----
{
/* exact value (filtering based on tid,
etc...) */
! if ($name == 'phpgwcontactcatid')
{
! $aquery .= '(|(' . $name .
'=*,' . $value . ',*)'.
! '(' . $name .
'=' . $value . '))';
}
else
***************
*** 637,640 ****
--- 638,642 ----
$ldap_fields['phpgwcontacttypeid'] = $tid;
$ldap_fields['phpgwcontactowner'] = $owner;
+ if (!isset($access)) { $access = 'private'; }
$ldap_fields['phpgwcontactaccess'] = $access;
$ldap_fields['phpgwcontactcatid'] = $cat_id ?
$cat_id : '0';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.contacts_ldap.inc.php,1.11.2.4,1.11.2.5,
Ralf Becker <address@hidden> <=