mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
Avoid some warnings about things not being there.
This commit is contained in:
parent
21a79c502f
commit
597de72867
@ -122,7 +122,9 @@ class importexport_wizard_basic_import_csv
|
|||||||
{
|
{
|
||||||
case 'next':
|
case 'next':
|
||||||
// Process sample file for fields
|
// Process sample file for fields
|
||||||
if (($handle = fopen($GLOBALS['egw']->session->appsession('csvfile',$content['application']), "rb")) !== FALSE) {
|
if ($GLOBALS['egw']->session->appsession('csvfile',$content['application']) &&
|
||||||
|
($handle = fopen($GLOBALS['egw']->session->appsession('csvfile',$content['application']), "rb")) !== FALSE
|
||||||
|
) {
|
||||||
$data = fgetcsv($handle, 8000, $content['fieldsep']);
|
$data = fgetcsv($handle, 8000, $content['fieldsep']);
|
||||||
//error_log(array2string($data));
|
//error_log(array2string($data));
|
||||||
fclose($handle);
|
fclose($handle);
|
||||||
@ -205,7 +207,7 @@ class importexport_wizard_basic_import_csv
|
|||||||
}
|
}
|
||||||
if(!array_key_exists('num_header_lines', $content))
|
if(!array_key_exists('num_header_lines', $content))
|
||||||
{
|
{
|
||||||
if(array_key_exists('num_header_lines', $content['plugin_options']))
|
if(is_array($content['plugin_options']) && array_key_exists('num_header_lines', $content['plugin_options']))
|
||||||
{
|
{
|
||||||
$content['num_header_lines'] = $content['plugin_options']['num_header_lines'];
|
$content['num_header_lines'] = $content['plugin_options']['num_header_lines'];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user