v2.18.1

2025-09-07 21:54:35 +08:00 · 2022-09-21 10:16:23 +02:00 · 2022-09-21 10:16:23 +02:00 · df34c4a0ae
commit df34c4a0ae
parent 0bbf8f4914
11 changed files with 24 additions and 23 deletions
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@ -304,5 +304,5 @@ dev_email = ""
 dev_password = ""

 [version]
-current = "2.18.0"
+current = "2.18.1"
 saved = "Fri, 04 Mar 2022 08:55:26 +0000"
--- a/README.md
+++ b/README.md
@ -140,26 +140,26 @@ RainLoop 1.17 vs SnappyMail

 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.170.153	|   81.400	|
-|app.js          	|4.207.787	|  410.184	|
+|admin.js        	|2.170.153	|   81.141	|
+|app.js          	|4.207.787	|  408.381	|
 |boot.js         	|  868.735	|    2.050	|
-|libs.js         	|  658.812	|  197.171	|
+|libs.js         	|  658.812	|  194.433	|
 |sieve.js         	|        0	|   86.183	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  777.273	|
+|TOTAL           	|8.240.095	|  772.473	|

 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  256.831	|   40.457	| 73.606	| 13.519	| 60.877  	| 12.094	|
-|app.min.js      	|  515.367	|  191.686	|139.456	| 62.457	|110.485  	| 53.823	|
+|admin.min.js    	|  256.831	|   40.303	| 73.606	| 13.472	| 60.877  	| 12.053	|
+|app.min.js      	|  515.367	|  189.969	|139.456	| 62.331	|110.485  	| 53.607	|
 |boot.min.js     	|   84.659	|    1.252	| 26.998	|    778	| 23.643  	|    628	|
-|libs.min.js     	|  584.772	|   94.990	|180.901	| 35.129	|155.182  	| 31.387	|
+|libs.min.js     	|  584.772	|   92.953	|180.901	| 34.365	|155.182  	| 30.882	|
 |sieve.min.js     	|        0	|   41.961	|      0	| 10.493	|      0  	|  9.462	|
 |polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
-|TOTAL user      	|1.217.635	|  287.928	|358.761	| 98.364	|299.485  	| 85.838	|
-|TOTAL user+sieve	|1.217.635	|  329.889	|358.761	|108.857	|299.485  	| 95.300	|
-|TOTAL admin     	|  959.099	|  136.699	|292.911	| 49.426	|249.877  	| 44.109	|
+|TOTAL user      	|1.217.635	|  284.174	|358.761	| 97.474	|299.485  	| 85.117	|
+|TOTAL user+sieve	|1.217.635	|  326.135	|358.761	|107.967	|299.485  	| 94.579	|
+|TOTAL admin     	|  959.099	|  134.508	|292.911	| 48.615	|249.877  	| 43.563	|

 For a user its around 70% smaller and faster than traditional RainLoop.

@ -187,8 +187,8 @@ For a user its around 70% smaller and faster than traditional RainLoop.

 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.331	| 81.312	| 46.946	| 16.869	| 14.493	|
-|app.min.css 	| 274.947	| 65.282	| 39.647	| 14.899	| 13.112	|
+|app.css     	| 340.331	| 81.495	| 46.946	| 16.892	| 14.522	|
+|app.min.css 	| 274.947	| 65.432	| 39.647	| 15.014	| 13.129	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
 |admin.css    	|       	| 29.828	|       	|  6.788	|  5.889	|
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@ -4,6 +4,7 @@ import { forEachObjectEntry, pInt } from 'Common/Utils';
 const
 	tpl = createElement('template'),
 	htmlre = /[&<>"']/g,
+	httpre = /^(https?:)?\/\//i,
 	htmlmap = {
 		'&': '&amp;',
 		'<': '&lt;',
@ -262,7 +263,7 @@ export const
 							attachment.isLinked(true);
 						}
 					}
-					else if (/^(https?:)?\/\//i.test(value))
+					else if (httpre.test(value))
 					{
 						setAttribute('data-x-src', value);
 						result.hasExternals = true;
@ -325,7 +326,7 @@ export const
 									attachment.isInline(true);
 									attachment.isLinked(true);
 								}
-							} else if (/^(https?:)?\/\//.test(lowerUrl)) {
+							} else if (httpre.test(lowerUrl)) {
 								result.hasExternals = true;
 								urls_remote.push([property, found]);
 							} else if ('data:image/' === lowerUrl.slice(0, 11)) {
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.18.0</upstream>.
+This app packages SnappyMail <upstream>2.18.1</upstream>.

 SnappyMail is a simple, modern, lightweight & fast web-based email client.

--- 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.18.0
+VERSION=2.18.1
 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 && \
--- a/integrations/nextcloud/snappymail/VERSION
+++ b/integrations/nextcloud/snappymail/VERSION
@ -1 +1 @@
-2.18.0
+2.18.1
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@ -4,7 +4,7 @@
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
 	<description>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).</description>
-	<version>2.18.0</version>
+	<version>2.18.1</version>
 	<licence>agpl</licence>
 	<author>SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
  <namespace>SnappyMail</namespace>
--- 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.18.0" );
+return ( "2.18.1" );
 }

 sub script_snappymail_version_desc
--- a/package.json
+++ b/package.json
@ -3,7 +3,7 @@
  "title": "SnappyMail",
  "description": "Simple, modern & fast web-based email client",
  "private": true,
-  "version": "2.18.0",
+  "version": "2.18.1",
  "homepage": "https://snappymail.eu",
  "author": {
    "name": "DJ Maze",
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@ -263,7 +263,7 @@
 	"POPUPS_CLEAR_FOLDER": {
 		"TITLE_CLEAR_FOLDER": "Purge all messages from the folder?",
 		"DANGER_DESC_WARNING": "Warning!",
-		"DANGER_DESC_HTML_1": "This action will result in removing all mails from <strong>%FOLDER%<\/strong> folder completely.",
+		"DANGER_DESC_HTML_1": "This action will result in removing all mails from '<strong>%FOLDER%<\/strong>' folder completely.",
 		"DANGER_DESC_HTML_2": "Once started, the process cannot be aborted or canceled.",
 		"TITLE_CLEARING_PROCESS": "Purging the folder..."
 	},
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl-NL/user.json
@ -263,7 +263,7 @@
 	"POPUPS_CLEAR_FOLDER": {
 		"TITLE_CLEAR_FOLDER": "Alle inhoud van deze map verwijderen?",
 		"DANGER_DESC_WARNING": "Opgelet!",
-		"DANGER_DESC_HTML_1": "Deze actie verwijdert alle e-mails in de map <strong>%FOLDER%<\/strong>!",
+		"DANGER_DESC_HTML_1": "Deze actie verwijdert alle e-mails uit de map '<strong>%FOLDER%<\/strong>'!",
 		"DANGER_DESC_HTML_2": "Eens in gang gezet kan het proces niet geannuleerd worden!",
 		"TITLE_CLEARING_PROCESS": "Folder aan het leegmaken..."
 	},
 @ -1 +1 @@
 .18.0
 .18.1