[Phpgroupware-cvs] CVS: addressbook csv_import.php,1.4.2.6.2.1,1.4.2.6.2.2

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        csv_import.php 
Log Message:
included changes from .14.003:
- address line 2&3
- ophone
- custom fields

Index: csv_import.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/csv_import.php,v
retrieving revision 1.4.2.6.2.1
retrieving revision 1.4.2.6.2.2
diff -C2 -r1.4.2.6.2.1 -r1.4.2.6.2.2
*** csv_import.php      2 Jul 2003 01:39:38 -0000       1.4.2.6.2.1
--- csv_import.php      2 Jul 2003 01:45:31 -0000       1.4.2.6.2.2
***************
*** 164,169 ****
                                'cat_id' => 'Categories: @cat_id(Cat1,Cat2)',
                                'access' => 'Access: public,private',
!                               'owner'  => 'Owner: defaults to user'
                        );
  
                        foreach($addr_names as $field => $name)
--- 164,179 ----
                                'cat_id' => 'Categories: @cat_id(Cat1,Cat2)',
                                'access' => 'Access: public,private',
!                               'owner'  => 'Owner: defaults to user',
!                               'address2' => 'address line 2',
!                               'address3' => 'address line 3',
!                               'ophone'   => 'Other Phone'
                        );
+                       $config = CreateObject('phpgwapi.config','addressbook');
+                       $config->read_repository();
+                       while(list($name,$descr) = 
@each($config->config_data['custom_fields']))
+                       {
+                               $addr_names[$name] = $descr;
+                       }
+                       unset($config);
  
                        foreach($addr_names as $field => $name)