[Phpgroupware-cvs] CVS: setup ldapexport.php,1.3,1.3.2.1

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv3373

Modified Files:
      Tag: Version-0_9_14-branch
        ldapexport.php 
Log Message:
partial fix for GNU bug#382

Index: ldapexport.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/ldapexport.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** ldapexport.php      18 Dec 2001 02:25:54 -0000      1.3
--- ldapexport.php      18 May 2002 16:35:28 -0000      1.3.2.1
***************
*** 54,61 ****
        $phpgw_info['server']['account_repository'] = 'ldap';
  
!       $phpgw->accounts     = CreateObject('phpgwapi.accounts');
!       $acct                = $phpgw->accounts;
! 
!       $phpgw_setup->db->query("select config_name,config_value from 
phpgw_config where config_name like 'ldap%'",__LINE__,__FILE__);
        while ($phpgw_setup->db->next_record())
        {
--- 54,58 ----
        $phpgw_info['server']['account_repository'] = 'ldap';
  
!       $phpgw_setup->db->query("SELECT config_name,config_value FROM 
phpgw_config WHERE config_name LIKE 'ldap%'",__LINE__,__FILE__);
        while ($phpgw_setup->db->next_record())
        {
***************
*** 70,73 ****
--- 67,73 ----
        $phpgw_info["server"]['ldap_account_shell'] = 
$config['ldap_account_shell'];
        $phpgw_info['server']['ldap_extra_attributes'] = 
$config['ldap_extra_attributes'];
+ 
+       $phpgw->accounts = CreateObject('phpgwapi.accounts');
+       $acct            = $phpgw->accounts;
  
        // First, see if we can connect to the LDAP server, if not send `em 
back to config.php with an