[Phpgroupware-cvs] setup setup_demo.php,1.30.2.11,1.30.2.12

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

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

Modified Files:
      Tag: Version-0_9_16-branch
        setup_demo.php 
Log Message:
Further work to make contacts <-> ldap work with all  upgrade paths


Index: setup_demo.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/setup_demo.php,v
retrieving revision 1.30.2.11
retrieving revision 1.30.2.12
diff -C2 -d -r1.30.2.11 -r1.30.2.12
*** setup_demo.php      28 Oct 2003 05:39:32 -0000      1.30.2.11
--- setup_demo.php      31 Oct 2003 01:23:28 -0000      1.30.2.12
***************
*** 155,164 ****
  
                /* Now, clear out existing tables */
!               $GLOBALS['phpgw_setup']->db->query('SELECT person_id from 
phpgw_accounts WHERE person_id is not null');
!               $contacts_to_delete=array();
!               while ($GLOBALS['phpgw_setup']->db->next_record())
!               {
!                       $contacts_to_delete[] = 
$GLOBALS['phpgw_setup']->db->f('person_id');
!               }
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM 
phpgw_accounts');
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM 
phpgw_preferences');
--- 155,165 ----
  
                /* Now, clear out existing tables */
!               $contacts_to_delete = 
$GLOBALS['phpgw']->accounts->get_account_with_contact();
! //            $GLOBALS['phpgw_setup']->db->query('SELECT person_id from 
phpgw_accounts WHERE person_id is not null');
! //            $contacts_to_delete=array();
! //            while ($GLOBALS['phpgw_setup']->db->next_record())
! //            {
! //                    $contacts_to_delete[] = 
$GLOBALS['phpgw_setup']->db->f('person_id');
! //            }
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM 
phpgw_accounts');
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM 
phpgw_preferences');