extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that the smime is configured before pre-setting the sign/encrypt actions

Browse Source
This commit is contained in:
Hadi Nategh 2017-09-08 14:24:55 +02:00
parent bebf9d74cc
commit 38c227817b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mail/inc/class.mail_compose.inc.php
View File

@ -324,12 +324,15 @@ class mail_compose
// Additionally may be changed // Additionally may be changed
$_focusElement, $suppressSigOnTop, $isReply $_focusElement, $suppressSigOnTop, $isReply
)); ));
if (isset($_GET['smime_type'])) $smime_type = $_GET['smime_type']; if (Mail\Smime::get_acc_smime($this->mail_bo->profileID))
// pre set smime_sign and smime_encrypt actions if the original {
// message is smime. if (isset($_GET['smime_type'])) $smime_type = $_GET['smime_type'];
$_content['smime_sign'] = $smime_type == (Mail\Smime::TYPE_SIGN || // pre set smime_sign and smime_encrypt actions if the original
// message is smime.
$_content['smime_sign'] = $smime_type == (Mail\Smime::TYPE_SIGN ||
$smime_type == Mail\Smime::TYPE_SIGN_ENCRYPT) ? 'on' : 'off'; $smime_type == Mail\Smime::TYPE_SIGN_ENCRYPT) ? 'on' : 'off';
$_content['smime_encrypt'] = ($smime_type == Mail\Smime::TYPE_ENCRYPT) ? 'on' : 'off'; $_content['smime_encrypt'] = ($smime_type == Mail\Smime::TYPE_ENCRYPT) ? 'on' : 'off';
}
$actionToProcess = $_GET['from']; $actionToProcess = $_GET['from'];
unset($_GET['from']); unset($_GET['from']);