[Phpgroupware-cvs] CVS: addressbook csv_import.php,1.5,1.6

[Ralf Becker <address@hidden>]

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

Modified Files:
        csv_import.php 
Log Message:
saveing fieldassignments now in preferences and not longer in a separate file 
in /tmp

Index: csv_import.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/csv_import.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** csv_import.php      14 Feb 2002 18:42:19 -0000      1.5
--- csv_import.php      5 Mar 2002 10:26:33 -0000       1.6
***************
*** 125,128 ****
--- 125,131 ----
        }
  
+       $GLOBALS['phpgw']->preferences->read_repository();
+       echo "prefs[addressbook] = "; 
_debug_array($GLOBALS['phpgw_info']['user']['preferences']['addressbook']);
+ 
        switch ($action)
        {
***************
*** 140,149 ****
  
                case 'download':
!                       $pref_file = '/tmp/csv_import_addrbook.php';
!                       if (is_readable($pref_file) && ($prefs = 
fopen($pref_file,'r')))
                        {
!                               eval("fread\(\$prefs,8000\);");
!                               // echo "<p>defaults = 
array".dump_array($defaults)."</p>\n";
!                       }               
                        
$GLOBALS['phpgw']->template->set_var('lang_csv_fieldname',lang('CSV-Fieldname'));
                        
$GLOBALS['phpgw']->template->set_var('lang_addr_fieldname',lang('Addressbook-Fieldname'));
--- 143,152 ----
  
                case 'download':
!                       $GLOBALS['phpgw']->preferences->read_repository();
!                       $defaults = 
$GLOBALS['phpgw_info']['user']['preferences']['addressbook']['cvs_import'];
!                       if (!is_array($defaults))
                        {
!                               $defaults = array();
!                       }
                        
$GLOBALS['phpgw']->template->set_var('lang_csv_fieldname',lang('CSV-Fieldname'));
                        
$GLOBALS['phpgw']->template->set_var('lang_addr_fieldname',lang('Addressbook-Fieldname'));
***************
*** 153,158 ****
                        
$GLOBALS['phpgw']->template->parse('fheaderhandle','fheader');
                        $hiddenvars .= '<input type="hidden" name="action" 
value="import">'."\n"
!                               . '<input type="hidden" name="fieldsep" 
value="'.$fieldsep."\">\n"
!                               . '<input type="hidden" name="pref_file" 
value="'.$pref_file."\">\n";
  
                        $addr_names = 
$GLOBALS['phpgw']->contacts->stock_contact_fields + array(
--- 156,160 ----
                        
$GLOBALS['phpgw']->template->parse('fheaderhandle','fheader');
                        $hiddenvars .= '<input type="hidden" name="action" 
value="import">'."\n"
!                               . '<input type="hidden" name="fieldsep" 
value="'.$fieldsep."\">\n";
  
                        $addr_names = 
$GLOBALS['phpgw']->contacts->stock_contact_fields + array(
***************
*** 177,182 ****
                        $csv_fields = fgetcsv($fp,8000,$fieldsep);
                        $csv_fields[] = 'no CSV 1';                             
                // eg. for static assignments
!                       $csv_fields[] = 'no CSV 2'; 
!                       $csv_fields[] = 'no CSV 3'; 
                        while (list($csv_idx,$csv_field) = each($csv_fields))
                        {
--- 179,184 ----
                        $csv_fields = fgetcsv($fp,8000,$fieldsep);
                        $csv_fields[] = 'no CSV 1';                             
                // eg. for static assignments
!                       $csv_fields[] = 'no CSV 2';
!                       $csv_fields[] = 'no CSV 3';
                        while (list($csv_idx,$csv_field) = each($csv_fields))
                        {
***************
*** 242,267 ****
                        $fp=fopen($csvfile,"r");
                        $csv_fields = fgetcsv($fp,8000,$fieldsep);
  
                        $addr_fields = array_diff($addr_fields,array( '' ));    
// throw away empty / not assigned entrys
  
!                       if ($pref_file)
!                       {
!                               // echo "writing pref_file ...<p>";
!                               if (file_exists($pref_file))
                                {
!                                       rename($pref_file,$pref_file.'.old');
!                               }
!                               $pref = fopen($pref_file,'w');
!                               while (list($csv_idx,$addr) = 
each($addr_fields))
!                               {       // convert $trans[$csv_idx] into array 
of pattern => value
!                                       $defaults[$csv_fields[$csv_idx]] = 
$addr;
!                                       if ($trans[$csv_idx])
!                                       {
!                                               
$defaults[$csv_fields[$csv_idx]] .= $PSep.$trans[$csv_idx];
!                                       }
                                }
-                               fwrite($pref,'$defaults = array'.dump_array( 
$defaults ).';');
-                               fclose($pref);
                        }
                        $log = "<table border=1>\n\t<tr><td>#</td>\n";
  
--- 244,267 ----
                        $fp=fopen($csvfile,"r");
                        $csv_fields = fgetcsv($fp,8000,$fieldsep);
+                       $csv_fields[] = 'no CSV 1';                             
                // eg. for static assignments
+                       $csv_fields[] = 'no CSV 2';
+                       $csv_fields[] = 'no CSV 3';
  
                        $addr_fields = array_diff($addr_fields,array( '' ));    
// throw away empty / not assigned entrys
  
!                       $defaults = array();
!                       while (list($csv_idx,$addr) = each($addr_fields))
!                       {       // convert $trans[$csv_idx] into array of 
pattern => value
!                               $defaults[$csv_fields[$csv_idx]] = $addr;
!                               if ($trans[$csv_idx])
                                {
!                                       $defaults[$csv_fields[$csv_idx]] .= 
$PSep.$trans[$csv_idx];
                                }
                        }
+ 
+                       $GLOBALS['phpgw']->preferences->read_repository();
+                       
$GLOBALS['phpgw']->preferences->add('addressbook','cvs_import',$defaults);
+                       $GLOBALS['phpgw']->preferences->save_repository(True);
+ 
                        $log = "<table border=1>\n\t<tr><td>#</td>\n";