From e25ffcacd629adfedd07478bf16ceb221fc3a3e4 Mon Sep 17 00:00:00 2001 From: djmaze Date: Wed, 8 Dec 2021 23:32:50 +0100 Subject: [PATCH] v2.9.5 --- .../files/usr/local/include/application.ini | 12 ++++---- 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 +- .../libraries/RainLoop/Config/Application.php | 10 +++---- .../app/libraries/RainLoop/Model/Account.php | 4 +-- 10 files changed, 32 insertions(+), 36 deletions(-) diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index dbf1e4653..bd7130c86 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -252,18 +252,16 @@ imap_message_all_headers = Off imap_large_thread_limit = 50 imap_folder_list_limit = 200 imap_show_login_alert = On -imap_use_auth_plain = On -imap_use_auth_cram_md5 = Off imap_use_list_status = On +imap_timeout = 300 +smtp_timeout = 60 smtp_show_server_errors = Off -smtp_use_auth_plain = On -smtp_use_auth_cram_md5 = Off sieve_utf8_folder_name = On sieve_auth_plain_initial = On sieve_allow_fileinto_inbox = Off -imap_timeout = 300 -smtp_timeout = 60 sieve_timeout = 10 +sasl_allow_plain = On +sasl_allow_cram_md5 = Off domain_list_limit = 99 mail_func_clear_headers = On mail_func_additional_parameters = Off @@ -291,5 +289,5 @@ dev_email = "" dev_password = "" [version] -current = "2.9.4" +current = "2.9.5" saved = "Mon, 23 Aug 2021 07:55:13 +0000" diff --git a/README.md b/README.md index 5f9a1fca5..d292f357f 100644 --- a/README.md +++ b/README.md @@ -138,23 +138,23 @@ RainLoop 1.15 vs SnappyMail |js/* |RainLoop |Snappy | |--------------- |--------: |--------: | -|admin.js |2.158.025 | 88.667 | -|app.js |4.215.733 | 435.990 | -|boot.js | 672.433 | 2.780 | -|libs.js | 647.679 | 209.030 | +|admin.js |2.158.025 | 85.441 | +|app.js |4.215.733 | 426.016 | +|boot.js | 672.433 | 2.779 | +|libs.js | 647.679 | 209.024 | |polyfills.js | 325.908 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.019.778 | 736.752 | +|TOTAL |8.019.778 | 723.545 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | -|admin.min.js | 255.514 | 44.540 | 73.899 | 13.934 | 60.674 | 12.517 | -|app.min.js | 516.000 | 220.422 |140.430 | 66.522 |110.657 | 56.407 | -|boot.min.js | 66.456 | 1.655 | 22.553 | 996 | 20.043 | 815 | -|libs.min.js | 574.626 | 99.896 |177.280 | 36.452 |151.855 | 32.642 | +|admin.min.js | 255.514 | 43.014 | 73.899 | 13.779 | 60.674 | 12.299 | +|app.min.js | 516.000 | 216.431 |140.430 | 65.674 |110.657 | 55.756 | +|boot.min.js | 66.456 | 1.654 | 22.553 | 996 | 20.043 | 814 | +|libs.min.js | 574.626 | 99.890 |177.280 | 36.443 |151.855 | 32.660 | |polyfills.min.js | 32.608 | 0 | 11.315 | 0 | 10.072 | 0 | -|TOTAL |1.445.204 | 366.513 |425.477 |117.904 |353.301 |102.381 | -|TOTAL (no admin) |1.189.690 | 321.973 |351.061 |103.970 |292.627 | 89.864 | +|TOTAL |1.445.204 | 360.989 |425.477 |116.892 |353.301 |101.529 | +|TOTAL (no admin) |1.189.690 | 317.975 |351.061 |103.113 |292.627 | 89.230 | For a user its around 70% smaller and faster than traditional RainLoop. @@ -193,12 +193,12 @@ For a user its around 70% smaller and faster than traditional RainLoop. |css/* |RainLoop |Snappy |RL gzip |SM gzip |SM brotli | |------------ |-------: |------: |------: |------: |--------: | -|app.css | 340.334 | 85.181 | 46.959 | 16.355 | 14.140 | -|app.min.css | 274.791 | 68.930 | 39.618 | 14.470 | 12.828 | +|app.css | 340.334 | 85.035 | 46.959 | 16.343 | 14.132 | +|app.min.css | 274.791 | 68.805 | 39.618 | 14.461 | 12.842 | |boot.css | | 1.326 | | 664 | 545 | |boot.min.css | | 1.071 | | 590 | 474 | -|admin.css | | 30.736 | | 6.928 | 6.007 | -|admin.min.css | | 24.693 | | 6.276 | 5.524 | +|admin.css | | 30.735 | | 6.923 | 6.007 | +|admin.min.css | | 24.692 | | 6.269 | 5.509 | ### Squire vs CKEditor diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md index d3c125a91..654722b0c 100644 --- a/integrations/cloudron/DESCRIPTION.md +++ b/integrations/cloudron/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages SnappyMail 2.9.4. +This app packages SnappyMail 2.9.5. SnappyMail is a simple, modern, lightweight & fast web-based email client. diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile index 596b18ecb..429884b6c 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.9.4 +VERSION=2.9.5 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 d38c63d7e..e3bed5e1c 100755 --- a/integrations/nextcloud/snappymail/VERSION +++ b/integrations/nextcloud/snappymail/VERSION @@ -1 +1 @@ -2.9.4 \ No newline at end of file +2.9.5 \ No newline at end of file diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index 927b00996..efdf41b70 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.9.4 + 2.9.5 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 fd3ca7258..59ca2c57c 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.9.4" ); +return ( "2.9.5" ); } sub script_snappymail_version_desc diff --git a/package.json b/package.json index 713c835c3..915bfcfa1 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.9.4", + "version": "2.9.5", "homepage": "https://snappymail.eu", "author": { "name": "DJ Maze", diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index fd7192407..e02c931de 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -343,17 +343,15 @@ Enables caching in the system'), 'imap_large_thread_limit' => array(50), 'imap_folder_list_limit' => array(200), 'imap_show_login_alert' => array(true), - 'imap_use_auth_plain' => array(true), - 'imap_use_auth_cram_md5' => array(false), 'imap_use_list_status' => array(true), + 'imap_timeout' => array(300), 'smtp_show_server_errors' => array(false), - 'smtp_use_auth_plain' => array(true), - 'smtp_use_auth_cram_md5' => array(false), + 'smtp_timeout' => array(60), 'sieve_auth_plain_initial' => array(true), 'sieve_allow_fileinto_inbox' => array(false), - 'imap_timeout' => array(300), - 'smtp_timeout' => array(60), 'sieve_timeout' => array(10), + 'sasl_allow_plain' => array(true), + 'sasl_allow_cram_md5' => array(false), 'domain_list_limit' => array(99), 'mail_func_clear_headers' => array(true), 'mail_func_additional_parameters' => array(false), diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php index 3a6d7543e..b3a73bb2c 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php @@ -303,8 +303,8 @@ abstract class Account implements \JsonSerializable 'Password' => $this->Password(), 'ProxyAuthUser' => $this->ProxyAuthUser(), 'ProxyAuthPassword' => $this->ProxyAuthPassword(), - 'UseAuthPlainIfSupported' => !!$oConfig->Get('labs', 'imap_use_auth_plain', true), - 'UseAuthCramMd5IfSupported' => !!$oConfig->Get('labs', 'imap_use_auth_cram_md5', true), + 'UseAuthPlainIfSupported' => !!$oConfig->Get('labs', 'sasl_allow_plain', true), + 'UseAuthCramMd5IfSupported' => !!$oConfig->Get('labs', 'sasl_allow_cram_md5', false), 'UseAuthOAuth2IfSupported' => false ) );