From a0deddd4e2aba15bab0b5cc0513b328dd353654a Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 4 Mar 2022 10:12:39 +0100
Subject: [PATCH] v2.3.2
---
.../files/usr/local/include/application.ini | 38 ++++++++++++-------
README.md | 30 +++++++--------
integrations/cloudron/DESCRIPTION.md | 2 +-
integrations/cloudron/Dockerfile | 2 +-
integrations/nextcloud/snappymail/VERSION | 2 +-
.../nextcloud/snappymail/appinfo/info.xml | 2 +-
integrations/virtualmin/snappymail.pl | 2 +-
package.json | 2 +-
8 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index abeb228bf..a66d68150 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -30,6 +30,9 @@ allow_additional_identities = On
; Number of messages displayed on page by default
messages_per_page = 20
+; Mark message read after N seconds
+message_read_delay = 5
+
; File size limit (MB) for file upload on compose screen
; 0 for unlimited.
attachment_size_limit = 2
@@ -68,6 +71,8 @@ hide_x_mailer_header = On
admin_panel_host = ""
admin_panel_key = "admin"
content_security_policy = ""
+csp_report = Off
+encrypt_cipher = "aes-256-cbc-hmac-sha1"
[ssl]
; Require verification of SSL certificate used.
@@ -86,18 +91,12 @@ capath = ""
client_cert = ""
[capa]
-composer = On
contacts = On
-settings = On
quota = On
-help = On
-reload = On
search = On
search_adv = On
-x-templates = Off
dangerous_actions = On
message_actions = On
-messagelist_actions = On
attachments_actions = On
[login]
@@ -134,6 +133,7 @@ view_editor_type = "Html"
view_layout = 1
view_use_checkboxes = On
autologout = 30
+view_html = On
show_images = Off
contacts_autosave = On
mail_use_threads = Off
@@ -144,6 +144,17 @@ mail_reply_same_folder = Off
; Enable logging
enable = Off
+; Log messages of set RFC 5424 section 6.2.1 Severity level and higher (0 = highest, 7 = lowest).
+; 0 = Emergency
+; 1 = Alert
+; 2 = Critical
+; 3 = Error
+; 4 = Warning
+; 5 = Notice
+; 6 = Informational
+; 7 = Debug
+level = 4
+
; Logs entire request only if error occured (php requred)
write_on_error_only = Off
@@ -193,6 +204,9 @@ auth_logging = Off
auth_logging_filename = "fail2ban/auth-{date:Y-m-d}.txt"
auth_logging_format = "[{date:Y-m-d H:i:s}] Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}"
+; Enable auth logging to syslog for fail2ban
+auth_syslog = On
+
[debug]
; Special option required for development purposes
enable = Off
@@ -206,7 +220,7 @@ enable = On
; Additional caching key. If changed, cache is purged
index = "v1"
-; Can be: files, APC, memcache, redis (beta)
+; Can be: files, APCU, memcache, redis (beta)
fast_cache_driver = "files"
; Additional caching key. If changed, fast cache is purged
@@ -237,7 +251,6 @@ use_mobile_version_for_tablets = Off
use_app_debug_css = Off
use_imap_sort = On
use_imap_force_selection = Off
-use_imap_list_subscribe = On
use_imap_thread = On
use_imap_move = Off
use_imap_expunge_all_on_delete = Off
@@ -254,15 +267,14 @@ imap_folder_list_limit = 200
imap_show_login_alert = On
imap_use_list_status = On
imap_timeout = 300
-smtp_timeout = 60
smtp_show_server_errors = Off
-sieve_utf8_folder_name = On
+smtp_timeout = 60
sieve_auth_plain_initial = On
sieve_allow_fileinto_inbox = Off
sieve_timeout = 10
sasl_allow_plain = On
+sasl_allow_scram_sha = Off
sasl_allow_cram_md5 = Off
-domain_list_limit = 99
mail_func_clear_headers = On
mail_func_additional_parameters = Off
favicon_status = On
@@ -289,5 +301,5 @@ dev_email = ""
dev_password = ""
[version]
-current = "2.13.1"
-saved = "Mon, 23 Aug 2021 07:55:13 +0000"
+current = "2.13.2"
+saved = "Fri, 04 Mar 2022 08:55:26 +0000"
diff --git a/README.md b/README.md
index ed7dc85a4..e23260e74 100644
--- a/README.md
+++ b/README.md
@@ -139,23 +139,23 @@ RainLoop 1.15 vs SnappyMail
|js/* |RainLoop |Snappy |
|--------------- |--------: |--------: |
-|admin.js |2.158.025 | 84.080 |
-|app.js |4.215.733 | 434.705 |
-|boot.js | 672.433 | 2.019 |
-|libs.js | 647.679 | 200.928 |
+|admin.js |2.158.025 | 80.267 |
+|app.js |4.215.733 | 432.998 |
+|boot.js | 672.433 | 1.970 |
+|libs.js | 647.679 | 200.221 |
|polyfills.js | 325.908 | 0 |
|serviceworker.js | 0 | 285 |
-|TOTAL |8.019.778 | 722.017 |
+|TOTAL |8.019.778 | 715.741 |
|js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli |
|--------------- |--------: |--------: |------: |------: |--------: |--------: |
-|admin.min.js | 255.514 | 41.747 | 73.899 | 13.727 | 60.674 | 12.266 |
-|app.min.js | 516.000 | 209.913 |140.430 | 67.140 |110.657 | 57.339 |
-|boot.min.js | 66.456 | 1.250 | 22.553 | 776 | 20.043 | 626 |
-|libs.min.js | 574.626 | 96.683 |177.280 | 35.654 |151.855 | 31.874 |
+|admin.min.js | 255.514 | 39.836 | 73.899 | 13.256 | 60.674 | 11.866 |
+|app.min.js | 516.000 | 208.920 |140.430 | 66.895 |110.657 | 57.166 |
+|boot.min.js | 66.456 | 1.217 | 22.553 | 762 | 20.043 | 611 |
+|libs.min.js | 574.626 | 96.347 |177.280 | 35.566 |151.855 | 31.844 |
|polyfills.min.js | 32.608 | 0 | 11.315 | 0 | 10.072 | 0 |
-|TOTAL |1.445.204 | 349.593 |425.477 |117.297 |353.301 |102.105 |
-|TOTAL (no admin) |1.189.690 | 307.846 |351.061 |103.570 |292.627 | 89.839 |
+|TOTAL |1.445.204 | 346.320 |425.477 |116.479 |353.301 |101.487 |
+|TOTAL (no admin) |1.189.690 | 306.484 |351.061 |103.223 |292.627 | 89.621 |
For a user its around 69% smaller and faster than traditional RainLoop.
@@ -183,12 +183,12 @@ For a user its around 69% smaller and faster than traditional RainLoop.
|css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli |
|------------ |-------: |------: |------: |------: |--------: |
-|app.css | 340.334 | 81.400 | 46.959 | 16.839 | 14.477 |
-|app.min.css | 274.791 | 65.545 | 39.618 | 14.918 | 13.147 |
+|app.css | 340.334 | 80.956 | 46.959 | 16.773 | 14.436 |
+|app.min.css | 274.791 | 65.164 | 39.618 | 14.865 | 13.097 |
|boot.css | | 1.326 | | 664 | 545 |
|boot.min.css | | 1.071 | | 590 | 474 |
-|admin.css | | 30.151 | | 6.818 | 5.907 |
-|admin.min.css | | 24.260 | | 6.187 | 5.437 |
+|admin.css | | 29.990 | | 6.799 | 5.888 |
+|admin.min.css | | 24.113 | | 6.168 | 5.435 |
### PGP
RainLoop uses the old OpenPGP.js v2
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index ec58a4a35..693c1aa96 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail 2.13.1.
+This app packages SnappyMail 2.13.2.
SnappyMail is a simple, modern, lightweight & fast web-based email client.
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 59a5566c2..96a9eeb88 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -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.13.1
+VERSION=2.13.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 && \
diff --git a/integrations/nextcloud/snappymail/VERSION b/integrations/nextcloud/snappymail/VERSION
index 53fdb123b..d1cdec8ed 100755
--- a/integrations/nextcloud/snappymail/VERSION
+++ b/integrations/nextcloud/snappymail/VERSION
@@ -1 +1 @@
-2.13.1
\ No newline at end of file
+2.13.2
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 18bfb00a8..e5f57f285 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -4,7 +4,7 @@
SnappyMail
SnappyMail Webmail
Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07).
- 2.13.1
+ 2.13.2
agpl
SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli
SnappyMail
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 7409d09ba..c0c4742d4 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -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.13.1" );
+return ( "2.13.2" );
}
sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index fc1ddfb93..54a60a9b8 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"title": "SnappyMail",
"description": "Simple, modern & fast web-based email client",
"private": true,
- "version": "2.13.1",
+ "version": "2.13.2",
"homepage": "https://snappymail.eu",
"author": {
"name": "DJ Maze",