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

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

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

Modified Files:
      Tag: Version-0_9_16-branch
        setup_demo.php 
Log Message:
Sets an addressmaster user to own account related contacts


Index: setup_demo.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/setup_demo.php,v
retrieving revision 1.30.2.7
retrieving revision 1.30.2.8
diff -C2 -d -r1.30.2.7 -r1.30.2.8
*** setup_demo.php      13 Aug 2003 22:11:24 -0000      1.30.2.7
--- setup_demo.php      5 Oct 2003 05:47:47 -0000       1.30.2.8
***************
*** 32,35 ****
--- 32,48 ----
        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,
+                                          'per_last_name'  => $last,
+                                          'access'         => 'public',
+                                          'owner'          => 
$addressmaster_id);
+                       //$type = $contacts->search_contact_type('Persons');
+                       $person_id = $contacts->add_contact('1', $principal);
+               }
+ 
                $account_info = array(
                        'account_type'      => $type,
***************
*** 39,47 ****
                        'account_lastname'  => $last,
                        'account_status'    => 'A',
!                       'account_expires'   => -1
                );
!               $GLOBALS['phpgw']->accounts->create($account_info);
  
!               return $GLOBALS['phpgw']->accounts->name2id($username);
        }
  
--- 52,67 ----
                        'account_lastname'  => $last,
                        'account_status'    => 'A',
!                       'account_expires'   => -1,
!                       '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;
        }
  
***************
*** 148,151 ****
--- 168,174 ----
                $defaultgroupid = 
intval(add_account('Default','Default','Group',$passwd,'g'));
                $admingroupid   = intval(add_account('Admins','Admin', 
'Group',$passwd,'g'));
+ 
+               /* Create the addressmaster record */
+               
add_account('addressmaster','addressmaster','addressmaster',$passwd);
  
                /* Group perms for the default group */