[Phpgroupware-cvs] CVS: addressbook csv_import.php,1.14,1.15

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook
In directory subversions:/tmp/cvs-serv30645

Modified Files:
        csv_import.php 
Log Message:
merged from the eTemplate-branch:
included ab_id to allow updates


Index: csv_import.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/csv_import.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** csv_import.php      28 Sep 2002 15:20:18 -0000      1.14
--- csv_import.php      6 Apr 2003 12:23:58 -0000       1.15
***************
*** 162,166 ****
                                'address2' => 'address line 2',
                                'address3' => 'address line 3',
!                               'ophone'   => 'Other Phone'
                        );
  
--- 162,167 ----
                                'address2' => 'address line 2',
                                'address3' => 'address line 3',
!                               'ophone'   => 'Other Phone',
!                               'ab_id'    => 'Address Id: 
@addr_id(n_family,n_given,org_name)'
                        );
  
***************
*** 365,370 ****
                                if(!$debug)
                                {
!                                       $GLOBALS['phpgw']->contacts->add( 
$values['owner'] ? $values['owner'] : 
$GLOBALS['phpgw_info']['user']['account_id'],
!                                               
$values,$values['access'],$values['cat_id']);
                                        // echo "<p>adding: 
".dump_array($values)."</p>\n";
                                }
--- 366,380 ----
                                if(!$debug)
                                {
!                                       if (!$values['ab_id'])
!                                       {
!                                               
$GLOBALS['phpgw']->contacts->add( $values['owner'] ? $values['owner'] : 
$GLOBALS['phpgw_info']['user']['account_id'],
!                                                       
$values,$values['access'],$values['cat_id']);
!                                       }
!                                       else
!                                       {
!                                               
$GLOBALS['phpgw']->contacts->update( $values['ab_id'],
!                                                       $values['owner'] ? 
$values['owner'] : $GLOBALS['phpgw_info']['user']['account_id'],
!                                                       
$values,$values['access'],$values['cat_id']);
!                                       }
                                        // echo "<p>adding: 
".dump_array($values)."</p>\n";
                                }