extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* ImportExport: fix PHP Fatal in import wizard in minimal install

Browse Source
This commit is contained in:
Ralf Becker 2016-06-22 10:20:33 +02:00
parent 43eb31682a
commit 1e1739668e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
View File

@ -36,14 +36,14 @@ class importexport_wizard_basic_import_csv
'wizard_step50' => 'importexport.wizard_basic_import_csv.fieldmapping',
'wizard_step55' => 'importexport.wizard_basic_import_csv.conditions'
);
/**
* Destination fields for the mapping
* Key is the field name, value is the human version
*/
protected $mapping_fields = array();
/**
* List of conditions your plugin supports
*/
@ -81,7 +81,7 @@ class importexport_wizard_basic_import_csv
case 'next':
// Move sample file to temp
if($content['file']['tmp_name']) {
$GLOBALS['egw']->session->appsession('csvfile',$content['application'],$content['file']['tmp_name']);
Api\Cache::setSession($content['application'], 'csvfile', $content['file']['tmp_name']);
}
unset($content['file']);
return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
@ -100,12 +100,12 @@ class importexport_wizard_basic_import_csv
$content['step'] = 'wizard_step30';
$preserv = $content;
unset ($preserv['button']);
return $this->step_templates[$content['step']];
}
}
/**
* choose fieldseperator, charset and headerline
*
@ -259,9 +259,9 @@ class importexport_wizard_basic_import_csv
unset ($preserv['button']);
return $this->step_templates[$content['step']];
}
}
/**
* Process the sample file, get the fields out of it, then allow them to be mapped onto
* the fields the destination understands. Also, set any translations to be done to the field.
@ -340,13 +340,13 @@ class importexport_wizard_basic_import_csv
}
$preserv = $content;
$sel_options['field'] = array('--NONE--' => lang('none')) + $this->mapping_fields;
unset ($preserv['button']);
return $this->step_templates[$content['step']];
}
}
/**
* Edit conditions
*/