From 1660c62aa38e6aa19b4e0430fe0cc557f2a868df Mon Sep 17 00:00:00 2001 From: Felix Eckhofer Date: Wed, 8 Jan 2025 13:36:48 +0100 Subject: [PATCH 1/6] Fix incorrect German translation --- snappymail/v/0.0.0/app/localization/de/user.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snappymail/v/0.0.0/app/localization/de/user.json b/snappymail/v/0.0.0/app/localization/de/user.json index fcc16a687..4cf3f626a 100644 --- a/snappymail/v/0.0.0/app/localization/de/user.json +++ b/snappymail/v/0.0.0/app/localization/de/user.json @@ -607,7 +607,7 @@ "NOTIFICATIONS": { "RequestError": "Anfrage fehlgeschlagen", "RequestAborted": "Anfrage abgebrochen", - "RequestTimeout": "Antrag auf Auslieferung", + "RequestTimeout": "Zeitüberschreitung der Anfrage", "InvalidToken": "Ungültiger Token", "AuthError": "Authentifizierung fehlgeschlagen", "ConnectionError": "Serververbindung kann nicht hergestellt werden", From 5bba3dac82744843f74c3756bb069f0be0734ff6 Mon Sep 17 00:00:00 2001 From: HeySora Date: Tue, 14 Jan 2025 13:27:26 +0100 Subject: [PATCH 2/6] Automatically add favicon host to CSP if present --- snappymail/v/0.0.0/app/libraries/RainLoop/Api.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php index f73d0017e..685821507 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php @@ -42,6 +42,12 @@ abstract class Api $CSP->report = $oConfig->Get('security', 'csp_report', false); $CSP->report_only = $oConfig->Get('debug', 'enable', false); // || SNAPPYMAIL_DEV + // Allow favicon host, if present + $parsedFaviconUrl = parse_url($oConfig->Get('webmail', 'favicon_url', '')); + if (is_array($parsedFaviconUrl) && array_key_exists('host', $parsedFaviconUrl)) { + $CSP->add('img-src', $parsedFaviconUrl['host']); + } + // Allow https: due to remote images in e-mails or use proxy if (!$oConfig->Get('labs', 'use_local_proxy_for_external_images', '')) { $CSP->add('img-src', 'https:'); From 2741762199b159692e2e2fb002807a6a42f7cd4c Mon Sep 17 00:00:00 2001 From: TomsProject <44722363+TomsProject@users.noreply.github.com> Date: Sat, 22 Feb 2025 18:32:21 +0800 Subject: [PATCH 3/6] Changing hashing algorithm to sha256 --- plugins/avatars/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php index 5e66ed3e5..f66b1cfcf 100644 --- a/plugins/avatars/index.php +++ b/plugins/avatars/index.php @@ -273,7 +273,7 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin } if ($this->Config()->Get('plugin', 'gravatar', false)) { - $aUrls[] = 'https://gravatar.com/avatar/'.\md5(\strtolower($sAsciiEmail)).'?s=80&d=404'; + $aUrls[] = 'https://gravatar.com/avatar/'.\hash('sha256', \strtolower($sAsciiEmail)).'?s=80&d=404'; } foreach ($aUrls as $sUrl) { From 70aebb498188e29e098176e47b7c31c03fc9d20f Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 10 Mar 2025 15:48:11 +0100 Subject: [PATCH 4/6] Resolve #1930 --- integrations/nextcloud/snappymail/appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index 1ebad7ac1..d73ef28a0 100644 --- a/integrations/nextcloud/snappymail/appinfo/info.xml +++ b/integrations/nextcloud/snappymail/appinfo/info.xml @@ -64,7 +64,7 @@ There, click on the link to go to the SnappyMail admin panel. xxtea zip --> - + OCA\SnappyMail\Settings\AdminSettings From 45c8f71af065b2ee7ab4752a882b4ececd1b6340 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 10 Mar 2025 16:14:33 +0100 Subject: [PATCH 5/6] Resolve #1883 --- .../app/libraries/snappymail/file/mimetype.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php index 6156145da..7fc04b9af 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php @@ -43,15 +43,18 @@ abstract class MimeType \fclose($fp); } if ('application/zip' === \str_replace('/x-', '/', $mime)) { - $zip = new \ZipArchive(); - if ($zip->open($filename, \ZIPARCHIVE::RDONLY)) { - if (false !== $zip->locateName('word/_rels/document.xml.rels')) { - return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; - } - if (false !== $zip->locateName('xl/_rels/workbook.xml.rels')) { - return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; + if (\class_exists('ZipArchive')) { + $zip = new \ZipArchive(); + if ($zip->open($filename, \ZIPARCHIVE::RDONLY)) { + if (false !== $zip->locateName('word/_rels/document.xml.rels')) { + return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; + } + if (false !== $zip->locateName('xl/_rels/workbook.xml.rels')) { + return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; + } } } + $mime = \str_replace('/x-', '/', $mime); } } return $mime ? static::detectDeeper($mime, $name ?: $filename) : null; From 33fbaa9598e9760c8cf7a82f11d607bc6eb19731 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 10 Mar 2025 16:35:27 +0100 Subject: [PATCH 6/6] Bump version for #1918 --- plugins/avatars/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php index f66b1cfcf..417fdfd1b 100644 --- a/plugins/avatars/index.php +++ b/plugins/avatars/index.php @@ -10,8 +10,8 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin NAME = 'Avatars', AUTHOR = 'SnappyMail', URL = 'https://snappymail.eu/', - VERSION = '1.21', - RELEASE = '2024-10-28', + VERSION = '1.22', + RELEASE = '2025-03-10', REQUIRED = '2.33.0', CATEGORY = 'Contacts', LICENSE = 'MIT',