Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F149652
smimepatch.patch
rbrunhuber (R. Brunhuber)
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Authored By
rbrunhuber
Apr 27 2016, 9:11 PM
2016-04-27 21:11:46 (UTC+2)
Size
1 KB
Referenced Files
None
Subscribers
None
smimepatch.patch
View Options
diff --git a/lib/ext/Syncroton/Command/ItemOperations.php b/lib/ext/Syncroton/Command/ItemOperations.php
index 20401ba..c9b08dc 100644
--- a/lib/ext/Syncroton/Command/ItemOperations.php
+++ b/lib/ext/Syncroton/Command/ItemOperations.php
@@ -251,7 +251,11 @@ class Syncroton_Command_ItemOperations extends Syncroton_Command_Wbxml
}
}
}
-
+
+ if(isset($fetch->Options->MIMESupport)){
+ $fetchArray['options']['mimeSupport']=(int)$fetch->Options->MIMESupport;
+ }
+
if (isset($airSyncBase->Range)) {
$fetchArray['options']['range'] = (string) $airSyncBase->Range;
}
diff --git a/lib/kolab_sync_data_email.php b/lib/kolab_sync_data_email.php
index eeb3c75..573ea69 100644
--- a/lib/kolab_sync_data_email.php
+++ b/lib/kolab_sync_data_email.php
@@ -319,8 +319,15 @@ class kolab_sync_data_email extends kolab_sync_data implements Syncroton_Data_ID
$result['nativeBodyType'] = $message->has_html_part() ? 2 : 1;
// Message class
- // @TODO: add messageClass suffix for encrypted messages
- $result['messageClass'] = 'IPM.Note';
+ if($headers->ctype == 'multipart/signed'){
+ $result['messageClass'] = 'IPM.Note.SMIME.MultipartSigned';
+ }
+ elseif($headers->ctype == 'application/pkcs7-mime' || $headers->ctype == 'application/x-pkcs7-mime'){
+ $result['messageClass'] = 'IPM.Note.SMIME';
+ }
+ else{
+ $result['messageClass'] = 'IPM.Note';
+ }
$result['contentClass'] = 'urn:content-classes:message';
// Categories (Tags)
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
140446
Default Alt Text
smimepatch.patch (1 KB)
Attached To
Mode
T1229: Fix S/MIME handling in syncroton
Attached
Detach File
Event Timeline
Log In to Comment