From 6ab8cb1d7c82b645ef3c1d6b29afa612b4ee59d2 Mon Sep 17 00:00:00 2001 From: Michael Wyraz Date: Thu, 21 Jul 2016 15:51:13 +0200 Subject: [PATCH] Adding option to hide some elements in customer panel --- actions/admin/settings/100.panel.php | 24 +++++++++++++++++++ install/froxlor.sql | 2 +- .../updates/froxlor/0.9/update_0.9.inc.php | 9 +++++++ lib/version.inc.php | 2 +- lng/english.lng.php | 8 +++++++ lng/german.lng.php | 8 +++++++ 6 files changed, 51 insertions(+), 2 deletions(-) diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php index 63f771de..9a262377 100644 --- a/actions/admin/settings/100.panel.php +++ b/actions/admin/settings/100.panel.php @@ -227,6 +227,30 @@ return array( 'default' => false, 'save_method' => 'storeSettingField', ), + 'panel_customer_hide_options' => array( + 'label' => $lng['serversettings']['panel_customer_hide_options'], + 'settinggroup' => 'panel', + 'varname' => 'customer_hide_options', + 'type' => 'option', + 'default' => '', + 'option_mode' => 'multiple', + 'option_options' => array( + 'email' => $lng['menue']['email']['email'], + 'mysql' => $lng['menue']['mysql']['mysql'], + 'domains' => $lng['menue']['domains']['domains'], + 'ftp' => $lng['menue']['ftp']['ftp'], + 'extras' => $lng['menue']['extras']['extras'], + 'extras.directoryprotection' => $lng['menue']['extras']['extras']." / ".$lng['menue']['extras']['directoryprotection'], + 'extras.pathoptions' => $lng['menue']['extras']['extras']." / ".$lng['menue']['extras']['pathoptions'], + 'extras.logger' => $lng['menue']['extras']['extras']." / ".$lng['menue']['logger']['logger'], + 'extras.backup' => $lng['menue']['extras']['extras']." / ".$lng['menue']['extras']['backup'], + 'traffic' => $lng['menue']['traffic']['traffic'], + 'traffic.http' => $lng['menue']['traffic']['traffic']." / HTTP", + 'traffic.ftp' => $lng['menue']['traffic']['traffic']." / FTP", + 'traffic.mail' => $lng['menue']['traffic']['traffic']." / Mail", + ), + 'save_method' => 'storeSettingField', + ), ), ), ), diff --git a/install/froxlor.sql b/install/froxlor.sql index 1cdeade2..77005af0 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -561,7 +561,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char', '!?<>§$%+#=@'), ('panel', 'version', '0.9.37-rc1'), - ('panel', 'db_version', '201607140'); + ('panel', 'db_version', '201607210'); DROP TABLE IF EXISTS `panel_tasks`; diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 6deec65d..6bacb52b 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -3402,3 +3402,12 @@ if (isFroxlorVersion('0.9.36')) { updateToVersion('0.9.37-rc1'); } + +if (isDatabaseVersion('201607140')) { + + showUpdateStep("Adding new setting to hide certain options in customer panel"); + Settings::AddNew("panel.customer_hide_options", ""); + lastStepStatus(0); + + updateToDbVersion('201607210'); +} diff --git a/lib/version.inc.php b/lib/version.inc.php index ada557e4..ab7a59d4 100644 --- a/lib/version.inc.php +++ b/lib/version.inc.php @@ -19,7 +19,7 @@ $version = '0.9.37-rc1'; // Database version (YYYYMMDDC where C is a daily counter) -$dbversion = '201607140'; +$dbversion = '201607210'; // Distribution branding-tag (used for Debian etc.) $branding = ''; diff --git a/lng/english.lng.php b/lng/english.lng.php index 835aeaae..f699776a 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -374,6 +374,14 @@ $lng['serversettings']['nameservers']['description'] = 'A comma separated list c $lng['serversettings']['mxservers']['title'] = 'MX servers'; $lng['serversettings']['mxservers']['description'] = 'A comma separated list containing a pair of a number and a hostname separated by whitespace (e.g. \'10 mx.example.com\') containing the mx servers.'; +/** + * Added in froxlor 0.9.7-rc1 + **/ + +$lng['serversettings']['panel_customer_hide_options']['title'] = 'Hide certain options in customer panel'; +$lng['serversettings']['panel_customer_hide_options']['description'] = 'Select options to hide in customer panel. To select multiple options, hold down CTRL while selecting.'; + + /** * CHANGED BETWEEN 1.2.12 and 1.2.13 */ diff --git a/lng/german.lng.php b/lng/german.lng.php index c8bdd0f0..9b9f6165 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -371,6 +371,14 @@ $lng['serversettings']['nameservers']['description'] = 'Eine durch Komma getrenn $lng['serversettings']['mxservers']['title'] = 'MX-Server'; $lng['serversettings']['mxservers']['description'] = 'Eine durch Komma getrenne Liste, die ein Paar mit einer Nummer und den Hostnamen einen MX-Servers, getrennt durch ein Leerzeichen, enthält (z. B. \'10 mx.example.tld\').'; +/** + * Added in froxlor 0.9.7-rc1 + **/ + +$lng['serversettings']['panel_customer_hide_options']['title'] = 'Optionen im Kundenbereich ausblenden'; +$lng['serversettings']['panel_customer_hide_options']['description'] = 'Wählen Sie hier die gewünschten Optionen aus, welche im Kundenbereich ausgeblendet werden sollen. Für Mehrfachauswahl, halten Sie während der Auswahl STRG gedrückt.'; + + /** * CHANGED BETWEEN 1.2.12 and 1.2.13 */