mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 07:09:20 +01:00
Add special case for correct filename in Palm_PDB export (Bug #1162859)
This commit is contained in:
parent
4e2bce12e6
commit
81f926b501
@ -238,7 +238,12 @@
|
||||
|
||||
$buffer = $this->bo->export($conv_type,$fcat_id);
|
||||
|
||||
if(($download == 'on') || ($conv_type == 'Palm_PDB'))
|
||||
if($conv_type == 'Palm_PDB')
|
||||
{
|
||||
$pdb = CreateObject('addressbook.pdb');
|
||||
$pdb->fetch($buffer, 'phpgw Contacts', $tsvfilename);
|
||||
}
|
||||
elseif($download == 'on')
|
||||
{
|
||||
// filename, default application/octet-stream, length of file, default nocache True
|
||||
$this->browser->content_header($tsvfilename,'application/x-octet-stream',strlen($buffer));
|
||||
|
@ -118,7 +118,7 @@
|
||||
{
|
||||
reset($this->ids);
|
||||
|
||||
for ($i=0;$i<count($this->ids);$i++)
|
||||
for($i=0;$i<count($this->ids);$i++)
|
||||
{
|
||||
$j = $i + 1;
|
||||
reset($this->export);
|
||||
@ -130,10 +130,7 @@
|
||||
$entries .= "\r\n";
|
||||
}
|
||||
|
||||
$buffer = $entries;
|
||||
$pdb = CreateObject('addressbook.pdb');
|
||||
$pdb->fetch($buffer, 'phpgw Contacts', 'phpgw.pdb');
|
||||
return $buffer;
|
||||
return $entries;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
Loading…
Reference in New Issue
Block a user