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

Remote Synchronization (CardDAV) improvements:

Browse source 
now it supports address book url auto detection (and works with Google contacts, icloud and etc.)
This commit is contained in:
RainLoop Team 2015-05-09 02:43:56 +04:00
parent 92f2caf700
commit 1fb553e77e
249 changed files with 1338 additions and 1453 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1276,6 +1276,14 @@ class Actions
return $this->GetAccountFromCustomToken($this->getAuthToken(), $bThrowExceptionOnFalse);
}
/**
* @return bool
*/
public function IsOpen()
{
return !$this->PremProvider();
}
/**
* @param bool $bAdmin
* @param string $sAuthAccountHash = ''
@ -1349,7 +1357,7 @@ class Actions
'PremType' => false,
'Admin' => array(),
'Capa' => array(),
'AttahcmentsActions' => array(),
'AttachmentsActions' => array(),
'Plugins' => array()
);
@ -1357,17 +1365,17 @@ class Actions
{
if (!!\class_exists('ZipArchive'))
{
$aResult['AttahcmentsActions'][] = 'zip';
$aResult['AttachmentsActions'][] = 'zip';
}
if (\RainLoop\Utils::IsOwnCloudLoggedIn() && \class_exists('\\OCP\\Files'))
{
$aResult['AttahcmentsActions'][] = 'owncloud';
$aResult['AttachmentsActions'][] = 'owncloud';
}
if ($oConfig->Get('social', 'dropbox_enable', false) && 0 < \strlen(\trim($oConfig->Get('social', 'dropbox_api_key', ''))))
{
$aResult['AttahcmentsActions'][] = 'dropbox';
$aResult['AttachmentsActions'][] = 'dropbox';
}
}
@ -2833,7 +2841,7 @@ class Actions
if (\RainLoop\Utils::IsOwnCloudLoggedIn() && \class_exists('\\OCP\\Files'))
{
$sSaveFolder = $this->Config()->Get('labs', 'owncloud_save_folder', '');
if (!empty($sSaveFolder))
if (empty($sSaveFolder))
{
$sSaveFolder = 'Attachments';
}
@ -6776,6 +6784,8 @@ class Actions
$oContact->Etag = \md5($oContact->ToVCard());
}
$oContact->PopulateDisplayAndFullNameValue(true);
$bResult = $oAddressBookProvider->ContactSave($oAccount->ParentEmailHelper(), $oContact);
}