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

[Caeies]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Caeies <address@hidden> 06/03/12 12:45:47

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

Log message:
        replacing oblsolete personid by contactid in schema

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/accounts/class.accounts_ldap.inc.php.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: phpgwapi/inc/accounts/class.accounts_ldap.inc.php
diff -u phpgwapi/inc/accounts/class.accounts_ldap.inc.php:1.3 
phpgwapi/inc/accounts/class.accounts_ldap.inc.php:1.4
--- phpgwapi/inc/accounts/class.accounts_ldap.inc.php:1.3       Fri Apr  8 
08:56:08 2005
+++ phpgwapi/inc/accounts/class.accounts_ldap.inc.php   Sun Mar 12 12:45:47 2006
@@ -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.3 2005/04/08 08:56:08 
fipsfuchs Exp $
+       * @version $Id: class.accounts_ldap.inc.php,v 1.4 2006/03/12 12:45:47 
Caeies Exp $
        */
 
        /**
@@ -1145,7 +1145,7 @@
 
                function get_account_with_contact()
                {
-                       $sri = ldap_search($this->ds, $this->user_context, 
"(&(phpgwaccounttype=u)(phpgwpersonid=*))", array('uidnumber', 
'phpgwpersonid'));
+                       $sri = ldap_search($this->ds, $this->user_context, 
"(&(phpgwaccounttype=u)(phpgwcontactid=*))", array('uidnumber', 
'phpgwcontactid'));
                        $allValues = ldap_get_entries($this->ds, $sri);
                        if(is_array($allValues))
                        {
@@ -1153,7 +1153,7 @@
                                for($i=0;$i<$count; $i++)
                                {
                                        $value = &$allValue[$i];
-                                       $accounts[$value['uidnumber'][0]] = 
$value['phpgwpersonid'][0];
+                                       $accounts[$value['uidnumber'][0]] = 
$value['phpgwcontactid'][0];
                                }
                        }
                        
@@ -1162,7 +1162,7 @@
 
                function get_account_without_contact()
                {
-                       $sri = ldap_search($this->ds, $this->user_context, 
"(&(phpgwaccounttype=u)(!(phpgwpersonid=*)))", array('uidnumber'));
+                       $sri = ldap_search($this->ds, $this->user_context, 
"(&(phpgwaccounttype=u)(!(phpgwcontactid=*)))", array('uidnumber'));
                        $allValues = ldap_get_entries($this->ds, $sri);
                        if(is_array($allValues))
                        {