diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php index 0ce587ce..75e2ac9e 100644 --- a/actions/admin/settings/100.panel.php +++ b/actions/admin/settings/100.panel.php @@ -230,6 +230,15 @@ return [ 'save_method' => 'storeSettingField', 'advanced_mode' => true ], + 'panel_phpconfigs_hidesubdomains' => [ + 'label' => lng('serversettings.panel_phpconfigs_hidesubdomains'), + 'settinggroup' => 'panel', + 'varname' => 'phpconfigs_hidesubdomains', + 'type' => 'checkbox', + 'default' => true, + 'save_method' => 'storeSettingField', + 'advanced_mode' => true + ], 'panel_phpconfigs_hidestdsubdomain' => [ 'label' => lng('serversettings.panel_phpconfigs_hidestdsubdomain'), 'settinggroup' => 'panel', diff --git a/admin_updates.php b/admin_updates.php index acdf1ebb..b91b4142 100644 --- a/admin_updates.php +++ b/admin_updates.php @@ -112,6 +112,6 @@ if ($page == 'overview') { 'alert_msg' => $ui_text . $message ]); } else { - Response::standardSuccess('update.noupdatesavail', [(Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') . ' ' : '')]); + Response::standardSuccess('update.noupdatesavail', Settings::Get('system.update_channel') == 'testing' ? lng('serversettings.uc_testing') . ' ' : ''); } } diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php index f2a88369..52a63ca9 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -726,6 +726,7 @@ opcache.validate_timestamps'), ('panel', 'allow_preset_admin', '0'), ('panel', 'password_regex', ''), ('panel', 'phpconfigs_hidestdsubdomain', '0'), + ('panel', 'phpconfigs_hidesubdomains', '1'), ('panel', 'allow_theme_change_admin', '1'), ('panel', 'allow_theme_change_customer', '1'), ('panel', 'password_alpha_lower', '1'), diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php index 7a2fc2d9..75c53216 100644 --- a/install/updates/froxlor/update_2.x.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -140,6 +140,7 @@ if (Froxlor::isFroxlorVersion('0.10.99')) { Settings::AddNew("system.update_channel", 'stable'); Settings::AddNew("system.updatecheck_data", ''); Settings::AddNew("system.update_notify_last", $update_to); + Settings::AddNew("panel.phpconfigs_hidesubdomains", '1'); Update::lastStepStatus(0); Update::showUpdateStep("Adjusting existing settings"); diff --git a/install/updatesql.php b/install/updatesql.php index 17237e9f..f759d159 100644 --- a/install/updatesql.php +++ b/install/updatesql.php @@ -26,6 +26,7 @@ use Froxlor\Froxlor; use Froxlor\FileDir; use Froxlor\FroxlorLogger; +use Froxlor\Settings; use Froxlor\UI\Response; use Froxlor\Database\IntegrityCheck; use Froxlor\Install\Update; diff --git a/lib/Froxlor/UI/Callbacks/PHPConf.php b/lib/Froxlor/UI/Callbacks/PHPConf.php index 211fe6dc..055ea52e 100644 --- a/lib/Froxlor/UI/Callbacks/PHPConf.php +++ b/lib/Froxlor/UI/Callbacks/PHPConf.php @@ -41,7 +41,13 @@ class PHPConf if ($subdomains_count == 0 && empty($domains)) { $domains = lng('admin.phpsettings.notused'); } else { - $domains .= !empty($subdomains_count) ? ((!empty($domains) ? '+ ' : '') . $subdomains_count . ' ' . lng('customer.subdomains')) : ''; + if (Settings::Get('panel.phpconfigs_hidesubdomains') == '1') { + $domains .= !empty($subdomains_count) ? ((!empty($domains) ? '+ ' : '') . $subdomains_count . ' ' . lng('customer.subdomains')) : ''; + } else { + foreach ($attributes['fields']['subdomains'] as $configdomain) { + $domains .= $idna->decode($configdomain) . "
"; + } + } } return $domains; diff --git a/lng/de.lng.php b/lng/de.lng.php index 00cf01f8..8762bf38 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -1752,6 +1752,10 @@ Vielen Dank, Ihr Administrator', 'title' => 'Verwende Domainnamen im Documentroot', 'description' => 'Wenn aktiviert wird dem standard Documentroot zusätzlich der Domain-Name angehängt.

Beispiel:
/var/customers/customer_name/example.tld/
/var/customers/customer_name/subdomain.example.tld/', ], + 'panel_phpconfigs_hidesubdomains' => [ + 'title' => 'Verstecke Subdomains in PHP-Konfigurations-Übersicht', + 'description' => 'Wenn aktiviert, werden die Subdomains der Kunden nicht in der PHP-Konfigurations-Übersicht angezeigt, lediglich die Anzahl.

Hinweis: Nur relevant, wenn FCGID oder PHP-FPM aktiviert ist.', + ], 'panel_phpconfigs_hidestdsubdomain' => [ 'title' => 'Verstecke Standard-Subdomains in PHP-Konfigurations-Übersicht', 'description' => 'Wenn aktiviert, werden die Standard-Subdomains der Kunden nicht mehr in der PHP-Konfigurations-Übersicht angezeigt.

Hinweis: Nur relevant, wenn FCGID oder PHP-FPM aktiviert ist.', diff --git a/lng/en.lng.php b/lng/en.lng.php index 47e2a06b..225591cb 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -2128,6 +2128,10 @@ Yours sincerely, your administrator', 'title' => 'Use domain name as default value for DocumentRoot path', 'description' => 'If enabled and DocumentRoot path is empty, default value will be the (sub)domain name.

Examples:
/var/customers/customer_name/example.com/
/var/customers/customer_name/subdomain.example.com/', ], + 'panel_phpconfigs_hidesubdomains' => [ + 'title' => 'Hide subdomains in PHP-configuration overview', + 'description' => 'If activated the subdomains of customers will not be listed in the php-configurations overview, only the number of subdomains is shown.

Note: This is only visible if you have enabled FCGID or PHP-FPM', + ], 'panel_phpconfigs_hidestdsubdomain' => [ 'title' => 'Hide standard-subdomains in PHP-configuration overview', 'description' => 'If activated the standard-subdomains for customers will not be displayed in the php-configurations overview

Note: This is only visible if you have enabled FCGID or PHP-FPM', diff --git a/templates/Froxlor/settings/configuration.html.twig b/templates/Froxlor/settings/configuration.html.twig index cf2766fc..a4ec1d64 100644 --- a/templates/Froxlor/settings/configuration.html.twig +++ b/templates/Froxlor/settings/configuration.html.twig @@ -18,8 +18,10 @@ {% block content %} -