extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 14:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix smime messages stop activesync

Browse Source
This commit is contained in:
Hadi Nategh 2018-12-04 19:16:05 +01:00
parent bcad96862b
commit aa3a9e4987
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Mail.php
View File

@ -5652,7 +5652,7 @@ class Mail
{ {
$structure = $mail->getStructure(); $structure = $mail->getStructure();
$isSmime = Mail\Smime::isSmime(($mimeType = $structure->getType())) || Mail\Smime::isSmime(($protocol=$structure->getContentTypeParameter('protocol'))); $isSmime = Mail\Smime::isSmime(($mimeType = $structure->getType())) || Mail\Smime::isSmime(($protocol=$structure->getContentTypeParameter('protocol')));
if ($isSmime) if ($isSmime && !class_exists('mail_zpush', false))
{ {
return $this->resolveSmimeMessage($structure, array( return $this->resolveSmimeMessage($structure, array(
'uid' => $_uid, 'uid' => $_uid,
@ -5968,8 +5968,8 @@ class Mail
if ($_partID != '') if ($_partID != '')
{ {
$mailStructureObject = $_headerObject->getStructure(); $mailStructureObject = $_headerObject->getStructure();
if (Mail\Smime::isSmime(($mimeType = $mailStructureObject->getType())) || if (!class_exists('mail_zpush', false) && (Mail\Smime::isSmime(($mimeType = $mailStructureObject->getType())) ||
Mail\Smime::isSmime(($protocol=$mailStructureObject->getContentTypeParameter('protocol')))) Mail\Smime::isSmime(($protocol=$mailStructureObject->getContentTypeParameter('protocol')))))
{ {
$mailStructureObject = $this->resolveSmimeMessage($mailStructureObject, array( $mailStructureObject = $this->resolveSmimeMessage($mailStructureObject, array(
'uid' => $_uid, 'uid' => $_uid,