holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid some warnings about things not being there.

Browse Source
This commit is contained in:
Nathan Gray 2016-02-22 16:17:59 +00:00
parent 21a79c502f
commit 597de72867
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,9 @@ class importexport_wizard_basic_import_csv
{
case 'next':
// 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']);
//error_log(array2string($data));
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['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'];
}