Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small changes

Browse source
This commit is contained in:
RainLoop Team 2014-04-18 22:56:57 +04:00
parent 57355f2e8a
commit 70f58dca91
3 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop", "name": "RainLoop",
"title": "RainLoop Webmail", "title": "RainLoop Webmail",
"version": "1.6.5", "version": "1.6.5",
"release": "899", "release": "903",
"description": "Simple, modern & fast web-based email client", "description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net", "homepage": "http://rainloop.net",
"main": "Gruntfile.js", "main": "Gruntfile.js",

7
plugins/directadmin-change-password/DirectAdminChangePasswordDriver.php
View file

@ -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; return $bResult;

34
rainloop/v/0.0.0/app/libraries/MailSo/Mail/Message.php
View file

@ -809,23 +809,23 @@ class Message
unset($sHtmlParts, $sPlainParts, $aMatch); unset($sHtmlParts, $sPlainParts, $aMatch);
} }
if (empty($this->sPgpSignature) && 'multipart/signed' === \strtolower($this->sContentType) && // if (empty($this->sPgpSignature) && 'multipart/signed' === \strtolower($this->sContentType) &&
'application/pgp-signature' === \strtolower($oHeaders->ParameterValue( // 'application/pgp-signature' === \strtolower($oHeaders->ParameterValue(
\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, // \MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
\MailSo\Mime\Enumerations\Parameter::PROTOCOL // \MailSo\Mime\Enumerations\Parameter::PROTOCOL
))) // )))
{ // {
$aPgpSignatureParts = $oBodyStructure ? $oBodyStructure->SearchByContentType('application/pgp-signature') : null; // $aPgpSignatureParts = $oBodyStructure ? $oBodyStructure->SearchByContentType('application/pgp-signature') : null;
if (\is_array($aPgpSignatureParts) && 0 < \count($aPgpSignatureParts) && isset($aPgpSignatureParts[0])) // if (\is_array($aPgpSignatureParts) && 0 < \count($aPgpSignatureParts) && isset($aPgpSignatureParts[0]))
{ // {
$sPgpSignatureText = $oFetchResponse->GetFetchValue(\MailSo\Imap\Enumerations\FetchType::BODY.'['.$aPgpSignatureParts[0]->PartID().']'); // $sPgpSignatureText = $oFetchResponse->GetFetchValue(\MailSo\Imap\Enumerations\FetchType::BODY.'['.$aPgpSignatureParts[0]->PartID().']');
if (\is_string($sPgpSignatureText) && 0 < \strlen($sPgpSignatureText) && 0 < \strpos($sPgpSignatureText, 'BEGIN PGP SIGNATURE')) // if (\is_string($sPgpSignatureText) && 0 < \strlen($sPgpSignatureText) && 0 < \strpos($sPgpSignatureText, 'BEGIN PGP SIGNATURE'))
{ // {
$this->sPgpSignature = \trim($sPgpSignatureText); // $this->sPgpSignature = \trim($sPgpSignatureText);
$this->bPgpSigned = true; // $this->bPgpSigned = true;
} // }
} // }
} // }
if ($oBodyStructure) if ($oBodyStructure)
{ {