extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 02:02:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite loop if no sample file provided, default field separator to ;

Browse Source
This commit is contained in:
Nathan Gray 2010-03-01 15:53:47 +00:00
parent fcc50858ee
commit 8f815a951e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/importexport/class.wizzard_import_contacts_csv.inc.php
View File

@ -90,11 +90,10 @@ class wizzard_import_contacts_csv extends import_contacts_csv
if (($handle = fopen($GLOBALS['egw']->session->appsession('csvfile'), "rb")) !== FALSE) { if (($handle = fopen($GLOBALS['egw']->session->appsession('csvfile'), "rb")) !== FALSE) {
$data = fgetcsv($handle, 8000, $content['fieldsep']); $data = fgetcsv($handle, 8000, $content['fieldsep']);
$content['csv_fields'] = translation::convert($data,$content['charset']); $content['csv_fields'] = translation::convert($data,$content['charset']);
return $GLOBALS['egw']->uidefinitions->get_step($content['step'],1);
} elseif($content['plugin_options']['csv_fields']) { } elseif($content['plugin_options']['csv_fields']) {
$content['csv_fields'] = $content['plugin_options']['csv_fields']; $content['csv_fields'] = $content['plugin_options']['csv_fields'];
} }
return $this->wizzard_step40($content,$sel_options,$readonlys,$preserv); return $GLOBALS['egw']->uidefinitions->get_step($content['step'],1);
case 'previous' : case 'previous' :
return $GLOBALS['egw']->uidefinitions->get_step($content['step'],-1); return $GLOBALS['egw']->uidefinitions->get_step($content['step'],-1);
case 'finish': case 'finish':
@ -112,6 +111,8 @@ class wizzard_import_contacts_csv extends import_contacts_csv
// If editing an existing definition, these will be in plugin_options // If editing an existing definition, these will be in plugin_options
if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) { if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
$content['fieldsep'] = $content['plugin_options']['fieldsep']; $content['fieldsep'] = $content['plugin_options']['fieldsep'];
} elseif (!$content['fieldsep']) {
$content['fieldsep'] = ';';
} }
if(!$content['charset'] && $content['plugin_options']['charset']) { if(!$content['charset'] && $content['plugin_options']['charset']) {
$content['charset'] = $content['plugin_options']['charset']; $content['charset'] = $content['plugin_options']['charset'];