From 6be743628fa2d75fbc271f5596dc0f9c96720315 Mon Sep 17 00:00:00 2001 From: hadi Date: Thu, 27 Apr 2023 13:54:40 +0200 Subject: [PATCH] Fix smime signed messages contain text/calender no longer are processed as event --- mail/inc/class.mail_ui.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 1356d29f8c..bd5500f64d 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -3308,11 +3308,11 @@ $filter['before']= date("d-M-Y", $cutoffdate2); $bodyParts = $this->mail_bo->getMessageBody($uid, ($htmlOptions?$htmlOptions:''), $partID, $structure, false, $mailbox, $calendar_part); // for meeting requests (multipart alternative with text/calendar part) let calendar render it - if ($calendar_part && isset($GLOBALS['egw_info']['user']['apps']['calendar']) && empty($smime)) + if ($calendar_part && isset($GLOBALS['egw_info']['user']['apps']['calendar'])) { $charset = $calendar_part->getContentTypeParameter('charset'); // Do not try to fetch raw part content if it's smime signed message - $this->mail_bo->fetchPartContents($uid, $calendar_part); + if (empty($smime)) $this->mail_bo->fetchPartContents($uid, $calendar_part); $headers = $this->mail_bo->getHeaders($mailbox, 0, 1, '', false, null, $uid); Api\Cache::setSession('calendar', 'ical', array( 'charset' => $charset ?: 'utf-8',