|
@@ -1877,8 +1877,9 @@ discard block |
|
|
block discarded – undo |
|
1877
|
1877
|
// Needed for S/MIME messages with embedded message attachments |
|
1878
|
1878
|
if ($parse_smime) { |
|
1879
|
1879
|
$p = mapi_getprops($message, [PR_MESSAGE_CLASS]); |
|
1880
|
|
- if ($p && stripos($p[PR_MESSAGE_CLASS], "SMIME") !== false) |
|
1881
|
|
- parse_smime($store, $message); |
|
|
1880
|
+ if ($p && stripos($p[PR_MESSAGE_CLASS], "SMIME") !== false) { |
|
|
1881
|
+ parse_smime($store, $message); |
|
|
1882
|
+ } |
|
1882
|
1883
|
} |
|
1883
|
1884
|
|
|
1884
|
1885
|
if ($message && $attach_num) { |
|
@@ -2410,10 +2411,12 @@ discard block |
|
|
block discarded – undo |
|
2410
|
2411
|
// Append body if the request action requires this |
|
2411
|
2412
|
if (isset($action['message_action'], $action['message_action']['append_body'])) { |
|
2412
|
2413
|
$bodyProps = mapi_getprops($message, [$tag]); |
|
2413
|
|
- if (isset($bodyProps[$tag]) || propIsError($tag, $bodyProps) == MAPI_E_NOT_ENOUGH_MEMORY) |
|
2414
|
|
- $bodyProps[$tag] = streamProperty($message, $tag); |
|
2415
|
|
- if (isset($action['message_action']['meetingTimeInfo'], $bodyProps[$tag])) |
|
2416
|
|
- $action['message_action']['meetingTimeInfo'] .= $bodyProps[$tag]; |
|
|
2414
|
+ if (isset($bodyProps[$tag]) || propIsError($tag, $bodyProps) == MAPI_E_NOT_ENOUGH_MEMORY) { |
|
|
2415
|
+ $bodyProps[$tag] = streamProperty($message, $tag); |
|
|
2416
|
+ } |
|
|
2417
|
+ if (isset($action['message_action']['meetingTimeInfo'], $bodyProps[$tag])) { |
|
|
2418
|
+ $action['message_action']['meetingTimeInfo'] .= $bodyProps[$tag]; |
|
|
2419
|
+ } |
|
2417
|
2420
|
} |
|
2418
|
2421
|
|
|
2419
|
2422
|
$request->setMeetingTimeInfo($action['message_action']['meetingTimeInfo'], |