From c7f80d617e2cc5ecfe379fc53e54cb1997a9a4a3 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Wed, 12 Jan 2022 12:11:37 +0100 Subject: [PATCH] v2.10.3 --- .../files/usr/local/include/application.ini | 2 +- README.md | 22 +++++++++---------- build/deb/DEBIAN/control | 8 ++++++- dev/App/User.js | 3 ++- 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 +- .../app/libraries/MailSo/Imap/ImapClient.php | 3 +-- .../Views/Admin/AdminSettingsAbout.html | 2 +- 12 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index 638433378..482e20b9f 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -289,5 +289,5 @@ dev_email = "" dev_password = "" [version] -current = "2.10.2" +current = "2.10.3" saved = "Mon, 23 Aug 2021 07:55:13 +0000" diff --git a/README.md b/README.md index af958e149..37fedfc97 100644 --- a/README.md +++ b/README.md @@ -138,23 +138,23 @@ RainLoop 1.15 vs SnappyMail |js/* |RainLoop |Snappy | |--------------- |--------: |--------: | -|admin.js |2.158.025 | 86.189 | -|app.js |4.215.733 | 424.670 | +|admin.js |2.158.025 | 86.116 | +|app.js |4.215.733 | 424.300 | |boot.js | 672.433 | 2.779 | |libs.js | 647.679 | 208.745 | |polyfills.js | 325.908 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.019.778 | 722.668 | +|TOTAL |8.019.778 | 722.225 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | -|admin.min.js | 255.514 | 43.224 | 73.899 | 13.913 | 60.674 | 12.389 | -|app.min.js | 516.000 | 214.949 |140.430 | 65.416 |110.657 | 55.714 | +|admin.min.js | 255.514 | 43.225 | 73.899 | 13.927 | 60.674 | 12.410 | +|app.min.js | 516.000 | 214.755 |140.430 | 65.379 |110.657 | 55.690 | |boot.min.js | 66.456 | 1.654 | 22.553 | 996 | 20.043 | 814 | |libs.min.js | 574.626 | 99.476 |177.280 | 36.501 |151.855 | 32.699 | |polyfills.min.js | 32.608 | 0 | 11.315 | 0 | 10.072 | 0 | -|TOTAL |1.445.204 | 359.303 |425.477 |116.826 |353.301 |101.616 | -|TOTAL (no admin) |1.189.690 | 316.079 |351.061 |102.913 |292.627 | 89.227 | +|TOTAL |1.445.204 | 359.110 |425.477 |116.803 |353.301 |101.613 | +|TOTAL (no admin) |1.189.690 | 315.885 |351.061 |102.876 |292.627 | 89.203 | 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 | 84.810 | 46.959 | 16.297 | 14.102 | -|app.min.css | 274.791 | 68.619 | 39.618 | 14.424 | 12.796 | +|app.css | 340.334 | 84.751 | 46.959 | 16.292 | 14.087 | +|app.min.css | 274.791 | 68.572 | 39.618 | 14.414 | 12.786 | |boot.css | | 1.326 | | 664 | 545 | |boot.min.css | | 1.071 | | 590 | 474 | -|admin.css | | 30.598 | | 6.900 | 5.983 | -|admin.min.css | | 24.578 | | 6.248 | 5.492 | +|admin.css | | 30.558 | | 6.894 | 5.979 | +|admin.min.css | | 24.546 | | 6.241 | 5.489 | ### Squire vs CKEditor diff --git a/build/deb/DEBIAN/control b/build/deb/DEBIAN/control index 7d08ad96e..4f4d6840f 100644 --- a/build/deb/DEBIAN/control +++ b/build/deb/DEBIAN/control @@ -1,7 +1,13 @@ Package: snappymail Version: 0.0.0 Maintainer: the-djmaze -Depends: php-json +Depends: + nginx | apache2 | httpd + , php-fpm | libapache2-mod-php + , php-json + , php-xml + , php-zip +Suggests: php-sqlite3 | php-mysql | php-pgsql Architecture: all Homepage: https://snappymail.eu Vcs-Browser: https://github.com/the-djmaze/snappymail diff --git a/dev/App/User.js b/dev/App/User.js index 5c2e45232..8c7e15b01 100644 --- a/dev/App/User.js +++ b/dev/App/User.js @@ -751,7 +751,8 @@ class AppUser extends AbstractApp { }, 500); } - ['touchstart','mousedown','mousemove','keydown'].forEach( + // add pointermove ? + ['touchstart','mousemove','keydown'].forEach( t => doc.addEventListener(t, SettingsUserStore.delayLogout, {passive:true}) ); SettingsUserStore.delayLogout(); diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md index 4c36cdc84..91246aeea 100644 --- a/integrations/cloudron/DESCRIPTION.md +++ b/integrations/cloudron/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages SnappyMail 2.10.2. +This app packages SnappyMail 2.10.3. SnappyMail is a simple, modern, lightweight & fast web-based email client. diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile index 151b3d7fc..d17ab0a18 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.10.2 +VERSION=2.10.3 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 d332044b1..fe1824995 100755 --- a/integrations/nextcloud/snappymail/VERSION +++ b/integrations/nextcloud/snappymail/VERSION @@ -1 +1 @@ -2.10.2 \ No newline at end of file +2.10.3 \ No newline at end of file diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index 6c187b989..793b83628 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.10.2 + 2.10.3 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 feb193a7e..4d9e31733 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.10.2" ); +return ( "2.10.3" ); } sub script_snappymail_version_desc diff --git a/package.json b/package.json index f563043ef..09143e3a4 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.10.2", + "version": "2.10.3", "homepage": "https://snappymail.eu", "author": { "name": "DJ Maze", diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php index 18698a6aa..3f10afe4a 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php @@ -158,8 +158,7 @@ class ImapClient extends \MailSo\Net\NetClient } $this->sendRaw($sChallenge, true, '*******'); $oResponse = $this->getResponse(); - $sSignature = $this->getResponseValue($oResponse); - $SASL->verify($sSignature); + $SASL->verify($this->getResponseValue($oResponse)); } else if ('CRAM-MD5' === $type) { diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html index 113384195..9d5251881 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html @@ -1,6 +1,6 @@
-
+