diff --git a/package.json b/package.json index 7a6252342..27160210b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.6.5", - "release": "899", + "release": "903", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "Gruntfile.js", diff --git a/plugins/directadmin-change-password/DirectAdminChangePasswordDriver.php b/plugins/directadmin-change-password/DirectAdminChangePasswordDriver.php index ebee964a1..a52e84685 100644 --- a/plugins/directadmin-change-password/DirectAdminChangePasswordDriver.php +++ b/plugins/directadmin-change-password/DirectAdminChangePasswordDriver.php @@ -137,6 +137,13 @@ class DirectAdminChangePasswordDriver implements \RainLoop\Providers\ChangePassw } } } + else + { + if ($this->oLogger) + { + $this->oLogger->Write('DirectAdmin[Error]: Empty Response: Code:'.$iCode); + } + } } return $bResult; diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php index 1fa1c5301..21450f571 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php @@ -809,23 +809,23 @@ class Message unset($sHtmlParts, $sPlainParts, $aMatch); } - if (empty($this->sPgpSignature) && 'multipart/signed' === \strtolower($this->sContentType) && - 'application/pgp-signature' === \strtolower($oHeaders->ParameterValue( - \MailSo\Mime\Enumerations\Header::CONTENT_TYPE, - \MailSo\Mime\Enumerations\Parameter::PROTOCOL - ))) - { - $aPgpSignatureParts = $oBodyStructure ? $oBodyStructure->SearchByContentType('application/pgp-signature') : null; - if (\is_array($aPgpSignatureParts) && 0 < \count($aPgpSignatureParts) && isset($aPgpSignatureParts[0])) - { - $sPgpSignatureText = $oFetchResponse->GetFetchValue(\MailSo\Imap\Enumerations\FetchType::BODY.'['.$aPgpSignatureParts[0]->PartID().']'); - if (\is_string($sPgpSignatureText) && 0 < \strlen($sPgpSignatureText) && 0 < \strpos($sPgpSignatureText, 'BEGIN PGP SIGNATURE')) - { - $this->sPgpSignature = \trim($sPgpSignatureText); - $this->bPgpSigned = true; - } - } - } +// if (empty($this->sPgpSignature) && 'multipart/signed' === \strtolower($this->sContentType) && +// 'application/pgp-signature' === \strtolower($oHeaders->ParameterValue( +// \MailSo\Mime\Enumerations\Header::CONTENT_TYPE, +// \MailSo\Mime\Enumerations\Parameter::PROTOCOL +// ))) +// { +// $aPgpSignatureParts = $oBodyStructure ? $oBodyStructure->SearchByContentType('application/pgp-signature') : null; +// if (\is_array($aPgpSignatureParts) && 0 < \count($aPgpSignatureParts) && isset($aPgpSignatureParts[0])) +// { +// $sPgpSignatureText = $oFetchResponse->GetFetchValue(\MailSo\Imap\Enumerations\FetchType::BODY.'['.$aPgpSignatureParts[0]->PartID().']'); +// if (\is_string($sPgpSignatureText) && 0 < \strlen($sPgpSignatureText) && 0 < \strpos($sPgpSignatureText, 'BEGIN PGP SIGNATURE')) +// { +// $this->sPgpSignature = \trim($sPgpSignatureText); +// $this->bPgpSigned = true; +// } +// } +// } if ($oBodyStructure) {