the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-09-10 23:24:15 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'the-djmaze:master' into fix-ru-lang

Browse source
This commit is contained in:
Roman Chutchev 2025-03-11 22:37:35 +02:00 • committed by GitHub
commit 1c9c9f0d6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integrations/nextcloud/snappymail/appinfo/info.xml
View file

@ -64,7 +64,7 @@ There, click on the link to go to the SnappyMail admin panel.
<lib>xxtea</lib> <lib>xxtea</lib>
<lib>zip</lib> <lib>zip</lib>
--> -->
<nextcloud min-version="20" max-version="30" /> <nextcloud min-version="20" max-version="32" />
</dependencies> </dependencies>
<settings> <settings>
<admin>OCA\SnappyMail\Settings\AdminSettings</admin> <admin>OCA\SnappyMail\Settings\AdminSettings</admin>

6
plugins/avatars/index.php
View file

@ -10,8 +10,8 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
NAME = 'Avatars', NAME = 'Avatars',
AUTHOR = 'SnappyMail', AUTHOR = 'SnappyMail',
URL = 'https://snappymail.eu/', URL = 'https://snappymail.eu/',
VERSION = '1.21', VERSION = '1.22',
RELEASE = '2024-10-28', RELEASE = '2025-03-10',
REQUIRED = '2.33.0', REQUIRED = '2.33.0',
CATEGORY = 'Contacts', CATEGORY = 'Contacts',
LICENSE = 'MIT', LICENSE = 'MIT',
@ -273,7 +273,7 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
} }
if ($this->Config()->Get('plugin', 'gravatar', false)) { 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) { foreach ($aUrls as $sUrl) {

6
snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
View file

@ -42,6 +42,12 @@ abstract class Api
$CSP->report = $oConfig->Get('security', 'csp_report', false); $CSP->report = $oConfig->Get('security', 'csp_report', false);
$CSP->report_only = $oConfig->Get('debug', 'enable', false); // || SNAPPYMAIL_DEV $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 // Allow https: due to remote images in e-mails or use proxy
if (!$oConfig->Get('labs', 'use_local_proxy_for_external_images', '')) { if (!$oConfig->Get('labs', 'use_local_proxy_for_external_images', '')) {
$CSP->add('img-src', 'https:'); $CSP->add('img-src', 'https:');

17
snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php
View file

@ -43,15 +43,18 @@ abstract class MimeType
\fclose($fp); \fclose($fp);
} }
if ('application/zip' === \str_replace('/x-', '/', $mime)) { if ('application/zip' === \str_replace('/x-', '/', $mime)) {
$zip = new \ZipArchive(); if (\class_exists('ZipArchive')) {
if ($zip->open($filename, \ZIPARCHIVE::RDONLY)) { $zip = new \ZipArchive();
if (false !== $zip->locateName('word/_rels/document.xml.rels')) { if ($zip->open($filename, \ZIPARCHIVE::RDONLY)) {
return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; 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 (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; return $mime ? static::detectDeeper($mime, $name ?: $filename) : null;

2
snappymail/v/0.0.0/app/localization/de/user.json
View file

@ -607,7 +607,7 @@
"NOTIFICATIONS": { "NOTIFICATIONS": {
"RequestError": "Anfrage fehlgeschlagen", "RequestError": "Anfrage fehlgeschlagen",
"RequestAborted": "Anfrage abgebrochen", "RequestAborted": "Anfrage abgebrochen",
"RequestTimeout": "Antrag auf Auslieferung", "RequestTimeout": "Zeitüberschreitung der Anfrage",
"InvalidToken": "Ungültiger Token", "InvalidToken": "Ungültiger Token",
"AuthError": "Authentifizierung fehlgeschlagen", "AuthError": "Authentifizierung fehlgeschlagen",
"ConnectionError": "Serververbindung kann nicht hergestellt werden", "ConnectionError": "Serververbindung kann nicht hergestellt werden",