set version to 2.0.22 for upcoming maintenance release

Signed-off-by: Michael Kaufmann <[email protected]>
froxlor · Sep 1, 2023 · 9d0e463 · 9d0e463
1 parent a7198f5
commit 9d0e463
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php
@@ -697,7 +697,7 @@
 	('system', 'distribution', ''),
 	('system', 'update_channel', 'stable'),
 	('system', 'updatecheck_data', ''),
-	('system', 'update_notify_last', '2.0.21'),
+	('system', 'update_notify_last', '2.0.22'),
 	('system', 'traffictool', 'goaccess'),
 	('system', 'req_limit_per_interval', 60),
 	('system', 'req_limit_interval', 60),
@@ -744,7 +744,7 @@
 	('panel', 'logo_overridetheme', '0'),
 	('panel', 'logo_overridecustom', '0'),
 	('panel', 'settings_mode', '0'),
-	('panel', 'version', '2.0.21'),
+	('panel', 'version', '2.0.22'),
 	('panel', 'db_version', '202304260');
 
 

diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php
@@ -502,3 +502,8 @@
 	Update::showUpdateStep("Updating from 2.0.20 to 2.0.21", false);
 	Froxlor::updateToVersion('2.0.21');
 }
+
+if (Froxlor::isFroxlorVersion('2.0.21')) {
+	Update::showUpdateStep("Updating from 2.0.21 to 2.0.22", false);
+	Froxlor::updateToVersion('2.0.22');
+}
diff --git a/lib/Froxlor/Cron/Http/Nginx.php b/lib/Froxlor/Cron/Http/Nginx.php
@@ -883,13 +883,7 @@ private function cleanVhostStruct($vhost = null)
 		// remove comments
 		$vhost = implode("\n", preg_replace('/^(\s+)?#(.*)$/', '', explode("\n", $vhost)));
 		// Break blocks into lines
-		$vhost = str_replace([
-			"{",
-			"}"
-		], [
-			" {\n",
-			"\n}"
-		], $vhost);
+		$vhost = preg_replace("/^(\s+)location(.+)\{(.+)\}$/misU", "location $2 {\n $3 \n}", $vhost);
 		// Break into array items
 		$vhost = explode("\n", preg_replace('/[ \t]+/', ' ', trim(preg_replace('/\t+/', '', $vhost))));
 		// Remove empty lines

diff --git a/lib/Froxlor/CurrentUser.php b/lib/Froxlor/CurrentUser.php
@@ -25,10 +25,10 @@
 
 namespace Froxlor;
 
-use Froxlor\Database\Database;
-use Froxlor\UI\Collection;
 use Froxlor\Api\Commands\Customers;
 use Froxlor\Api\Commands\SubDomains;
+use Froxlor\Database\Database;
+use Froxlor\UI\Collection;
 
 /**
  * Class to manage the current user / session
@@ -153,7 +153,7 @@ public static function canAddResource(string $resource): bool
 		} elseif ($resource == 'subdomains') {
 			$parentDomainCollection = (new Collection(SubDomains::class, $_SESSION['userinfo'],
 				['sql_search' => ['d.parentdomainid' => 0]]));
-			$addition = $parentDomainCollection != 0;
+			$addition = $parentDomainCollection->count() != 0;
 		} elseif ($resource == 'domains') {
 			$customerCollection = (new Collection(Customers::class, $_SESSION['userinfo']));
 			$addition = $customerCollection != 0;

diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php
@@ -31,7 +31,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '2.0.21';
+	const VERSION = '2.0.22';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202304260';