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

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/infolog
In directory subversions:/tmp/cvs-serv18318

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/infolog/csv_import.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** csv_import.php      13 May 2002 15:15:29 -0000      1.10
--- csv_import.php      1 Jun 2002 10:55:05 -0000       1.11
***************
*** 28,42 ****
        }
        $GLOBALS['phpgw']->common->phpgw_header();
-       echo parse_navbar();
  
        $infolog = createobject('infolog.uiinfolog');
  
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); // $t->unknows = 
'keep'; $t->debug = 1;
!       $t->set_file(array('import' => 'csv_import.tpl'));
!       $t->set_block('import','filename','filenamehandle');
!       $t->set_block('import','fheader','fheaderhandle');
!       $t->set_block('import','fields','fieldshandle');
!       $t->set_block('import','ffooter','ffooterhandle');
!       $t->set_block('import','imported','importedhandle');
        
        // 
$t->set_var("navbar_bg",$GLOBALS['phpgw_info']["theme"]["navbar_bg"]);
--- 28,43 ----
        }
        $GLOBALS['phpgw']->common->phpgw_header();
  
        $infolog = createobject('infolog.uiinfolog');
  
!       $t = $GLOBALS['phpgw']->template; 
//CreateObject('phpgwapi.Template',PHPGW_APP_TPL); // $t->unknows = 'keep'; 
$t->debug = 1;
!       $t->set_file(array('import_t' => 'csv_import.tpl'));
!       $t->set_block('import_t','filename');
!       $t->set_block('import_t','fheader');
!       $t->set_block('import_t','fields');
!       $t->set_block('import_t','ffooter');
!       $t->set_block('import_t','imported');
!       $t->set_block('import_t','import');
! 
        
        // 
$t->set_var("navbar_bg",$GLOBALS['phpgw_info']["theme"]["navbar_bg"]);
***************
*** 137,141 ****
                $hiddenvars .= '<input type="hidden" name="action" 
value="download">'."\n";
  
!               $t->parse('filenamehandle','filename');
                break;
  
--- 138,142 ----
                $hiddenvars .= '<input type="hidden" name="action" 
value="download">'."\n";
  
!               $t->parse('rows','filename');
                break;
  
***************
*** 152,156 ****
                $t->set_var('submit',lang('Import'));
                $t->set_var('lang_debug',lang('Test Import (show importable 
records <u>only</u> in browser)'));
!               $t->parse('fheaderhandle','fheader');
                $hiddenvars .= '<input type="hidden" name="action" 
value="import">'."\n".
                                                        '<input type="hidden" 
name="fieldsep" value="'.$fieldsep."\">\n";
--- 153,157 ----
                $t->set_var('submit',lang('Import'));
                $t->set_var('lang_debug',lang('Test Import (show importable 
records <u>only</u> in browser)'));
!               $t->parse('rows','fheader');
                $hiddenvars .= '<input type="hidden" name="action" 
value="import">'."\n".
                                                        '<input type="hidden" 
name="fieldsep" value="'.$fieldsep."\">\n";
***************
*** 176,182 ****
                                                                        
'addr_id'       =>      'Addressbook id, to set use @addr_id(nlast,nfirst,org)' 
);
  
!               /* this are settings to import from Lotus Organizer
                $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)";
  
                $defaults += array(     'Land'                  => 
"addr$PSep.*[(]+([0-9]+)[)]+$ASep+${VPre}1 (${CPre}Ortsvorwahl$CPos) 
${CPre}Telefon$CPos$PSep${CPre}Telefon$CPos",
                                                                        'Notiz' 
                => 'des',
--- 177,184 ----
                                                                        
'addr_id'       =>      'Addressbook id, to set use @addr_id(nlast,nfirst,org)' 
);
  
!               // the next line is used in the help-text too
                $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)";
  
+               /* this are settings to import from Lotus Organizer
                $defaults += array(     'Land'                  => 
"addr$PSep.*[(]+([0-9]+)[)]+$ASep+${VPre}1 (${CPre}Ortsvorwahl$CPos) 
${CPre}Telefon$CPos$PSep${CPre}Telefon$CPos",
                                                                        'Notiz' 
                => 'des',
***************
*** 210,214 ****
                                $t->set_var('info_fields',$info_name_options);
                        }
!                       $t->parse('fieldshandle','fields',True);
                }
                $t->set_var('lang_start',lang('Startrecord'));
--- 212,216 ----
                                $t->set_var('info_fields',$info_name_options);
                        }
!                       $t->parse('rows','fields',True);
                }
                $t->set_var('lang_start',lang('Startrecord'));
***************
*** 216,220 ****
                $t->set_var('lang_max',lang('Number of records to read 
(<=200)'));
                $t->set_var('max',200);
!               $t->parse('ffooterhandle','ffooter');
                fclose($fp);
                $old = $csvfile; $csvfile = 
$GLOBALS['phpgw_info']['server']['temp_dir'].'/info_log_import_'.basename($csvfile);
--- 218,222 ----
                $t->set_var('lang_max',lang('Number of records to read 
(<=200)'));
                $t->set_var('max',200);
!               $t->parse('rows','ffooter',True);
                fclose($fp);
                $old = $csvfile; $csvfile = 
$GLOBALS['phpgw_info']['server']['temp_dir'].'/info_log_import_'.basename($csvfile);
***************
*** 276,281 ****
  
                $GLOBALS['phpgw']->preferences->read_repository();
!               $test = 
$GLOBALS['phpgw']->preferences->add('infolog','cvs_import',$defaults);
!               echo "add('infolog','cvs_import',defaults) ="; 
_debug_array($test);
                $GLOBALS['phpgw']->preferences->save_repository(True);
  
--- 278,282 ----
  
                $GLOBALS['phpgw']->preferences->read_repository();
!               
$GLOBALS['phpgw']->preferences->add('infolog','cvs_import',$defaults);
                $GLOBALS['phpgw']->preferences->save_repository(True);
  
***************
*** 350,358 ****
                                                                                
                                lang( '%1 records imported',$anz ));
                $t->set_var('log',$log);
!               $t->parse('importedhandle','imported');
                break;
        }
        $t->set_var('hiddenvars',$hiddenvars);
!       $t->pfp('out','import',True);
        $GLOBALS['phpgw']->common->phpgw_footer();
  
--- 351,359 ----
                                                                                
                                lang( '%1 records imported',$anz ));
                $t->set_var('log',$log);
!               $t->parse('rows','imported');
                break;
        }
        $t->set_var('hiddenvars',$hiddenvars);
!       $t->pfp('out','import');
        $GLOBALS['phpgw']->common->phpgw_footer();