mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-12-27 01:28:56 +08:00
Cleanup DoPgpVerifyMessage action param handling
This commit is contained in:
parent
5a2d2fd0e5
commit
3d168b4688
1 changed files with 2 additions and 3 deletions
|
@ -297,16 +297,15 @@ trait Pgp
|
||||||
*/
|
*/
|
||||||
public function DoPgpVerifyMessage() : array
|
public function DoPgpVerifyMessage() : array
|
||||||
{
|
{
|
||||||
$sFolderName = $this->GetActionParam('folder', '');
|
|
||||||
$iUid = (int) $this->GetActionParam('uid', 0);
|
|
||||||
$sBodyPart = $this->GetActionParam('bodyPart', '');
|
$sBodyPart = $this->GetActionParam('bodyPart', '');
|
||||||
$sSigPart = $this->GetActionParam('sigPart', '');
|
|
||||||
if ($sBodyPart) {
|
if ($sBodyPart) {
|
||||||
$result = [
|
$result = [
|
||||||
'text' => \preg_replace('/\\r?\\n/su', "\r\n", $sBodyPart),
|
'text' => \preg_replace('/\\r?\\n/su', "\r\n", $sBodyPart),
|
||||||
'signature' => $this->GetActionParam('sigPart', '')
|
'signature' => $this->GetActionParam('sigPart', '')
|
||||||
];
|
];
|
||||||
} else {
|
} else {
|
||||||
|
$sFolderName = $this->GetActionParam('folder', '');
|
||||||
|
$iUid = (int) $this->GetActionParam('uid', 0);
|
||||||
$sBodyPartId = $this->GetActionParam('bodyPartId', '');
|
$sBodyPartId = $this->GetActionParam('bodyPartId', '');
|
||||||
$sSigPartId = $this->GetActionParam('sigPartId', '');
|
$sSigPartId = $this->GetActionParam('sigPartId', '');
|
||||||
// $sMicAlg = $this->GetActionParam('micAlg', '');
|
// $sMicAlg = $this->GetActionParam('micAlg', '');
|
||||||
|
|
Loading…
Reference in a new issue