[Phpgroupware-cvs] phpgwapi/inc/accounts class.accounts_ldap.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/07/28 03:06:01

Modified files:
        inc/accounts   : class.accounts_ldap.inc.php 

Log message:
        stop calendar from breaking cos someone didn't even look at the ldap 
schema (which they designed) when writing some code

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/accounts/class.accounts_ldap.inc.php?cvsroot=phpgwapi&r1=1.6&r2=1.7

Patches:
Index: class.accounts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/accounts/class.accounts_ldap.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.accounts_ldap.inc.php 11 Apr 2006 21:32:38 -0000      1.6
+++ class.accounts_ldap.inc.php 28 Jul 2006 03:06:01 -0000      1.7
@@ -11,7 +11,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.accounts_ldap.inc.php,v 1.6 2006/04/11 21:32:38 
skwashd Exp $
+       * @version $Id: class.accounts_ldap.inc.php,v 1.7 2006/07/28 03:06:01 
skwashd Exp $
        */
 
        /**
@@ -407,7 +407,7 @@
 
                        $allValues = array();
                        // Groups are person? are you sure?
-                       $sri = ldap_search($this->ds, $this->group_context, 
"(&(person_id=$person_id)(phpgwaccounttype=g))");
+                       $sri = ldap_search($this->ds, $this->group_context, 
"(&(phpgwContactID={$person_id})(phpgwGroupID=*))");
                        $allValues = ldap_get_entries($this->ds, $sri);
 
                        if (@$allValues[0]['gidnumber'][0])
@@ -417,7 +417,7 @@
                        }
 
                        $allValues = array();
-                       $sri = ldap_search($this->ds, $this->user_context, 
"(&(person_id=$person_id)(phpgwaccounttype=u))");
+                       $sri = ldap_search($this->ds, $this->user_context, 
"(&(phpgwContactID={$person_id})(phpgwAccountID=*))");
                        $allValues = ldap_get_entries($this->ds, $sri);
 
                        if (@$allValues[0]['uidnumber'][0])