extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 23:19:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert previous commit, since horde smime verification itself takes care of it with extracting email out of cert

Browse Source
This commit is contained in:
Hadi Nategh 2018-08-30 14:19:00 +02:00
parent e5bd217a77
commit 2f8ba269e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/Mail.php
View File

@ -7504,20 +7504,20 @@ class Mail
'certDetails' => $this->smime->parseCert($cert->cert),
'msg' => $cert->msg,
'certHtml' => $this->smime->certToHTML($cert->cert),
'email' => $this->smime->getEmailFromKey($cert->cert),
'email' => $cert->email,
'signed' => true
));
// check for email address if both signer email address and
// email address of sender are the same.
if (is_array($from) && strcasecmp($from[0], $metadata['email']) != 0)
if (is_array($from) && strcasecmp($from[0], $cert->email) != 0)
{
$metadata['unknownemail'] = true;
$metadata['msg'] .= ' '.lang('Email address of signer is different from the email address of sender!');
}
$AB_bo = new \addressbook_bo();
$certkey = $AB_bo->get_smime_keys($metadata['email']);
if (!is_array($certkey) || strcasecmp($certkey[$metadata['email']], $cert->cert) != 0) $metadata['addtocontact'] = true;
$certkey = $AB_bo->get_smime_keys($cert->email);
if (!is_array($certkey) || strcasecmp($certkey[$cert->email], $cert->cert) != 0) $metadata['addtocontact'] = true;
}
else // only encrypted message
{