Add special case for correct filename in Palm_PDB export (Bug #1162859)

This commit is contained in:
Miles Lott 2005-03-24 13:29:51 +00:00
parent 4e2bce12e6
commit 81f926b501
2 changed files with 8 additions and 6 deletions

View File

@ -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));

View File

@ -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;
}
}
?>