the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-11-11 01:23:43 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2080 from fdisamuel/master

Browse source 
Google Document viewer and Managesieve Fixes
This commit is contained in:
RainLoop Team 2021-04-22 19:02:15 +03:00 committed by GitHub
commit 6a615c5d65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rainloop/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
View file

@ -113,7 +113,7 @@ class ManageSieveClient extends \MailSo\Net\NetClient
*/
public function Connect($sServerName, $iPort,
$iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT,
$bVerifySsl = false, $bAllowSelfSigned = true)
$bVerifySsl = false, $bAllowSelfSigned = true, $sClientCert = '')
{
$this->iRequestTime = \microtime(true);

2
rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -506,7 +506,7 @@ class ServiceActions
if (\method_exists($this->oActions, $sMethodName))
{
@\header('X-Raw-Action: '.$sMethodName, true);
@\header('Content-Security-Policy: script-src \'none\'; child-src \'none\'', true);
@\header('Content-Security-Policy: script-src \'none\'; child-src \'none\' docs.google.com apis.google.com', true);
$sRawError = '';
$this->oActions->SetActionParams(array(