mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
Clean up error display a bit for export
This commit is contained in:
parent
6d81baf960
commit
4dd817cb1b
@ -84,8 +84,16 @@
|
||||
{
|
||||
if ($conv_type == 'none')
|
||||
{
|
||||
$phpgw_info['flags']['noheader'] = False;
|
||||
$phpgw_info['flags']['noheader'] = True;
|
||||
$phpgw->common->phpgw_header();
|
||||
echo parse_navbar();
|
||||
echo lang('<b>No conversion type <none> could be located.</b> Please choose a conversion type from the list');
|
||||
$download = 'off';
|
||||
echo ' <a href="'.$phpgw->link('/addressbook/export.php',
|
||||
"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id")
|
||||
. '">'.lang('OK').'</a>';
|
||||
$phpgw->common->phpgw_footer();
|
||||
$phpgw->common->phpgw_exit();
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -142,7 +150,7 @@
|
||||
if ( ($download == 'on') || ($o->type == 'pdb') )
|
||||
{
|
||||
// filename, default application/octet-stream, length of file, default nocache True
|
||||
$phpgw->browser->content_header($tsvfilename,'',strlen($buffer));
|
||||
$phpgw->browser->content_header($tsvfilename,'application/octet-stream',strlen($buffer));
|
||||
echo $buffer;
|
||||
}
|
||||
else
|
||||
|
@ -13,6 +13,7 @@ country addressbook en Country
|
||||
custom fields addressbook en Custom Fields
|
||||
department addressbook en Department
|
||||
export contacts addressbook en Export Contacts
|
||||
export file name addressbook en Export file name
|
||||
fax addressbook en Fax
|
||||
fields to show in address list addressbook en Fields to show in address list
|
||||
full name addressbook en Full Name
|
||||
|
Loading…
Reference in New Issue
Block a user