diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini index 206b23f3d..da48c375e 100644 --- a/.docker/release/files/usr/local/include/application.ini +++ b/.docker/release/files/usr/local/include/application.ini @@ -301,5 +301,5 @@ dev_email = "" dev_password = "" [version] -current = "2.14.3" +current = "2.15.0" saved = "Fri, 04 Mar 2022 08:55:26 +0000" diff --git a/README.md b/README.md index 474582374..9fa293fea 100644 --- a/README.md +++ b/README.md @@ -139,26 +139,26 @@ RainLoop 1.15 vs SnappyMail |js/* |RainLoop |Snappy | |--------------- |--------: |--------: | -|admin.js |2.158.025 | 78.605 | -|app.js |4.215.733 | 406.987 | +|admin.js |2.158.025 | 80.642 | +|app.js |4.215.733 | 405.812 | |boot.js | 672.433 | 2.155 | -|libs.js | 647.679 | 197.259 | -|sieve.js | 0 | 86.320 | +|libs.js | 647.679 | 196.921 | +|sieve.js | 0 | 86.564 | |polyfills.js | 325.908 | 0 | |serviceworker.js | 0 | 285 | -|TOTAL |8.019.778 | 771.611 | +|TOTAL |8.019.778 | 772.379 | |js/min/* |RainLoop |Snappy |RL gzip |SM gzip |RL brotli |SM brotli | |--------------- |--------: |--------: |------: |------: |--------: |--------: | -|admin.min.js | 255.514 | 39.034 | 73.899 | 13.031 | 60.674 | 11.664 | -|app.min.js | 516.000 | 193.507 |140.430 | 62.162 |110.657 | 53.288 | +|admin.min.js | 255.514 | 40.307 | 73.899 | 13.413 | 60.674 | 11.994 | +|app.min.js | 516.000 | 192.913 |140.430 | 62.027 |110.657 | 53.180 | |boot.min.js | 66.456 | 1.301 | 22.553 | 798 | 20.043 | 653 | -|libs.min.js | 574.626 | 95.886 |177.280 | 35.433 |151.855 | 31.696 | -|sieve.min.js | 0 | 42.304 | 0 | 10.548 | 0 | 9.509 | +|libs.min.js | 574.626 | 95.731 |177.280 | 35.371 |151.855 | 31.664 | +|sieve.min.js | 0 | 42.182 | 0 | 10.555 | 0 | 9.510 | |polyfills.min.js | 32.608 | 0 | 11.315 | 0 | 10.072 | 0 | -|TOTAL user |1.189.690 | 290.694 |351.061 | 98.393 |292.627 | 85.637 | -|TOTAL user+sieve |1.189.690 | 332.998 |351.061 |108.941 |292.627 | 95.146 | -|TOTAL admin | 929.204 | 136.221 |285.047 | 49.262 |242.644 | 44.013 | +|TOTAL user |1.189.690 | 289.945 |351.061 | 98.196 |292.627 | 85.497 | +|TOTAL user+sieve |1.189.690 | 332.127 |351.061 |108.751 |292.627 | 95.007 | +|TOTAL admin | 929.204 | 137.339 |285.047 | 49.582 |242.644 | 44.311 | For a user its around 70% smaller and faster than traditional RainLoop. diff --git a/dev/Common/Links.js b/dev/Common/Links.js index 9e896f2a2..977094de9 100644 --- a/dev/Common/Links.js +++ b/dev/Common/Links.js @@ -47,7 +47,8 @@ export const serverRequestRaw('Download', download, customSpecSuffix), proxy = url => - SERVER_PREFIX + '/ProxyExternal/' + btoa(url.replace(/ /g, '%20')).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''), + SERVER_PREFIX + '/ProxyExternal/' + + btoa(url.replace(/ /g, '%20')).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''), /** * @param {string} type diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md index 4b92489fb..402d04283 100644 --- a/integrations/cloudron/DESCRIPTION.md +++ b/integrations/cloudron/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages SnappyMail 2.14.3. +This app packages SnappyMail 2.15.0. SnappyMail is a simple, modern, lightweight & fast web-based email client. diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile index 9ca0b070a..8f21608b0 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.14.3 +VERSION=2.15.0 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 ecac8bfdc..c910885a0 100755 --- a/integrations/nextcloud/snappymail/VERSION +++ b/integrations/nextcloud/snappymail/VERSION @@ -1 +1 @@ -2.14.3 \ No newline at end of file +2.15.0 \ No newline at end of file diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index 12f9e54f8..6fdca35db 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.14.3 + 2.15.0 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 a9ce6511a..1bea312ca 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.14.3" ); +return ( "2.15.0" ); } sub script_snappymail_version_desc diff --git a/package.json b/package.json index c0e4a96e5..5ebff92ef 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.14.3", + "version": "2.15.0", "homepage": "https://snappymail.eu", "author": { "name": "DJ Maze", diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php index 43fa8c54c..6cbded338 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php @@ -98,9 +98,11 @@ abstract class Crypt $salt = \random_bytes(16); $result = ['xxtea', $salt, static::XxteaEncrypt($data, $salt, $key)]; } +/* if (static::{"{$result[0]}Decrypt"}($result[2], $result[1], $key) !== $data) { throw new \Exception('Encrypt/Decrypt mismatch'); } +*/ return $result; }