maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix language-strings; disallow direct removing of certificates if issuer=lets encrypt; fix sql query in updater; porting nginx regex for vhost-merging

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-09-12 15:25:47 +02:00
parent 6ad1ca2ba9
commit 3fc18f9903
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/updates/froxlor/update_2.1.inc.php
View File

@@ -132,7 +132,7 @@ if (Froxlor::isDatabaseVersion('202304260')) {
Update::lastStepStatus(0); Update::lastStepStatus(0);
Update::showUpdateStep("Adjusting system for data-export function"); 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("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_USERCOLUMNS . "` WHERE `section` = 'backup_list'");
Database::query("DELETE FROM `" . TABLE_PANEL_TASKS . "` WHERE `type` = '20'"); Database::query("DELETE FROM `" . TABLE_PANEL_TASKS . "` WHERE `type` = '20'");

8
lib/Froxlor/Cron/Http/Nginx.php
View File

@@ -863,13 +863,7 @@ class Nginx extends HttpConfigBase
// remove comments // remove comments
$vhost = implode("\n", preg_replace('/^(\s+)?#(.*)$/', '', explode("\n", $vhost))); $vhost = implode("\n", preg_replace('/^(\s+)?#(.*)$/', '', explode("\n", $vhost)));
// Break blocks into lines // Break blocks into lines
$vhost = str_replace([ $vhost = preg_replace("/^(\s+)?location(.+)\{(.+)\}$/misU", "location $2 {\n $3 \n}", $vhost);
"{",
"}"
], [
" {\n",
"\n}"
], $vhost);
// Break into array items // Break into array items
$vhost = explode("\n", preg_replace('/[ \t]+/', ' ', trim(preg_replace('/\t+/', '', $vhost)))); $vhost = explode("\n", preg_replace('/[ \t]+/', ' ', trim(preg_replace('/\t+/', '', $vhost))));
// Remove empty lines // Remove empty lines

5
lib/Froxlor/UI/Callbacks/SSLCertificate.php
View File

@@ -47,4 +47,9 @@ class SSLCertificate
} }
return false; return false;
} }
public static function isNotLetsEncrypt(array $attributes): bool
{
return (int)$attributes['fields']['letsencrypt'] == 0;
}
} }

3
lib/tablelisting/tablelisting.sslcertificates.php
View File

@@ -89,6 +89,9 @@ return [
'action' => 'delete', 'action' => 'delete',
'id' => ':id' 'id' => ':id'
], ],
// Let's Encrypt certificates can be removed 'correctly'
// by disabling let's encrypt for the domain
'visible' => [SSLCertificate::class, 'isNotLetsEncrypt']
], ],
] ]
] ]

2
lng/en.lng.php
View File

@@ -2210,7 +2210,7 @@ Yours sincerely, your administrator',
'toolselect' => 'Traffic analyzer', 'toolselect' => 'Traffic analyzer',
'webalizer' => 'Webalizer', 'webalizer' => 'Webalizer',
'awstats' => 'AWStats', 'awstats' => 'AWStats',
'goaccess' => 'goacccess' 'goaccess' => 'goaccess'
], ],
'requires_reconfiguration' => 'Changing this settings might require a reconfiguration of the following services:<br><strong>%s</strong>', 'requires_reconfiguration' => 'Changing this settings might require a reconfiguration of the following services:<br><strong>%s</strong>',
'req_limit_per_interval' => [ 'req_limit_per_interval' => [

2
lng/es.lng.php
View File

@@ -2176,7 +2176,7 @@ Atentamente, su administrador'
'toolselect' => 'Analizador de tráfico', 'toolselect' => 'Analizador de tráfico',
'webalizer' => 'Webalizer', 'webalizer' => 'Webalizer',
'awstats' => 'AWStats', '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>' 'requires_reconfiguration' => 'El cambio de esta configuración podría requerir una reconfiguración de los siguientes servicios:<br/><strong>%s</strong>'
], ],