[Phpgroupware-cvs] setup setup_demo.php,1.30.2.8,1.30.2.9

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

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

Modified Files:
      Tag: Version-0_9_16-branch
        setup_demo.php 
Log Message:
Addressmaster fixup.... one more is pending, this one is known to crash apache 
in large pgsql updates from 14


Index: setup_demo.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/setup_demo.php,v
retrieving revision 1.30.2.8
retrieving revision 1.30.2.9
diff -C2 -d -r1.30.2.8 -r1.30.2.9
*** setup_demo.php      5 Oct 2003 05:47:47 -0000       1.30.2.8
--- setup_demo.php      26 Oct 2003 03:24:43 -0000      1.30.2.9
***************
*** 32,39 ****
        function add_account($username,$first,$last,$passwd,$type='u')
        {
!               if($username!='addressmaster' && $type=='u')
                {
!                       $addressmaster_id = 
$GLOBALS['phpgw']->accounts->name2id('addressmaster');
!                       $contacts = CreateObject('phpgwapi.contacts', False);
                        $principal = array('per_prefix'     => $username,
                                           'per_first_name' => $first,
--- 32,39 ----
        function add_account($username,$first,$last,$passwd,$type='u')
        {
!               if($type=='u')
                {
!                       $addressmaster_id = -3;
!                       $contacts = CreateObject('phpgwapi.contacts');
                        $principal = array('per_prefix'     => $username,
                                           'per_first_name' => $first,
***************
*** 41,46 ****
                                           'access'         => 'public',
                                           'owner'          => 
$addressmaster_id);
!                       //$type = $contacts->search_contact_type('Persons');
!                       $person_id = $contacts->add_contact('1', $principal);
                }
  
--- 41,46 ----
                                           'access'         => 'public',
                                           'owner'          => 
$addressmaster_id);
!                       $contact_type = 
$contacts->search_contact_type('Persons');
!                       $person_id = $contacts->add_contact($contact_type, 
$principal);
                }
  
***************
*** 55,66 ****
                        'person_id'         => $person_id
                );
!               $GLOBALS['phpgw']->accounts->create($account_info);             
!               $account_id = $GLOBALS['phpgw']->accounts->name2id($username);
! 
!               if($username!='addressmaster' && $type=='u')
!               {
!                       $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('addressbook', " 
!                                                          . $account_id . "," 
. $addressmaster_id .",1)");
!               }
                return $account_id;
        }
--- 55,60 ----
                        'person_id'         => $person_id
                );
!               $GLOBALS['phpgw']->accounts->create($account_info);
!               $account_id = $GLOBALS['phpgw']->accounts->name2id($username);  
        
                return $account_id;
        }
***************
*** 161,168 ****
  
                /* Now, clear out existing tables */
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM 
phpgw_accounts');
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM 
phpgw_preferences');
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM phpgw_acl');
! 
                /* Create the demo groups */
                $defaultgroupid = 
intval(add_account('Default','Default','Group',$passwd,'g'));
--- 155,173 ----
  
                /* 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');
                $GLOBALS['phpgw_setup']->db->query('DELETE FROM phpgw_acl');
!               $contacts = CreateObject('phpgwapi.contacts');
!               foreach($contacts_to_delete as $contact_id)
!               {
!                       $contacts->delete($contact_id);
!               }
!               unset($contacts_to_delete);
                /* Create the demo groups */
                $defaultgroupid = 
intval(add_account('Default','Default','Group',$passwd,'g'));
***************
*** 170,174 ****
  
                /* Create the addressmaster record */
!               
add_account('addressmaster','addressmaster','addressmaster',$passwd);
  
                /* Group perms for the default group */
--- 175,179 ----
  
                /* Create the addressmaster record */
!               
//add_account('addressmaster','addressmaster','addressmaster','addressmaster');
  
                /* Group perms for the default group */
***************
*** 240,244 ****
                $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('manual','run'," . $accountid . ", 1)");
                $GLOBALS['phpgw_setup']->db->query("INSERT INTO 
phpgw_acl(acl_appname,acl_location,acl_account,acl_rights) 
VALUES('infolog','run'," . $accountid . ", 1)");
- 
                $GLOBALS['phpgw_setup']->db->transaction_commit();
  
--- 245,248 ----