[Phpgroupware-cvs] phpgwapi/inc class.accounts.inc.php, 1.10.4.1, 1.10.4.2 class.accounts_ldap.inc.php, 1.101.2.13.2.9, 1.101.2.13.2.10

[Alejandro Borges (lex) <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.accounts.inc.php class.accounts_ldap.inc.php 
Log Message:
More ldap sync thingies


Index: class.accounts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts_ldap.inc.php,v
retrieving revision 1.101.2.13.2.9
retrieving revision 1.101.2.13.2.10
diff -C2 -d -r1.101.2.13.2.9 -r1.101.2.13.2.10
*** class.accounts_ldap.inc.php 31 Oct 2003 06:17:00 -0000      1.101.2.13.2.9
--- class.accounts_ldap.inc.php 31 Oct 2003 23:50:59 -0000      1.101.2.13.2.10
***************
*** 88,91 ****
--- 88,92 ----
                        $this->data['type']              = 
$allValues[0]['phpgwaccounttype'][0];
                        $this->data['expires']           = 
$allValues[0]['phpgwaccountexpires'][0];
+                       $this->data['person_id']           = 
$allValues[0]['phpgwpersonid'][0];
  
                        return $this->data;
***************
*** 981,985 ****
                                }
                        }
- 
                        return $accounts;
                }
--- 982,985 ----

Index: class.accounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.accounts.inc.php,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -C2 -d -r1.10.4.1 -r1.10.4.2
*** class.accounts.inc.php      31 Oct 2003 06:17:00 -0000      1.10.4.1
--- class.accounts.inc.php      31 Oct 2003 23:50:59 -0000      1.10.4.2
***************
*** 143,146 ****
--- 143,147 ----
                {
                        $accounts = $this->get_account_without_contact();
+ 
                        if(is_array($accounts))
                        {
***************
*** 150,164 ****
                                {
                                        
//$this->get_account_name($account,$lid,$fname,$lname);
!                                       $this->account_id = $account;
!                                       $user_account = 
$this->read_repository();
!                                       $principal = array('per_prefix'     => 
$user_account['account_lid'],
!                                                          'per_first_name' => 
$user_account['firstname'],
!                                                          'per_last_name'  => 
$user_account['lastname'],
!                                                          'access'         => 
'public',
!                                                          'owner'          => 
$GLOBALS['phpgw_info']['server']['addressmaster']);
!                                       $contact_type = 
$contacts->search_contact_type('Persons');
!                                       $user_account['person_id'] = 
$contacts->add_contact($contact_type, $principal);
!                                       $this->update_data($user_account);
!                                       $this->save_repository();
                                }
                        }
--- 151,168 ----
                                {
                                        
//$this->get_account_name($account,$lid,$fname,$lname);
!                                       if($account)
!                                       {
!                                               $this->account_id = $account;
!                                               $user_account = 
$this->read_repository();
!                                               $principal = array('per_prefix' 
    => $user_account['account_lid'],
!                                                                  
'per_first_name' => $user_account['firstname'],
!                                                                  
'per_last_name'  => $user_account['lastname'],
!                                                                  'access'     
    => 'public',
!                                                                  'owner'      
    => $GLOBALS['phpgw_info']['server']['addressmaster']);
!                                               $contact_type = 
$contacts->search_contact_type('Persons');
!                                               $user_account['person_id'] = 
$contacts->add_contact($contact_type, $principal);
!                                               
$this->update_data($user_account);
!                                               $this->save_repository();
!                                       }
                                }
                        }