Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 17:07:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: Export contacts failed

Browse source
This commit is contained in:
the-djmaze 2022-05-18 23:43:29 +02:00
parent 33f0e6febf
commit 01e5916bf3
2 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
View file

@ -297,10 +297,11 @@ trait Contacts
\header('Accept-Ranges: none'); \header('Accept-Ranges: none');
\header('Content-Transfer-Encoding: binary'); \header('Content-Transfer-Encoding: binary');
$this->oHttp->ServerNoCache(); $this->Http()->ServerNoCache();
return $this->AddressBookProvider($oAccount)->IsActive() ? $oAddressBookProvider = $this->AddressBookProvider($oAccount);
$this->AddressBookProvider($oAccount)->Export($this->GetMainEmail($oAccount), 'vcf') : false; return $oAddressBookProvider->IsActive() ?
$oAddressBookProvider->Export($this->GetMainEmail($oAccount), 'vcf') : false;
} }
public function RawContactsCsv() : bool public function RawContactsCsv() : bool
@ -312,10 +313,11 @@ trait Contacts
\header('Accept-Ranges: none'); \header('Accept-Ranges: none');
\header('Content-Transfer-Encoding: binary'); \header('Content-Transfer-Encoding: binary');
$this->oHttp->ServerNoCache(); $this->Http()->ServerNoCache();
return $this->AddressBookProvider($oAccount)->IsActive() ? $oAddressBookProvider = $this->AddressBookProvider($oAccount);
$this->AddressBookProvider($oAccount)->Export($this->GetMainEmail($oAccount), 'csv') : false; return $oAddressBookProvider->IsActive() ?
$oAddressBookProvider->Export($this->GetMainEmail($oAccount), 'csv') : false;
} }
private function importContactsFromVcfFile(\RainLoop\Model\Account $oAccount, /*resource*/ $rFile): int private function importContactsFromVcfFile(\RainLoop\Model\Account $oAccount, /*resource*/ $rFile): int

7
snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -394,8 +394,9 @@ class ServiceActions
try try
{ {
$sRawError = 'Invalid action'; $sRawError = 'Invalid action';
if (0 !== \strlen($sAction)) if (\strlen($sAction))
{ {
try {
$sMethodName = 'Raw'.$sAction; $sMethodName = 'Raw'.$sAction;
if (\method_exists($this->oActions, $sMethodName)) if (\method_exists($this->oActions, $sMethodName))
{ {
@ -417,6 +418,10 @@ class ServiceActions
{ {
$sRawError = 'Unknown action "'.$sAction.'"'; $sRawError = 'Unknown action "'.$sAction.'"';
} }
} catch (\Throwable $e) {
// error_log(print_r($e,1));
$sRawError = $e->getMessage();
}
} }
else else
{ {