extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: Do not popup smime certificate dialog if the smime is not configured

Browse Source
This commit is contained in:
Hadi Nategh 2017-12-07 14:14:01 +01:00
parent 2cec97a6c5
commit 6a8ef2111a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3153,9 +3153,10 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
$structure = $this->mail_bo->getStructure($uid, $partID, $mailbox, false); $structure = $this->mail_bo->getStructure($uid, $partID, $mailbox, false);
if (($smime = $structure->getMetadata('X-EGroupware-Smime'))) if (($smime = $structure->getMetadata('X-EGroupware-Smime')))
{ {
$acc_smime = Mail\Smime::get_acc_smime($this->mail_bo->profileID);
$attachments = $this->mail_bo->getMessageAttachments($uid, $partID, $structure,true,false,true, $mailbox); $attachments = $this->mail_bo->getMessageAttachments($uid, $partID, $structure,true,false,true, $mailbox);
$push = new Api\Json\Push($GLOBALS['egw_info']['user']['account_id']); $push = new Api\Json\Push($GLOBALS['egw_info']['user']['account_id']);
if (!empty($smime['addtocontact'])) $push->call('app.mail.smime_certAddToContact', $smime); if (!empty($acc_smime) && !empty($smime['addtocontact'])) $push->call('app.mail.smime_certAddToContact', $smime);
if (is_array($attachments)) if (is_array($attachments))
{ {
$push->call('app.mail.set_smimeAttachments', $this->createAttachmentBlock($attachments, $_GET['_messageID'], $uid, $mailbox)); $push->call('app.mail.set_smimeAttachments', $this->createAttachmentBlock($attachments, $_GET['_messageID'], $uid, $mailbox));