From 116fed7284eeb99dda8add2118f9f72e31a38975 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 5 Dec 2022 13:30:57 +0100
Subject: [PATCH] v2.22.6

---
 .../files/usr/local/include/application.ini   |  2 +-
 CHANGELOG.md                                  | 18 ++++++++++++
 README.md                                     |  8 ++---
 integrations/cloudron/DESCRIPTION.md          |  2 +-
 integrations/cloudron/Dockerfile              |  2 +-
 .../nextcloud/snappymail/appinfo/info.xml     |  2 +-
 integrations/virtualmin/snappymail.pl         |  2 +-
 package.json                                  |  2 +-
 plugins/avatars/index.php                     | 29 ++++++++++++-------
 .../0.0.0/app/libraries/snappymail/crypt.php  |  2 ++
 10 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index f3ceb5e29..c03055549 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.22.5"
+current = "2.22.6"
 saved = "Fri, 30 Sep 2022 12:34:56 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 903c2d9fb..9a54acdaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 2.22.6 – 2022-12-05
+
+### Changed
+- Narrow MessageList wraps star icon
+  [#737](https://github.com/the-djmaze/snappymail/pull/737)
+- Use UIDVALIDITY when HIGHESTMODSEQ not available, maybe solves
+  [#745](https://github.com/the-djmaze/snappymail/pull/745)
+- No need to generate 1000's of ID's for MessageListByRequestIndexOrUids()
+- Update Chinese translation by @mayswind
+
+### Fixed
+- PluginProperty DefaultValue contained array while it should not
+  [#741](https://github.com/the-djmaze/snappymail/pull/741)
+
+### Removed
+- IMAP SELECT/EXAMINE unset `UNSEEN` because IMAP4rev2 deprecated
+
+
 ## 2.22.5 – 2022-12-02
 
 ### Added
diff --git a/README.md b/README.md
index 23c29ded6..3c8304f54 100644
--- a/README.md
+++ b/README.md
@@ -142,13 +142,13 @@ RainLoop 1.17 vs SnappyMail
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
 |admin.js        	|2.170.153	|   82.509	|
-|app.js          	|4.207.787	|  408.750	|
+|app.js          	|4.207.787	|  409.121	|
 |boot.js         	|  868.735	|    2.351	|
 |libs.js         	|  658.812	|  193.075	|
 |sieve.js         	|        0	|   86.018	|
 |polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.240.095	|  772.988	|
+|TOTAL           	|8.240.095	|  773.359	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
@@ -189,8 +189,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.836	| 46.946	| 17.029	| 14.580	|
-|app.min.css 	| 274.947	| 66.014	| 39.647	| 15.019	| 13.184	|
+|app.css     	| 340.331	| 81.836	| 46.946	| 17.031	| 14.585	|
+|app.min.css 	| 274.947	| 66.014	| 39.647	| 15.019	| 13.187	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
 |admin.css    	|       	| 29.853	|       	|  6.812	|  5.933	|
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 778c3a8bd..d7a54fd18 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.22.5</upstream>.
+This app packages SnappyMail <upstream>2.22.6</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 76986d6f2..e8cd70d0d 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.22.5
+VERSION=2.22.6
 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/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 131dd6a6d..e429462f9 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>snappymail</id>
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
-	<version>2.22.5</version>
+	<version>2.22.6</version>
 	<licence>agpl</licence>
 	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
 	<description><![CDATA[**Simple, modern, lightweight & fast web-based email client.**
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index b63c114ff..54c1d3dc3 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.22.5" );
+return ( "2.22.6" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 3b47bce6f..1717ae35a 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.22.5",
+  "version": "2.22.6",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
index 4da664b3f..3edc0d79f 100644
--- a/plugins/avatars/index.php
+++ b/plugins/avatars/index.php
@@ -6,9 +6,9 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'Avatars',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '1.2',
+		VERSION  = '1.3',
 		RELEASE  = '2022-11-29',
-		REQUIRED = '2.22.5',
+		REQUIRED = '2.22.4',
 		CATEGORY = 'Contacts',
 		LICENSE  = 'MIT',
 		DESCRIPTION = 'Show photo of sender in message and messages list (supports BIMI, Gravatar and identicon, Contacts is still TODO)';
@@ -93,15 +93,22 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 	protected function configMapping() : array
 	{
 		$aResult = array(
-			\RainLoop\Plugins\Property::NewInstance('identicon')->SetLabel('Identicon')
-				->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECT)
-//				->SetAllowedInJs(true)
-				->SetDefaultValue([
-					['id' => '', 'name' => 'Name characters else silhouette'],
-					['id' => 'identicon', 'name' => 'Name characters else squares'],
-					['id' => 'jdenticon', 'name' => 'Triangles shape']
-				])
-				->SetDescription('https://wikipedia.org/wiki/Identicon'),
+			defined('RainLoop\\Enumerations\\PluginPropertyType::SELECT')
+				? \RainLoop\Plugins\Property::NewInstance('identicon')->SetLabel('Identicon')
+					->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECT)
+//					->SetAllowedInJs(true)
+					->SetDefaultValue([
+						['id' => '', 'name' => 'Name characters else silhouette'],
+						['id' => 'identicon', 'name' => 'Name characters else squares'],
+						['id' => 'jdenticon', 'name' => 'Triangles shape']
+					])
+					->SetDescription('https://wikipedia.org/wiki/Identicon')
+				: \RainLoop\Plugins\Property::NewInstance('identicon')->SetLabel('Identicon')
+					->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
+//					->SetAllowedInJs(true)
+					->SetDefaultValue(['','identicon','jdenticon'])
+					->SetDescription('empty = default, identicon = squares, jdenticon = Triangles shape')
+				,
 			\RainLoop\Plugins\Property::NewInstance('service')->SetLabel('Preload valid domain icons')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 				->SetDefaultValue(true),
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 03028acb1..4fc1d3f9c 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
@@ -106,6 +106,8 @@ abstract class Crypt
 			}
 		}
 
+		// Too much OpenSSL v3 issues ?
+//		if (\is_callable('openssl_encrypt') && OPENSSL_VERSION_NUMBER < 805306368) {
 		if (\is_callable('openssl_encrypt')) {
 			try {
 				$iv = \random_bytes(\openssl_cipher_iv_length(static::$cipher));