[Phpgroupware-cvs] CVS: admin/inc class.boaccounts.inc.php, 1.22.2.7.2.7, 1.22.2.7.2.8 class.uiaccounts.inc.php, 1.23.2.9.2.16, 1.23.2.9.2.17

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv18381/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.boaccounts.inc.php class.uiaccounts.inc.php 
Log Message:
fix for bugs 5176 5177


Index: class.boaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.22.2.7.2.7
retrieving revision 1.22.2.7.2.8
diff -C2 -r1.22.2.7.2.7 -r1.22.2.7.2.8
*** class.boaccounts.inc.php    8 Sep 2003 13:26:37 -0000       1.22.2.7.2.7
--- class.boaccounts.inc.php    10 Sep 2003 00:35:09 -0000      1.22.2.7.2.8
***************
*** 354,363 ****
                                        $principal = array('owner' => $owner,
                                                           'per_prefix' => 
$userData['account_lid'],
!                                                          'per_first_name' => 
$userData['account_firstname'], 
                                                           'per_last_name' => 
$userData['account_lastname']);
                                        $person_id = 
$this->contacts->add_contact($type, $principal);
                                        $userData['person_id'] = $person_id;
                                        //End
! 
                                        $account_id = 
$this->so->add_user($userData);
  
--- 354,363 ----
                                        $principal = array('owner' => $owner,
                                                           'per_prefix' => 
$userData['account_lid'],
!                                                          'per_first_name' => 
$userData['account_firstname'],
                                                           'per_last_name' => 
$userData['account_lastname']);
                                        $person_id = 
$this->contacts->add_contact($type, $principal);
                                        $userData['person_id'] = $person_id;
                                        //End
!  
                                        $account_id = 
$this->so->add_user($userData);
  
***************
*** 805,818 ****
                        $owner = $GLOBALS['phpgw_info']['user']['account_id'];
                        $type = $this->contacts->search_contact_type('Persons');
-                       print 'type' . $type;
-                       
                        $principal = array('owner' => $owner,
                                           'per_prefix' => 
$_userData['account_lid'],
                                           'per_first_name' => 
$_userData['account_firstname'], 
!                                          'per_last_name' => 
$userData['account_lastname']);
!                       
!                       print 'person_id' . $_userData['person_id'];
                        
!                       if ($_userData['person_id'] && 
$contacts->exist_contact($_userData['person_id']))
                        {
                                //$contacts->update($_userData['person_id'], 
$owner, $fields);
--- 805,814 ----
                        $owner = $GLOBALS['phpgw_info']['user']['account_id'];
                        $type = $this->contacts->search_contact_type('Persons');
                        $principal = array('owner' => $owner,
                                           'per_prefix' => 
$_userData['account_lid'],
                                           'per_first_name' => 
$_userData['account_firstname'], 
!                                          'per_last_name' => 
$_userData['account_lastname']);
                        
!                       if ($_userData['person_id'] && 
$this->contacts->exist_contact($_userData['person_id']))
                        {
                                //$contacts->update($_userData['person_id'], 
$owner, $fields);
***************
*** 820,827 ****
                        else
                        {
-                               print 'vor';
                                $person_id = 
$this->contacts->add_contact($type, $principal);
                                $_userData['person_id'] = $person_id;
-                               print 'inseret';
                        }
  
--- 816,821 ----

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.23.2.9.2.16
retrieving revision 1.23.2.9.2.17
diff -C2 -r1.23.2.9.2.16 -r1.23.2.9.2.17
*** class.uiaccounts.inc.php    8 Sep 2003 13:26:38 -0000       1.23.2.9.2.16
--- class.uiaccounts.inc.php    10 Sep 2003 00:35:09 -0000      1.23.2.9.2.17
***************
*** 624,631 ****
                        $account = 
CreateObject('phpgwapi.accounts',intval($_GET['account_id']),'u');
                        $userData = $account->read_repository();
! 
                        $var['account_lid']       = $userData['account_lid'];
!                       $var['account_firstname'] = $userData['firstname'];
!                       $var['account_lastname']  = $userData['lastname'];
  
                        //jarg-SOG S
--- 624,631 ----
                        $account = 
CreateObject('phpgwapi.accounts',intval($_GET['account_id']),'u');
                        $userData = $account->read_repository();
!                       
                        $var['account_lid']       = $userData['account_lid'];
!                       $var['account_firstname'] = 
$userData['account_firstname'];
!                       $var['account_lastname']  = 
$userData['account_lastname'];
  
                        //jarg-SOG S
***************
*** 1122,1126 ****
                                        );
                        //End
! 
                        $var = Array(
                                'input_expires' => 
$GLOBALS['phpgw']->common->dateformatorder($_y,$_m,$_d,True),
--- 1122,1126 ----
                                        );
                        //End
!                       
                        $var = Array(
                                'input_expires' => 
$GLOBALS['phpgw']->common->dateformatorder($_y,$_m,$_d,True),
***************
*** 1137,1142 ****
                                'account_lastname'      => '<input 
name="account_lastname" value="' . $userData['account_lastname'] . '">',
                                //jarg-SOG S
-                               'domain'        => '<input name="domain" 
value="grupogonher.com">',
-                               //'add_addbook' => '<input type="checkbox" 
name="add_addbook" value="C"' . ($userData['person_id']?' checked> &#11 <a 
href=' . $edit_entrie . '>Edit Entrie</a>':'>'),
                                'add_addbook'   => $userData['person_id']? '<a 
href=' . $edit_entrie . '>Edit Entrie</a>':'',
                                'person_id'     => '<input type="hidden" 
NAME="person_id" VALUE="' . $userData['person_id'] . '">',
--- 1137,1140 ----