From 7fc279293c7dcc2b031ed731159145eb1adeb9a3 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Thu, 8 Apr 2021 16:02:41 +0200
Subject: [PATCH] v2.5.0-rc.1

---
 README.md                      | 16 ++++++++--------
 package.json                   |  2 +-
 plugins/ckeditor/index.php     |  2 +-
 snappymail/v/0.0.0/include.php | 12 ++++--------
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 7cd7bcb40..1460ad62e 100644
--- a/README.md
+++ b/README.md
@@ -116,23 +116,23 @@ RainLoop 1.15 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.158.025	|  100.721	|
-|app.js          	|4.215.733	|  497.330	|
+|admin.js        	|2.158.025	|   95.529	|
+|app.js          	|4.215.733	|  467.499	|
 |boot.js         	|  672.433	|    4.726	|
 |libs.js         	|  647.679	|  227.974	|
 |polyfills.js    	|  325.908	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.019.778	|  830.864	|
+|TOTAL           	|8.019.778	|  795.841	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
 |admin.min.js    	|  255.514	|   50.607	| 73.899	| 14.944	| 60.674 	| 13.364	|
-|app.min.js      	|  516.000	|  241.496	|140.430	| 70.637	|110.657 	| 59.605	|
+|app.min.js      	|  516.000	|  240.810	|140.430	| 70.598	|110.657 	| 59.482	|
 |boot.min.js     	|   66.456	|    2.442	| 22.553	|  1.371	| 20.043 	|  1.178	|
 |libs.min.js     	|  574.626	|  115.877	|177.280	| 42.809	|151.855 	| 38.099	|
 |polyfills.min.js	|   32.608	|        0	| 11.315	|      0	| 10.072 	|      0	|
-|TOTAL           	|1.445.204	|  410.422	|425.477	|129.761	|353.301 	|112.246	|
-|TOTAL (no admin)	|1.189.690	|  359.815	|351.061	|114.817	|292.627 	| 98.882	|
+|TOTAL           	|1.445.204	|  409.736	|425.477	|129.722	|353.301 	|112.123	|
+|TOTAL (no admin)	|1.189.690	|  359.129	|351.061	|114.778	|292.627 	| 98.759	|
 
 For a user its around 66% smaller and faster than traditional RainLoop.
 
@@ -166,8 +166,8 @@ For a user its around 66% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|-------:	|------:	|------:	|--------:	|
-|app.css     	| 340.334	| 107.471	| 46,959	| 18.828	| 16.184	|
-|app.min.css 	| 274.791	|  88.601	| 39.618	| 16.867	| 14.861	|
+|app.css     	| 340.334	| 107.300	| 46,959	| 18.817	| 16.173	|
+|app.min.css 	| 274.791	|  88.452	| 39.618	| 16.857	| 14.849	|
 |boot.css    	|       	|   2.066	|       	|    913	|    742	|
 |boot.min.css	|       	|   1.696	|       	|    818	|    664	|
 |admin.css    	|       	|  46.393	|       	|  9.237	|  8.073	|
diff --git a/package.json b/package.json
index f2ff8c746..4a8d2e6d6 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.4.3.1",
+  "version": "2.5.0-rc.1",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
diff --git a/plugins/ckeditor/index.php b/plugins/ckeditor/index.php
index 9db7d0375..d1973d66d 100644
--- a/plugins/ckeditor/index.php
+++ b/plugins/ckeditor/index.php
@@ -6,7 +6,7 @@ class CKEditorPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME = 'CKEditor',
 		VERSION = '2.1',
 		RELEASE = '2021-04-01',
-		REQUIRED = '2.4.4',
+		REQUIRED = '2.5.0',
 		DESCRIPTION = 'Use CKEditor instead of Squire as WYSIWYG';
 
 	public function Init() : void
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index 00d97c038..81997323e 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -37,18 +37,14 @@
 
 			$sSite = strtolower(trim(empty($_SERVER['HTTP_HOST']) ? (empty($_SERVER['SERVER_NAME']) ? '' : $_SERVER['SERVER_NAME']) : $_SERVER['HTTP_HOST']));
 			$sSite = 'www.' === substr($sSite, 0, 4) ? substr($sSite, 4) : $sSite;
-			$sSite = preg_replace('/^.+@/', '', preg_replace('/:[\d]+$/', '', $sSite));
-			$sSite = in_array($sSite, array('localhost', '127.0.0.1', '::1', '::1/128', '0:0:0:0:0:0:0:1')) ? 'localhost' : trim($sSite);
-			$sSite = 0 === strlen($sSite) ? 'localhost' : $sSite;
+			$sSite = trim(preg_replace('/^.+@/', '', preg_replace('/:[\d]+$/', '', $sSite)));
+			$sSite = in_array($sSite, array('', 'localhost', '127.0.0.1', '::1', '::1/128', '0:0:0:0:0:0:0:1')) ? 'localhost' : $sSite;
 
 			define('APP_SITE', $sSite);
 			unset($sSite);
 
-			define('APP_DEFAULT_PRIVATE_DATA_NAME', '_default_');
-
 			$sPrivateDataFolderInternalName = defined('MULTIDOMAIN') ? APP_SITE : '';
-			define('APP_PRIVATE_DATA_NAME', 0 === strlen($sPrivateDataFolderInternalName) ? APP_DEFAULT_PRIVATE_DATA_NAME : $sPrivateDataFolderInternalName);
-			define('APP_MULTIPLY', 0 < strlen($sPrivateDataFolderInternalName) && APP_DEFAULT_PRIVATE_DATA_NAME !== APP_PRIVATE_DATA_NAME);
+			define('APP_PRIVATE_DATA_NAME', 0 === strlen($sPrivateDataFolderInternalName) ? '_default_' : $sPrivateDataFolderInternalName);
 
 			define('APP_DUMMY', '********');
 			define('APP_DEV_VERSION', '0.0.0');
@@ -142,7 +138,7 @@
 
 			define('APP_PLUGINS_PATH', APP_PRIVATE_DATA.'plugins/');
 
-			if (APP_VERSION !== $sInstalled || (APP_MULTIPLY && !is_dir(APP_PRIVATE_DATA)))
+			if (APP_VERSION !== $sInstalled || (!is_dir(APP_PRIVATE_DATA) && strlen($sPrivateDataFolderInternalName) && '_default_' !== APP_PRIVATE_DATA_NAME))
 			{
 				define('APP_INSTALLED_START', true);
 				define('APP_INSTALLED_VERSION', $sInstalled);