[Phpgroupware-cvs] CVS: addressbook csv_import.php,1.10,1.11

[Ralf Becker <address@hidden>]

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

Modified Files:
        csv_import.php 
Log Message:
some changes to be compatible with seek3r new template-system

Index: csv_import.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/csv_import.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** csv_import.php      13 May 2002 14:46:47 -0000      1.10
--- csv_import.php      1 Jun 2002 11:01:56 -0000       1.11
***************
*** 20,29 ****
        $GLOBALS['phpgw']->contacts = createobject('phpgwapi.contacts');
  
!       $GLOBALS['phpgw']->template->set_file(array('import' => 
'csv_import.tpl'));
!       
$GLOBALS['phpgw']->template->set_block('import','filename','filenamehandle');
!       
$GLOBALS['phpgw']->template->set_block('import','fheader','fheaderhandle');
!       
$GLOBALS['phpgw']->template->set_block('import','fields','fieldshandle');
!       
$GLOBALS['phpgw']->template->set_block('import','ffooter','ffooterhandle');
!       
$GLOBALS['phpgw']->template->set_block('import','imported','importedhandle');
  
        if($action == 'download' && (!$fieldsep || !$csvfile || 
!($fp=fopen($csvfile,'rb'))))
--- 20,30 ----
        $GLOBALS['phpgw']->contacts = createobject('phpgwapi.contacts');
  
!       $GLOBALS['phpgw']->template->set_file(array('import_t' => 
'csv_import.tpl'));
!       $GLOBALS['phpgw']->template->set_block('import_t','filename');
!       $GLOBALS['phpgw']->template->set_block('import_t','fheader');
!       $GLOBALS['phpgw']->template->set_block('import_t','fields');
!       $GLOBALS['phpgw']->template->set_block('import_t','ffooter');
!       $GLOBALS['phpgw']->template->set_block('import_t','imported');
!       $GLOBALS['phpgw']->template->set_block('import_t','import');
  
        if($action == 'download' && (!$fieldsep || !$csvfile || 
!($fp=fopen($csvfile,'rb'))))
***************
*** 136,140 ****
                        $hiddenvars .= '<input type="hidden" name="action" 
value="download">'."\n";
  
!                       
$GLOBALS['phpgw']->template->parse('filenamehandle','filename');
                        break;
  
--- 137,141 ----
                        $hiddenvars .= '<input type="hidden" name="action" 
value="download">'."\n";
  
!                       $GLOBALS['phpgw']->template->parse('rows','filename');
                        break;
  
***************
*** 151,155 ****
                        
$GLOBALS['phpgw']->template->set_var('submit',lang('Import'));
                        
$GLOBALS['phpgw']->template->set_var('lang_debug',lang('Test Import (show 
importable records <u>only</u> in browser)'));
!                       
$GLOBALS['phpgw']->template->parse('fheaderhandle','fheader');
                        $hiddenvars .= '<input type="hidden" name="action" 
value="import">'."\n"
                                . '<input type="hidden" name="fieldsep" 
value="'.$fieldsep."\">\n";
--- 152,156 ----
                        
$GLOBALS['phpgw']->template->set_var('submit',lang('Import'));
                        
$GLOBALS['phpgw']->template->set_var('lang_debug',lang('Test Import (show 
importable records <u>only</u> in browser)'));
!                       $GLOBALS['phpgw']->template->parse('rows','fheader');
                        $hiddenvars .= '<input type="hidden" name="action" 
value="import">'."\n"
                                . '<input type="hidden" name="fieldsep" 
value="'.$fieldsep."\">\n";
***************
*** 193,197 ****
                                        
$GLOBALS['phpgw']->template->set_var('addr_fields',$addr_name_options);
                                }
!                               
$GLOBALS['phpgw']->template->parse('fieldshandle','fields',True); 
                        }
                        
$GLOBALS['phpgw']->template->set_var('lang_start',lang('Startrecord'));
--- 194,198 ----
                                        
$GLOBALS['phpgw']->template->set_var('addr_fields',$addr_name_options);
                                }
!                               
$GLOBALS['phpgw']->template->parse('rows','fields',True); 
                        }
                        
$GLOBALS['phpgw']->template->set_var('lang_start',lang('Startrecord'));
***************
*** 199,207 ****
                        
$GLOBALS['phpgw']->template->set_var('lang_max',lang('Number of records to read 
(<=200)'));
                        $GLOBALS['phpgw']->template->set_var('max',200);
!                       
$GLOBALS['phpgw']->template->parse('ffooterhandle','ffooter'); 
                        fclose($fp);
                        $old = $csvfile; $csvfile = 
$GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.basename($csvfile);
                        rename($old,$csvfile); 
                        $hiddenvars .= '<input type="hidden" name="csvfile" 
value="'.$csvfile.'">';
                        $help_on_trans = "<a name='help'><b>How to use 
Translation's</b><p>".
                                "Translations enable you to change / adapt the 
content of each CSV field for your needs. <br>".
--- 200,209 ----
                        
$GLOBALS['phpgw']->template->set_var('lang_max',lang('Number of records to read 
(<=200)'));
                        $GLOBALS['phpgw']->template->set_var('max',200);
!                       
$GLOBALS['phpgw']->template->parse('rows','ffooter',True); 
                        fclose($fp);
                        $old = $csvfile; $csvfile = 
$GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.basename($csvfile);
                        rename($old,$csvfile); 
                        $hiddenvars .= '<input type="hidden" name="csvfile" 
value="'.$csvfile.'">';
+                       $mktime_lotus = "${PSep}0?([0-9]+)[ .:-]+0?([0-9]*)[ 
.:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ 
.:-]+0?([0-9]*)address@hidden(${VPre}4,${VPre}5,${VPre}6,${VPre}2,${VPre}3,${VPre}1)";
                        $help_on_trans = "<a name='help'><b>How to use 
Translation's</b><p>".
                                "Translations enable you to change / adapt the 
content of each CSV field for your needs. <br>".
***************
*** 371,380 ****
                                lang('%1 records imported',$anz));
                        $GLOBALS['phpgw']->template->set_var('log',$log);
!                       
$GLOBALS['phpgw']->template->parse('importedhandle','imported');
                        break;
        }
  
        $GLOBALS['phpgw']->template->set_var('hiddenvars',$hiddenvars);
!       $GLOBALS['phpgw']->template->pfp('out','import',True);
        $GLOBALS['phpgw']->common->phpgw_footer();
  ?>
--- 373,382 ----
                                lang('%1 records imported',$anz));
                        $GLOBALS['phpgw']->template->set_var('log',$log);
!                       $GLOBALS['phpgw']->template->parse('rows','imported');
                        break;
        }
  
        $GLOBALS['phpgw']->template->set_var('hiddenvars',$hiddenvars);
!       $GLOBALS['phpgw']->template->pfp('out','import');
        $GLOBALS['phpgw']->common->phpgw_footer();
  ?>