fix language-strings; disallow direct removing of certificates if iss…

…uer=lets encrypt; fix sql query in updater; porting nginx regex for vhost-merging Signed-off-by: Michael Kaufmann <[email protected]>
froxlor · Sep 12, 2023 · 3fc18f9 · 3fc18f9
1 parent 6ad1ca2
commit 3fc18f9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/install/updates/froxlor/update_2.1.inc.php b/install/updates/froxlor/update_2.1.inc.php
@@ -132,7 +132,7 @@
 	Update::lastStepStatus(0);
 
 	Update::showUpdateStep("Adjusting system for data-export function");
-	Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "`SET `varname` = 'exportenabled' WHERE `settinggroup`= 'system' AND `varname`= 'backupenabled");
+	Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "`SET `varname` = 'exportenabled' WHERE `settinggroup`= 'system' AND `varname`= 'backupenabled'");
 	Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "`SET `value` = REPLACE(`value`, 'extras.backup', 'extras.export') WHERE `settinggroup` = 'panel' AND `varname` = 'customer_hide_options'");
 	Database::query("DELETE FROM `" . TABLE_PANEL_USERCOLUMNS . "` WHERE `section` = 'backup_list'");
 	Database::query("DELETE FROM `" . TABLE_PANEL_TASKS . "` WHERE `type` = '20'");

diff --git a/lib/Froxlor/Cron/Http/Nginx.php b/lib/Froxlor/Cron/Http/Nginx.php
@@ -863,13 +863,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/UI/Callbacks/SSLCertificate.php b/lib/Froxlor/UI/Callbacks/SSLCertificate.php
@@ -47,4 +47,9 @@ public static function canEditSSL(array $attributes): bool
 		}
 		return false;
 	}
+
+	public static function isNotLetsEncrypt(array $attributes): bool
+	{
+		return (int)$attributes['fields']['letsencrypt'] == 0;
+	}
 }
diff --git a/lib/tablelisting/tablelisting.sslcertificates.php b/lib/tablelisting/tablelisting.sslcertificates.php
@@ -89,6 +89,9 @@
 					'action' => 'delete',
 					'id' => ':id'
 				],
+				// Let's Encrypt certificates can be removed 'correctly'
+				// by disabling let's encrypt for the domain
+				'visible' => [SSLCertificate::class, 'isNotLetsEncrypt']
 			],
 		]
 	]

diff --git a/lng/en.lng.php b/lng/en.lng.php
@@ -2210,7 +2210,7 @@
 			'toolselect' => 'Traffic analyzer',
 			'webalizer' => 'Webalizer',
 			'awstats' => 'AWStats',
-			'goaccess' => 'goacccess'
+			'goaccess' => 'goaccess'
 		],
 		'requires_reconfiguration' => 'Changing this settings might require a reconfiguration of the following services:<br><strong>%s</strong>',
 		'req_limit_per_interval' => [

diff --git a/lng/es.lng.php b/lng/es.lng.php
@@ -2176,7 +2176,7 @@
 			'toolselect' => 'Analizador de tráfico',
 			'webalizer' => 'Webalizer',
 			'awstats' => 'AWStats',
-			'goaccess' => 'goacccess'
+			'goaccess' => 'goaccess'
 		],
 		'requires_reconfiguration' => 'El cambio de esta configuración podría requerir una reconfiguración de los siguientes servicios:<br/><strong>%s</strong>'
 	],