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

importexport: Avoid error or infinite loop for really badly parsed select values

Browse Source
This commit is contained in:
nathan 2022-11-21 11:24:04 -07:00
parent 8e0192fb7c
commit 580ff870e6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
importexport/inc/class.importexport_import_csv.inc.php
View File

@ -538,10 +538,13 @@ class importexport_import_csv implements importexport_iface_import_record { //,
for($sub_index = 0; $sub_index < count($subs); $sub_index++)
{
$sub_key = static::find_select_key(trim($subs[$sub_index]), $selects);
if(!$sub_key)
if(!$sub_key && array_key_exists($sub_index + 1, $subs))
{
$sub_key = static::find_select_key(trim($subs[$sub_index]).','.trim($subs[$sub_index+1]), $selects);
if($sub_key) $sub_index++;
$sub_key = static::find_select_key(trim($subs[$sub_index]) . ',' . trim($subs[$sub_index + 1]), $selects);
if($sub_key)
{
$sub_index++;
}
}
if($sub_key)
{