This commit is contained in:
the-djmaze 2022-10-21 12:48:33 +02:00
parent cbafa55450
commit bcf63b6700
11 changed files with 40 additions and 36 deletions

View file

@ -290,5 +290,5 @@ dev_email = ""
dev_password = ""
[version]
current = "2.18.6"
current = "2.19.2"
saved = "Fri, 30 Sep 2022 12:34:56 +0000"

View file

@ -37,4 +37,7 @@ $nc_tar->compress(Phar::GZ);
unlink($nc_destination);
$nc_destination .= '.gz';
$signature = shell_exec("openssl dgst -sha512 -sign ~/.nextcloud/certificates/snappymail.key {$nc_destination} | openssl base64");
file_put_contents($nc_destination.'.sig', $signature);
echo "{$nc_destination} created\n";

View file

@ -291,28 +291,7 @@ export const
if ('IMG' === name) {
oElement.loading = 'lazy';
let attachment;
if (detectHiddenImages
&& ((oStyle.maxHeight && 3 > pInt(oStyle.maxHeight))
|| (oStyle.maxWidth && 3 > pInt(oStyle.maxWidth))
|| [
'email.microsoftemail.com/open',
'github.com/notifications/beacon/',
'/track/open', // mandrillapp.com list-manage.com
'google-analytics.com'
].filter(uri => value.toLowerCase().includes(uri)).length
)) {
skipStyle = true;
setAttribute('style', 'display:none');
setAttribute('data-x-src-hidden', value);
}
else if ((attachment = findLocationByCid(value)))
{
if (attachment.download) {
oElement.src = attachment.linkPreview();
attachment.isLinked(true);
}
}
else if ('cid:' === value.slice(0, 4))
if ('cid:' === value.slice(0, 4))
{
value = value.slice(4);
setAttribute('data-x-src-cid', value);
@ -324,6 +303,28 @@ export const
attachment.isLinked(true);
}
}
else if ((attachment = findLocationByCid(value)))
{
if (attachment.download) {
oElement.src = attachment.linkPreview();
attachment.isLinked(true);
}
}
else if (detectHiddenImages
&& ((oStyle.maxHeight && 3 > pInt(oStyle.maxHeight)) // TODO: issue with 'in'
|| (oStyle.maxWidth && 3 > pInt(oStyle.maxWidth)) // TODO: issue with 'in'
|| [
'email.microsoftemail.com/open',
'github.com/notifications/beacon/',
'/track/open', // mandrillapp.com list-manage.com
'google-analytics.com'
].filter(uri => value.toLowerCase().includes(uri)).length
)) {
skipStyle = true;
oStyle.display = 'none';
// setAttribute('style', 'display:none');
setAttribute('data-x-src-hidden', value);
}
else if (httpre.test(value))
{
setAttribute('data-x-src', value);

View file

@ -400,6 +400,7 @@ html.rl-no-preview-pane {
img[data-x-src]:not([src])::after {
content: "🖼";
font-family: snappymail;
line-height: 1;
position: absolute;
top: 0;
left: 0;
@ -411,7 +412,6 @@ html.rl-no-preview-pane {
font-family: var(--fontSans);
font-size: 11px;
height: auto;
line-height: 1;
transform: translate(-25%,0);
width: auto;
width: -moz-fit-content;

View file

@ -1,4 +1,4 @@
This app packages SnappyMail <upstream>2.18.6</upstream>.
This app packages SnappyMail <upstream>2.19.2</upstream>.
SnappyMail is a simple, modern, lightweight & fast web-based email client.

View file

@ -4,7 +4,7 @@ RUN mkdir -p /app/code
WORKDIR /app/code
# If you change the extraction below, be sure to test on scaleway
VERSION=2.18.6
VERSION=2.19.2
RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
unzip /tmp/snappymail.zip -d /app/code && \
rm /tmp/snappymail.zip && \

View file

@ -3,7 +3,7 @@
<id>snappymail</id>
<name>SnappyMail</name>
<summary>SnappyMail Webmail</summary>
<version>2.19.1</version>
<version>2.19.2</version>
<licence>agpl</licence>
<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
<description><![CDATA[**Simple, modern, lightweight & fast web-based email client.**

View file

@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
# script_snappymail_versions()
sub script_snappymail_versions
{
return ( "2.18.6" );
return ( "2.19.2" );
}
sub script_snappymail_version_desc

View file

@ -3,7 +3,7 @@
"title": "SnappyMail",
"description": "Simple, modern & fast web-based email client",
"private": true,
"version": "2.18.6",
"version": "2.19.2",
"homepage": "https://snappymail.eu",
"author": {
"name": "DJ Maze",

View file

@ -5,7 +5,7 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
const
NAME = 'Nextcloud',
VERSION = '2.6',
RELEASE = '2022-10-19',
RELEASE = '2022-10-21',
CATEGORY = 'Integrations',
DESCRIPTION = 'Integrate with Nextcloud v20+',
REQUIRED = '2.19.0';

View file

@ -32,32 +32,32 @@ class ServiceActions
$this->sQuery = '';
}
public function Logger() : \MailSo\Log\Logger
private function Logger() : \MailSo\Log\Logger
{
return $this->oActions->Logger();
}
public function Plugins() : Plugins\Manager
private function Plugins() : Plugins\Manager
{
return $this->oActions->Plugins();
}
public function Config() : Config\Application
private function Config() : Config\Application
{
return $this->oActions->Config();
}
public function Cacher() : \MailSo\Cache\CacheClient
private function Cacher() : \MailSo\Cache\CacheClient
{
return $this->oActions->Cacher();
}
public function StorageProvider() : Providers\Storage
private function StorageProvider() : Providers\Storage
{
return $this->oActions->StorageProvider();
}
public function SettingsProvider() : Providers\Settings
private function SettingsProvider() : Providers\Settings
{
return $this->oActions->SettingsProvider();
}