lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: avoid errors

Browse Source
This commit is contained in:
Regis Houssin 2012-12-06 10:43:27 +01:00
parent 084bd3a4a8
commit 50206bbd73
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/exports/export.php
View File

@ -817,7 +817,7 @@ if ($step == 4 && $datatoexport)
$list=''; $list='';
foreach($array_selected as $code=>$value) foreach($array_selected as $code=>$value)
{ {
$list.=($list?', ':''); $list.=(! empty($list)?', ':'');
$list.=$langs->trans($objexport->array_export_fields[0][$code]); $list.=$langs->trans($objexport->array_export_fields[0][$code]);
} }
print '<td>'.$list.'</td>'; print '<td>'.$list.'</td>';
@ -828,15 +828,18 @@ if ($step == 4 && $datatoexport)
{ {
print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>'; print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
$list=''; $list='';
foreach($array_filtervalue as $code=>$value) if (! empty($array_filtervalue))
{ {
if (isset($objexport->array_export_fields[0][$code])) foreach($array_filtervalue as $code=>$value)
{ {
$list.=($list?', ':''); if (isset($objexport->array_export_fields[0][$code]))
$list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'"; {
$list.=($list?', ':'');
$list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
}
} }
} }
print '<td>'.($list?$list:$langs->trans("None")).'</td>'; print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
print '</tr>'; print '</tr>';
} }
@ -1046,7 +1049,7 @@ if ($step == 5 && $datatoexport)
$list=''; $list='';
foreach($array_selected as $code=>$label) foreach($array_selected as $code=>$label)
{ {
$list.=($list?', ':''); $list.=(! empty($list)?', ':'');
$list.=$langs->trans($objexport->array_export_fields[0][$code]); $list.=$langs->trans($objexport->array_export_fields[0][$code]);
} }
print '<td>'.$list.'</td></tr>'; print '<td>'.$list.'</td></tr>';
@ -1056,15 +1059,18 @@ if ($step == 5 && $datatoexport)
{ {
print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>'; print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
$list=''; $list='';
foreach($array_filtervalue as $code=>$value) if (! empty($array_filtervalue))
{ {
if (isset($objexport->array_export_fields[0][$code])) foreach($array_filtervalue as $code=>$value)
{ {
$list.=($list?', ':''); if (isset($objexport->array_export_fields[0][$code]))
$list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'"; {
$list.=($list?', ':'');
$list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
}
} }
} }
print '<td>'.($list?$list:$langs->trans("None")).'</td>'; print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
print '</tr>'; print '</tr>';
} }