diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
index 5d29d8bd0..7d4e706ae 100644
--- a/rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
+++ b/rainloop/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
@@ -140,8 +140,8 @@ class HeaderCollection extends \MailSo\Base\Collection
$aResult = $this->FilterList(function ($oHeader) use ($sHeaderName) {
return $oHeader && \strtolower($oHeader->Name()) !== \strtolower($sHeaderName);
});
-
- return $this->SetAsArray($aResult);
+ $this->SetAsArray($aResult);
+ return $this;
}
/**
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index 00a52c7d9..43c8159f5 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -5376,7 +5376,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
* @throws \MailSo\Net\Exceptions\ConnectionException
*/
private function smtpSendMessage(\RainLoop\Model\Account $oAccount, \MailSo\Mime\Message $oMessage,
- resource &$rMessageStream, int &$iMessageStreamSize, bool $bDsn = false, bool $bAddHiddenRcpt = true)
+ /*resource*/ &$rMessageStream, int &$iMessageStreamSize, bool $bDsn = false, bool $bAddHiddenRcpt = true)
{
$oRcpt = $oMessage->GetRcpt();
if ($oRcpt && 0 < $oRcpt->Count())
@@ -6958,7 +6958,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
return $this->DefaultResponse(__FUNCTION__, $mResponse);
}
- private function importContactsFromCsvFile(\RainLoop\Model\Account $oAccount, resource $rFile, string $sFileStart) : int
+ private function importContactsFromCsvFile(\RainLoop\Model\Account $oAccount, /*resource*/ $rFile, string $sFileStart) : int
{
$iCount = 0;
$aHeaders = null;
@@ -7011,7 +7011,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack
return $iCount;
}
- private function importContactsFromVcfFile(\RainLoop\Model\Account $oAccount, resource $rFile) : int
+ private function importContactsFromVcfFile(\RainLoop\Model\Account $oAccount, /*resource*/ $rFile) : int
{
$iCount = 0;
if ($oAccount && \is_resource($rFile))
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php
index def3ed379..db6a95752 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files.php
@@ -14,7 +14,7 @@ class Files extends \RainLoop\Providers\AbstractProvider
$this->oDriver = $oDriver;
}
- public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, resource $rSource) : bool
+ public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource) : bool
{
return $this->oDriver->PutFile($oAccount, $sKey, $rSource);
}
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
index ab4e516b2..535440c8f 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
@@ -25,7 +25,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
return $this->generateFullFileName($oAccount, $sKey, true);
}
- public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, resource $rSource) : bool
+ public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource) : bool
{
$bResult = false;
if ($rSource)
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php
index 53b97a7af..1706cd5f8 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Files/IFiles.php
@@ -6,7 +6,7 @@ interface IFiles
{
public function GenerateLocalFullFileName(\RainLoop\Model\Account $oAccount, string $sKey) : string;
- public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, resource $rSource) : bool;
+ public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource) : bool;
public function MoveUploadedFile(\RainLoop\Model\Account $oAccount, string $sKey, string $sSource) : bool;
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index 3827d68b8..2414830b8 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -172,7 +172,7 @@ class ServiceActions
{
error_log($oException->getMessage());
if ($e = $oException->getPrevious()) {
- error_log("\t".$e->getMessage());
+ error_log("\t{$e->getMessage()} @ {$e->getFile()}#{$e->getLine()}");
}
$aResponseItem = $this->oActions->ExceptionResponse(
diff --git a/rainloop/v/0.0.0/app/templates/Index.html b/rainloop/v/0.0.0/app/templates/Index.html
index 796cdad1f..8c6a3af89 100644
--- a/rainloop/v/0.0.0/app/templates/Index.html
+++ b/rainloop/v/0.0.0/app/templates/Index.html
@@ -14,7 +14,9 @@
+
{{BaseContentSecurityPolicy}}
{{BaseAppHeadScriptLink}}
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index d1155c916..ab9f7a383 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -174,8 +174,7 @@