extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-25 15:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'EGroupware/master'

Browse Source
This commit is contained in:
Stefan Werfling 2017-07-13 22:15:40 +02:00
commit 3565f09ab0
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Mail.php
View File

@ -484,12 +484,14 @@ class Mail
{ {
$this->sessionData = array(); $this->sessionData = array();
self::$activeFolderCache = Cache::getCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10); self::$activeFolderCache = Cache::getCache(Cache::INSTANCE,'email','activeMailbox'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),60*60*10);
if (is_array(self::$activeFolderCache[$this->profileID]))
{
foreach (self::$activeFolderCache[$this->profileID] as $key => $value) foreach (self::$activeFolderCache[$this->profileID] as $key => $value)
{ {
$this->sessionData[$key] = $value; $this->sessionData[$key] = $value;
} }
} }
}
/** /**
* saveSessionData saves session data * saveSessionData saves session data

2
api/src/Mail/Smime.php
View File

@ -177,7 +177,7 @@ class Smime extends Horde_Crypt_Smime
*/ */
public function extractSignedContents($data) public function extractSignedContents($data)
{ {
return Horde_Mime_Part::parseMessage(parent::extractSignedContents($data)); return Horde_Mime_Part::parseMessage(parent::extractSignedContents($data), array('forcemime' => true));
} }
} }

2
mail/inc/class.mail_ui.inc.php
View File

@ -2384,7 +2384,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
} }
else // only encrypted message else // only encrypted message
{ {
$message_parts = Horde_Mime_Part::parseMessage($_message); $message_parts = Horde_Mime_Part::parseMessage($_message, array('forcemime' => true));
} }
if (!Mail\Smime::isSmimeSignatureOnly($params['mimeType'])) if (!Mail\Smime::isSmimeSignatureOnly($params['mimeType']))

11
mail/js/app.js
View File

@ -5748,11 +5748,22 @@ app.classes.mail = AppJS.extend(
{ {
var attachmentArea = this.et2.getWidgetById(egw(window).is_popup()?'mail_displayattachments':'previewAttachmentArea'); var attachmentArea = this.et2.getWidgetById(egw(window).is_popup()?'mail_displayattachments':'previewAttachmentArea');
var content = this.et2.getArrayMgr('content'); var content = this.et2.getArrayMgr('content');
var mailPreview = this.et2.getWidgetById('mailPreviewContainer');
if (attachmentArea && _attachments && _attachments.length > 0) if (attachmentArea && _attachments && _attachments.length > 0)
{ {
content.data[attachmentArea.id] = _attachments; content.data[attachmentArea.id] = _attachments;
this.et2.setArrayMgr('contnet', content); this.et2.setArrayMgr('contnet', content);
attachmentArea.set_value({content:_attachments}); attachmentArea.set_value({content:_attachments});
if (attachmentArea.id == 'previewAttachmentArea')
{
var a_node = attachmentArea.getDOMNode();
var m_node = mailPreview.getDOMNode();
var offset = m_node.offsetTop - a_node.offsetTop;
if (a_node.offsetTop + a_node.offsetHeight > m_node.offsetTop)
{
m_node.style.setProperty('top', m_node.offsetTop + offset+"px");
}
}
} }
}, },
/** /**