From a695e1741ed410242f608f462bb85424f1c3edfd Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Sun, 31 Jul 2022 22:57:10 +0200 Subject: [PATCH 01/24] Add control over GoAccess DB storage --- .../sql/incremental/upd_dev_collection.sql | 1 + install/sql/ispconfig3.sql | 1 + .../web/sites/form/web_vhost_domain.tform.php | 12 ++++++ .../sites/lib/lang/ar_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/bg_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/br_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/ca_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/cz_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/de_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/dk_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/el_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/en_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/es_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/fi_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/fr_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/hr_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/hu_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/id_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/it_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/ja_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/nl_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/pl_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/pt_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/ro_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/ru_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/se_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/sk_web_vhost_domain.lng | 3 ++ .../sites/lib/lang/tr_web_vhost_domain.lng | 3 ++ .../templates/web_vhost_domain_stats.htm | 30 +++++++++++++ .../lib/classes/cron.d/150-goaccess.inc.php | 43 +++++++++++-------- 30 files changed, 144 insertions(+), 18 deletions(-) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index c99596926b..c282f2fa74 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -1 +1,2 @@ ALTER TABLE `sys_user` ADD `otp_type` SET('none', 'email') NOT NULL DEFAULT 'none' AFTER `lost_password_reqtime`, ADD `otp_data` VARCHAR(255) NULL AFTER `otp_type`, ADD `otp_recovery` VARCHAR(64) NULL AFTER `otp_data`, ADD `otp_attempts` TINYINT NOT NULL DEFAULT '0' AFTER `otp_recovery`; +ALTER TABLE `web_domain` ADD `statsdb_retention` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `log_retention`; diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index cf340bda01..de6e945cd7 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -2037,6 +2037,7 @@ CREATE TABLE `web_domain` ( `https_port` int(11) unsigned NOT NULL DEFAULT '443', `folder_directive_snippets` text, `log_retention` int(11) NOT NULL DEFAULT '10', + `statsdb_retention` int(11) UNSIGNED NOT NULL DEFAULT 0, `proxy_protocol` enum('n','y') NOT NULL default 'n', `server_php_id` INT(11) UNSIGNED NOT NULL DEFAULT 0, `jailkit_chroot_app_sections` mediumtext NULL DEFAULT NULL, diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php index 5c26f8254d..d77fb051af 100644 --- a/interface/web/sites/form/web_vhost_domain.tform.php +++ b/interface/web/sites/form/web_vhost_domain.tform.php @@ -633,6 +633,18 @@ $form["tabs"]['stats'] = array ( 'default' => 'awstats', 'value' => array('awstats' => 'AWStats', 'goaccess' => 'GoAccess', 'webalizer' => 'Webalizer','' => 'None') ), + 'statsdb_retention' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'REGEX', + 'regex' => '/^([0-9]{1,4})$/', + 'errmsg'=> 'statsdb_retention_error_regex'), + ), + 'default' => '0', + 'value' => '', + 'width' => '4', + 'maxlength' => '4' + ), //################################# // END Datatable fields //################################# diff --git a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng index ab8c2b2520..750a2b477c 100644 --- a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng index 14b4a4b0b1..f9c29a04a7 100644 --- a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/br_web_vhost_domain.lng b/interface/web/sites/lib/lang/br_web_vhost_domain.lng index 5bc8b5db7f..7ecdd61f9a 100644 --- a/interface/web/sites/lib/lang/br_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/br_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'Quando vazio, usa aplicativos $wb['delete_unused_jailkit_txt'] = 'Remover chroot Jailkit sem uso'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Remover o ambiente chroot Jailkit quando não há usuários Shell ou tarefas do cron que o requeiram.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng index 050338e77b..049cc81007 100644 --- a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng index c46d90c12b..42d1bd55d1 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain.lng b/interface/web/sites/lib/lang/de_web_vhost_domain.lng index e99e1eebcb..af4c9d6836 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage Aufbewahrung'; +$wb['statsdb_retention_error_regex'] = 'Aufbewahrungszeit in Tagen (erlaubte Werte: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Behält die letzte angegebene Anzahl von Tagen im GoAccess Storage. Dadurch werden die GoAccess-Speichertabellen wiederverwendet, z. B. werden nur die letzten 7 Tage aufbewahrt. Der Wert "0" löscht diese Daten nicht und lässt diese für immer im GoAccess Storage.'; diff --git a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng index 4a11c506b7..e92585fcdb 100644 --- a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng index 7982767973..ac3681608a 100644 --- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain.lng b/interface/web/sites/lib/lang/en_web_vhost_domain.lng index 9220220ec4..f3e6b6873f 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_domain.lng @@ -207,3 +207,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/es_web_vhost_domain.lng b/interface/web/sites/lib/lang/es_web_vhost_domain.lng index 587c3b9b47..37ee6a12bc 100644 --- a/interface/web/sites/lib/lang/es_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/es_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng index ceda787e69..9cf4923050 100644 --- a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng index 4e74ee0eb9..6af29bee8f 100644 --- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng index ec1d62d2e2..cf6381167c 100644 --- a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng index c5ff589363..59300069da 100644 --- a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/id_web_vhost_domain.lng b/interface/web/sites/lib/lang/id_web_vhost_domain.lng index b085c246fd..0e879bde23 100644 --- a/interface/web/sites/lib/lang/id_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/id_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/it_web_vhost_domain.lng b/interface/web/sites/lib/lang/it_web_vhost_domain.lng index 3e036a7748..146cf12cc9 100644 --- a/interface/web/sites/lib/lang/it_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/it_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'Se vuota, usa la sezione Jailk $wb['delete_unused_jailkit_txt'] = 'Cancella jailkit chroot non usate'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Cancella l\'ambiente jailkit chroot quando non sono presenti utenti della shell o job cron che lo richiedono.'; $wb['ssl_options_not_for_le_txt'] = 'Hai abilitato i certificati Let\'Encrypt per questo sito Web. Considera che tutte le opzioni di questa pagina si applicano a ai certificati non Let\'Encrypt solamente. Ricorda di deselezionare l\'opzione Let\'s Encrypt nella scheda principale se vuoi passare ad certificato differente.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng index 0ffa0a9c23..37a252818d 100644 --- a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng index 0cf3cb726c..24acbe477d 100644 --- a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng index 3e383505bc..f27608b8aa 100644 --- a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng index fe5b29be92..581dc95bf7 100644 --- a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng index 218e104833..c35f8a5c32 100644 --- a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng index 11e947b412..81f159a95b 100644 --- a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain.lng b/interface/web/sites/lib/lang/se_web_vhost_domain.lng index 5edba1fe9e..ca8403417f 100644 --- a/interface/web/sites/lib/lang/se_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/se_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng index e7d6b1f45b..b4d75e2437 100644 --- a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng @@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng index 1228e81c7d..5aaab54735 100644 --- a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng @@ -204,3 +204,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; +$wb['statsdb_retention_txt'] = 'DB-Storage retention'; +$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; diff --git a/interface/web/sites/templates/web_vhost_domain_stats.htm b/interface/web/sites/templates/web_vhost_domain_stats.htm index 153262987c..b80c1478fc 100644 --- a/interface/web/sites/templates/web_vhost_domain_stats.htm +++ b/interface/web/sites/templates/web_vhost_domain_stats.htm @@ -47,6 +47,12 @@ +
+ +
+
{tmpl_var name='statsdb_retention_about_txt'}
+
+ @@ -54,3 +60,27 @@ + + + + + diff --git a/server/lib/classes/cron.d/150-goaccess.inc.php b/server/lib/classes/cron.d/150-goaccess.inc.php index 2d2c262ff2..83a996de71 100644 --- a/server/lib/classes/cron.d/150-goaccess.inc.php +++ b/server/lib/classes/cron.d/150-goaccess.inc.php @@ -56,7 +56,7 @@ class cronjob_goaccess extends cronjob { // Create goaccess statistics //###################################################################################################### - $sql = "SELECT domain_id, sys_groupid, domain, document_root, web_folder, type, system_user, system_group, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain' or type = 'vhostalias') and stats_type = 'goaccess' AND server_id = ?"; + $sql = "SELECT domain_id, sys_groupid, domain, document_root, web_folder, statsdb_retention, type, system_user, system_group, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain' or type = 'vhostalias') and stats_type = 'goaccess' AND server_id = ?"; $records = $app->db->queryAllRecords($sql, $conf['server_id']); $web_config = $app->getconf->get_server_config($conf['server_id'], 'web'); @@ -130,17 +130,17 @@ class cronjob_goaccess extends cronjob { unset($content); } - $username = $rec['system_user']; - $groupname = $rec['system_group']; - $docroot = $rec['document_root']; + $username = $rec['system_user']; + $groupname = $rec['system_group']; + $docroot = $rec['document_root']; if(!@is_dir($statsdir)) $app->system->mkdirpath($statsdir, 0755, $username, $groupname); - $goa_db_dir = $docroot.'/log/goaccess_db'; + $goa_db_dir = $docroot.'/log/goaccess_db'; $output_html = $docroot.'/'.$web_folder.'/stats/goaindex.html'; - if(!@is_dir($goa_db_dir)) $app->system->mkdirpath($goa_db_dir); + if(!@is_dir($goa_db_dir)) $app->system->mkdirpath($goa_db_dir); - if(is_link('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log')) $app->system->unlink('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log'); + if(is_link('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log')) $app->system->unlink('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log'); symlink($logfile, '/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log'); $app->system->exec_safe('chown -R ?:? ?', $username, $groupname, $statsdir); @@ -194,7 +194,14 @@ class cronjob_goaccess extends cronjob { $lang_query = "SELECT country,language FROM client WHERE client_id = ?"; $lang_user = $app->db->queryOneRecord($lang_query, $rec_user['client_id']); $cust_lang = $lang_user['language']."_".strtoupper($lang_user['language']).".UTF-8"; - + $statsdb_retention = $rec['statsdb_retention']; + + if($statsdb_retention > 0) { + $keep_last = "--keep-last=" . $statsdb_retention; + } else { + $keep_last = "--keep-last=0"; + } + switch($lang_user['language']) { case 'en': @@ -203,9 +210,9 @@ class cronjob_goaccess extends cronjob { case 'br': $cust_lang = 'pt_BR.UTF-8'; break; - case 'pt': - $cust_lang = 'pt_BR.UTF-8'; - break; + case 'pt': + $cust_lang = 'pt_BR.UTF-8'; + break; case 'ca': $cust_lang = 'en_US.UTF-8'; break; @@ -230,22 +237,22 @@ class cronjob_goaccess extends cronjob { } - /* - * GoAccess removed with 1.4 B+Tree support and supports from this version on only "In-Memory with On-Disk Persistance Storage". - * For versions prior 1.4 you need GoAccess with B+Tree support compiled! - */ + /* + GoAccess removed with 1.4 B+Tree support and supports from this version on only "In-Memory with On-Disk Persistance Storage". + For versions prior 1.4 you need GoAccess with B+Tree support compiled! + */ if(version_compare($goaccess_version,1.4) >= 0) { - $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --restore --persist --db-path=? --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html); + $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --restore --persist --db-path=? ? --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $keep_last, $output_html); } else { $output = $app->system->system_safe('goaccess --help 2>&1'); preg_match('/keep-db-files/', $output, $match); if($match[0] == "keep-db-files") { $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --load-from-disk --keep-db-files --db-path=? --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html); } else { - $app->log("Stats couldn't be generated. The GoAccess binary wasn't compiled with B+Tree support. Please recompile/reinstall GoAccess with B+Tree support, or install GoAccess version >= 1.4! (recommended)", LOGLEVEL_ERROR); + $app->log("Stats couldn't be generated. The GoAccess binary wasn't compiled with B+Tree support. Please recompile/reinstall GoAccess with B+Tree support, or install GoAccess version >= 1.4! (recommended)", LOGLEVEL_WARNING); } - unset($output); + unset($output); } unset($cust_lang); -- GitLab From 6731f086a9f4ee1b855a0007c308ae88137365d0 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Mon, 1 Aug 2022 10:02:48 +0200 Subject: [PATCH 02/24] update branch --- server/lib/classes/cron.d/150-goaccess.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/lib/classes/cron.d/150-goaccess.inc.php b/server/lib/classes/cron.d/150-goaccess.inc.php index 83a996de71..ac3f33e414 100644 --- a/server/lib/classes/cron.d/150-goaccess.inc.php +++ b/server/lib/classes/cron.d/150-goaccess.inc.php @@ -199,7 +199,9 @@ class cronjob_goaccess extends cronjob { if($statsdb_retention > 0) { $keep_last = "--keep-last=" . $statsdb_retention; } else { - $keep_last = "--keep-last=0"; + //$keep_last = "--keep-last=0"; + $keep_last = ""; + } switch($lang_user['language']) -- GitLab From f5f280a721c60cf37f5d7560ffd27825ef7eea37 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 2 Aug 2022 15:53:29 +0200 Subject: [PATCH 03/24] reformat goaccess cronjob and add statsdb_retention column to remote api --- interface/lib/classes/remote.d/sites.inc.php | 9 +- .../lib/classes/cron.d/150-goaccess.inc.php | 176 +++++++++--------- 2 files changed, 92 insertions(+), 93 deletions(-) diff --git a/interface/lib/classes/remote.d/sites.inc.php b/interface/lib/classes/remote.d/sites.inc.php index 10fc028e64..526361e03e 100644 --- a/interface/lib/classes/remote.d/sites.inc.php +++ b/interface/lib/classes/remote.d/sites.inc.php @@ -432,6 +432,7 @@ class remoting_sites extends remoting { if($params['system_user'] == '') $params['system_user'] = '-'; if($params['system_group'] == '') $params['system_group'] = '-'; if($params['log_retention'] == '') $params['log_retention'] = 30; + if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -454,6 +455,7 @@ class remoting_sites extends remoting { } if($params['log_retention'] == '') $params['log_retention'] = 30; + if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -505,7 +507,8 @@ class remoting_sites extends remoting { if($params['document_root'] == '') $params['document_root'] = '-'; if($params['system_user'] == '') $params['system_user'] = '-'; if($params['system_group'] == '') $params['system_group'] = '-'; - if($params['log_retention'] == '') $params['log_retention'] = 30; + if($params['log_retention'] == '') $params['log_retention'] = 30 + if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0;; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -525,7 +528,8 @@ class remoting_sites extends remoting { return false; } - if($params['log_retention'] == '') $params['log_retention'] = 30; + if($params['log_retention'] == '') $params['log_retention'] = 30 + if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0;; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -598,6 +602,7 @@ class remoting_sites extends remoting { } if($params['log_retention'] == '') $params['log_retention'] = 30; + if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; diff --git a/server/lib/classes/cron.d/150-goaccess.inc.php b/server/lib/classes/cron.d/150-goaccess.inc.php index ac3f33e414..c21555a6d2 100644 --- a/server/lib/classes/cron.d/150-goaccess.inc.php +++ b/server/lib/classes/cron.d/150-goaccess.inc.php @@ -58,68 +58,69 @@ class cronjob_goaccess extends cronjob { $sql = "SELECT domain_id, sys_groupid, domain, document_root, web_folder, statsdb_retention, type, system_user, system_group, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain' or type = 'vhostalias') and stats_type = 'goaccess' AND server_id = ?"; $records = $app->db->queryAllRecords($sql, $conf['server_id']); + $goaccess_conf_main = null; $web_config = $app->getconf->get_server_config($conf['server_id'], 'web'); - if(is_array($records) && !empty($records)) { + if (is_array($records) && !empty($records)) { - /* Check if goaccess binary is in path/installed */ - if($app->system->is_installed('goaccess')) { + /* Check if goaccess binary is in path/installed */ + if ($app->system->is_installed('goaccess')) { - $goaccess_conf_locs = array('/etc/goaccess.conf', '/etc/goaccess/goaccess.conf'); - $count = 0; + $goaccess_conf_locs = array('/etc/goaccess.conf', '/etc/goaccess/goaccess.conf'); + $count = 0; - foreach($goaccess_conf_locs as $goa_loc) { - if(is_file($goa_loc) && (filesize($goa_loc) > 0)) { - $goaccess_conf_main = $goa_loc; - break; - } else { - $count++; - if($count == 2) { - $app->log("No GoAccess base config found. Make sure that GoAccess is installed and that the goaccess.conf does exist in /etc or /etc/goaccess", LOGLEVEL_ERROR); - } - } - } + foreach ($goaccess_conf_locs as $goa_loc) { + if (is_file($goa_loc) && (filesize($goa_loc) > 0)) { + $goaccess_conf_main = $goa_loc; + break; + } else { + $count++; + if ($count == 2) { + $app->log("No GoAccess base config found. Make sure that GoAccess is installed and that the goaccess.conf does exist in /etc or /etc/goaccess", LOGLEVEL_ERROR); + } + } + } - foreach($records as $rec) { + foreach ($records as $rec) { $yesterday = date('Ymd', strtotime("-1 day", time())); - + $log_folder = 'log'; - - if($rec['type'] == 'vhostsubdomain' || $rec['type'] == 'vhostalias') { + + if ($rec['type'] == 'vhostsubdomain' || $rec['type'] == 'vhostalias') { $tmp = $app->db->queryOneRecord('SELECT `domain` FROM web_domain WHERE domain_id = ?', $rec['parent_domain_id']); $subdomain_host = preg_replace('/^(.*)\.' . preg_quote($tmp['domain'], '/') . '$/', '$1', $rec['domain']); - if($subdomain_host == '') $subdomain_host = 'web'.$rec['domain_id']; + if ($subdomain_host == '') $subdomain_host = 'web' . $rec['domain_id']; $log_folder .= '/' . $subdomain_host; unset($tmp); } - $logfile = $rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log'; + $logfile = $rec['document_root'] . '/' . $log_folder . '/' . $yesterday . '-access.log'; - if(!@is_file($logfile)) { - $logfile = $rec['document_root'].'/' . $log_folder . '/'.$yesterday.'-access.log.gz'; - if(!@is_file($logfile)) { + if (!@is_file($logfile)) { + $logfile = $rec['document_root'] . '/' . $log_folder . '/' . $yesterday . '-access.log.gz'; + if (!@is_file($logfile)) { continue; } } $web_folder = (($rec['type'] == 'vhostsubdomain' || $rec['type'] == 'vhostalias') ? $rec['web_folder'] : 'web'); $domain = $rec['domain']; - $statsdir = $rec['document_root'].'/'.$web_folder.'/stats'; - $goaccess_conf = $rec['document_root'].'/log/goaccess.conf'; + $statsdir = $rec['document_root'] . '/' . $web_folder . '/stats'; + $goaccess_conf = $rec['document_root'] . '/' . $log_folder . '/goaccess.conf'; /* - In case that you use a different log format, you should use a custom goaccess.conf which you'll have to put into /usr/local/ispconfig/server/conf-custom/. + In case that you use a different log format, you should use a custom goaccess.conf which you'll have to put in /usr/local/ispconfig/server/conf-custom/. By default the originally, with GoAccess shipped goaccess.conf from /etc/ or /etc/goaccess will be used along with the log-format value COMBINED. */ - if(file_exists("/usr/local/ispconfig/server/conf-custom/goaccess.conf.master") && (!file_exists($goaccess_conf))) { + if (file_exists("/usr/local/ispconfig/server/conf-custom/goaccess.conf.master") && (!file_exists($goaccess_conf))) { $app->system->copy("/usr/local/ispconfig/server/conf-custom/goaccess.conf.master", $goaccess_conf); - } elseif(!file_exists($goaccess_conf)) { + } elseif (!file_exists($goaccess_conf)) { /* - By default the goaccess.conf should get copied by the webserver plugin but in case it wasn't, or it got deleted by accident we gonna copy it again to the destination dir. + By default the goaccess.conf should get copied by the webserver plugin but in case it wasn't, or it got accidently deleted we going to copy it again to the destination dir. Also there was no /usr/local/ispconfig/server/conf-custom/goaccess.conf.master, so we gonna use /etc/goaccess.conf or /etc/goaccess/goaccess.conf as the base conf. */ @@ -130,43 +131,43 @@ class cronjob_goaccess extends cronjob { unset($content); } - $username = $rec['system_user']; - $groupname = $rec['system_group']; - $docroot = $rec['document_root']; + $username = $rec['system_user']; + $groupname = $rec['system_group']; + $docroot = $rec['document_root']; - if(!@is_dir($statsdir)) $app->system->mkdirpath($statsdir, 0755, $username, $groupname); + if (!@is_dir($statsdir)) $app->system->mkdirpath($statsdir, 0755, $username, $groupname); - $goa_db_dir = $docroot.'/log/goaccess_db'; - $output_html = $docroot.'/'.$web_folder.'/stats/goaindex.html'; - if(!@is_dir($goa_db_dir)) $app->system->mkdirpath($goa_db_dir); - - if(is_link('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log')) $app->system->unlink('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log'); + $goa_db_dir = $docroot . '/log/goaccess_db'; + $output_html = $docroot . '/' . $web_folder . '/stats/goaindex.html'; + if (!@is_dir($goa_db_dir)) $app->system->mkdirpath($goa_db_dir); - symlink($logfile, '/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log'); + if (is_link('/var/log/ispconfig/httpd/' . $domain . '/yesterday-access.log')) $app->system->unlink('/var/log/ispconfig/httpd/' . $domain . '/yesterday-access.log'); + + symlink($logfile, '/var/log/ispconfig/httpd/' . $domain . '/yesterday-access.log'); $app->system->exec_safe('chown -R ?:? ?', $username, $groupname, $statsdir); - + $goamonth = date("n"); $goayear = date("Y"); if (date("d") == 1) { - $goamonth = date("m")-1; + $goamonth = date("m") - 1; if (date("m") == 1) { - $goayear = date("Y")-1; + $goayear = date("Y") - 1; $goamonth = "12"; } } if (date("d") == 2) { - $goamonth = date("m")-1; + $goamonth = date("m") - 1; if (date("m") == 1) { - $goayear = date("Y")-1; + $goayear = date("Y") - 1; $goamonth = "12"; } - - $statsdirold = $statsdir."/".$goayear."-".$goamonth."/"; - - if(!is_dir($statsdirold)) { - $app->system->mkdirpath($statsdirold, 0755, $username, $groupname); + + $statsdirold = $statsdir . "/" . $goayear . "-" . $goamonth . "/"; + + if (!is_dir($statsdirold)) { + $app->system->mkdirpath($statsdirold, 0755, $username, $groupname); } $files = scandir($statsdir); @@ -175,16 +176,15 @@ class cronjob_goaccess extends cronjob { } foreach ($files as $file) { - if (substr($file, 0, 1) != "." && !is_dir("$statsdir"."/"."$file") && substr($file, 0, 1) != "w" && substr($file, 0, 1) != "i") $app->system->move("$statsdir"."/"."$file", "$statsdirold"."$file"); + if (substr($file, 0, 1) != "." && !is_dir("$statsdir" . "/" . "$file") && substr($file, 0, 1) != "w" && substr($file, 0, 1) != "i") $app->system->move("$statsdir" . "/" . "$file", "$statsdirold" . "$file"); } } // Get the GoAccess version $match = array(); - $goaccess_version = $app->system->system_safe('goaccess --version 2>&1'); - if(preg_match('/[0-9]\.[0-9]{1,2}/', $goaccess_version, $match)) { + if (preg_match('/[0-9]\.[0-9]{1,2}/', $goaccess_version, $match)) { $goaccess_version = $match[0]; } @@ -193,28 +193,25 @@ class cronjob_goaccess extends cronjob { $rec_user = $app->db->queryOneRecord($sql_user, $rec['sys_groupid']); $lang_query = "SELECT country,language FROM client WHERE client_id = ?"; $lang_user = $app->db->queryOneRecord($lang_query, $rec_user['client_id']); - $cust_lang = $lang_user['language']."_".strtoupper($lang_user['language']).".UTF-8"; + $cust_lang = $lang_user['language'] . "_" . strtoupper($lang_user['language']) . ".UTF-8"; $statsdb_retention = $rec['statsdb_retention']; - - if($statsdb_retention > 0) { - $keep_last = "--keep-last=" . $statsdb_retention; - } else { - //$keep_last = "--keep-last=0"; - $keep_last = ""; + if ($statsdb_retention > 0) { + $keep_last = "--keep-last=" . $statsdb_retention; + } else { + $keep_last = null; } - - switch($lang_user['language']) - { + + switch ($lang_user['language']) { case 'en': $cust_lang = 'en_UK.UTF-8'; break; case 'br': $cust_lang = 'pt_BR.UTF-8'; break; - case 'pt': - $cust_lang = 'pt_BR.UTF-8'; - break; + case 'pt': + $cust_lang = 'pt_BR.UTF-8'; + break; case 'ca': $cust_lang = 'en_US.UTF-8'; break; @@ -239,22 +236,22 @@ class cronjob_goaccess extends cronjob { } - /* - GoAccess removed with 1.4 B+Tree support and supports from this version on only "In-Memory with On-Disk Persistance Storage". - For versions prior 1.4 you need GoAccess with B+Tree support compiled! - */ + /* + GoAccess removed with 1.4 B+Tree support and supports from this version on only "In-Memory with On-Disk Persistance Storage". + For versions prior 1.4 you need GoAccess with B+Tree support compiled! + */ - if(version_compare($goaccess_version,1.4) >= 0) { - $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --restore --persist --db-path=? ? --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $keep_last, $output_html); + if (version_compare($goaccess_version, 1.4) >= 0) { + $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --restore --persist --db-path=? " . $keep_last . " --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html); } else { $output = $app->system->system_safe('goaccess --help 2>&1'); preg_match('/keep-db-files/', $output, $match); - if($match[0] == "keep-db-files") { + if ($match[0] == "keep-db-files") { $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --load-from-disk --keep-db-files --db-path=? --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html); } else { - $app->log("Stats couldn't be generated. The GoAccess binary wasn't compiled with B+Tree support. Please recompile/reinstall GoAccess with B+Tree support, or install GoAccess version >= 1.4! (recommended)", LOGLEVEL_WARNING); + $app->log("Stats couldn't be generated. The GoAccess binary wasn't compiled with B+Tree support. Please recompile/reinstall GoAccess with B+Tree support, or install GoAccess version >= 1.4! (recommended)", LOGLEVEL_WARN); } - unset($output); + unset($output); } unset($cust_lang); @@ -262,28 +259,28 @@ class cronjob_goaccess extends cronjob { unset($rec_user); unset($lang_query); unset($lang_user); - - if(!is_file($rec['document_root']."/".$web_folder."/stats/index.php")) { - if(file_exists("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master")) { - $app->system->copy("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master", $rec['document_root']."/".$web_folder."/stats/index.php"); + unset($keep_last); + + if (!is_file($rec['document_root'] . "/" . $web_folder . "/stats/index.php")) { + if (file_exists("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master")) { + $app->system->copy("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master", $rec['document_root'] . "/" . $web_folder . "/stats/index.php"); } else { - $app->system->copy("/usr/local/ispconfig/server/conf/goaccess_index.php.master", $rec['document_root']."/".$web_folder."/stats/index.php"); + $app->system->copy("/usr/local/ispconfig/server/conf/goaccess_index.php.master", $rec['document_root'] . "/" . $web_folder . "/stats/index.php"); } } - $app->log('Created GoAccess statistics for ' . $domain, LOGLEVEL_DEBUG); - if(is_file($rec['document_root']."/".$web_folder."/stats/index.php")) { - $app->system->chown($rec['document_root']."/".$web_folder."/stats/index.php", $rec['system_user']); - $app->system->chgrp($rec['document_root']."/".$web_folder."/stats/index.php", $rec['system_group']); - } + $app->log('Created GoAccess statistics for ' . $domain, LOGLEVEL_DEBUG); + if (is_file($rec['document_root'] . "/" . $web_folder . "/stats/index.php")) { + $app->system->chown($rec['document_root'] . "/" . $web_folder . "/stats/index.php", $rec['system_user']); + $app->system->chgrp($rec['document_root'] . "/" . $web_folder . "/stats/index.php", $rec['system_group']); + } $app->system->exec_safe('chown -R ?:? ?', $username, $groupname, $statsdir); } } else { $app->log("Stats couldn't be generated. The GoAccess binary couldn't be found. Make sure that GoAccess is installed and that it is in \$PATH", LOGLEVEL_ERROR); } - - } + } parent::onRunJob(); } @@ -294,7 +291,4 @@ class cronjob_goaccess extends cronjob { parent::onAfterRun(); } - } - -?> -- GitLab From 05e452d9330680ec61c9e062514f89ec44ecd544 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 2 Aug 2022 16:24:06 +0200 Subject: [PATCH 04/24] fix semicolons --- interface/lib/classes/remote.d/sites.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/lib/classes/remote.d/sites.inc.php b/interface/lib/classes/remote.d/sites.inc.php index 526361e03e..05e21bd169 100644 --- a/interface/lib/classes/remote.d/sites.inc.php +++ b/interface/lib/classes/remote.d/sites.inc.php @@ -507,8 +507,8 @@ class remoting_sites extends remoting { if($params['document_root'] == '') $params['document_root'] = '-'; if($params['system_user'] == '') $params['system_user'] = '-'; if($params['system_group'] == '') $params['system_group'] = '-'; - if($params['log_retention'] == '') $params['log_retention'] = 30 - if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0;; + if($params['log_retention'] == '') $params['log_retention'] = 30; + if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; -- GitLab From 708fe6a2fda4a6a28f07fa618fdc5030093bf9e6 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 2 Aug 2022 16:36:17 +0200 Subject: [PATCH 05/24] more copy-pasta fixes --- interface/lib/classes/remote.d/sites.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/lib/classes/remote.d/sites.inc.php b/interface/lib/classes/remote.d/sites.inc.php index 05e21bd169..a9261fae5a 100644 --- a/interface/lib/classes/remote.d/sites.inc.php +++ b/interface/lib/classes/remote.d/sites.inc.php @@ -528,8 +528,8 @@ class remoting_sites extends remoting { return false; } - if($params['log_retention'] == '') $params['log_retention'] = 30 - if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0;; + if($params['log_retention'] == '') $params['log_retention'] = 30; + if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -582,6 +582,7 @@ class remoting_sites extends remoting { if($params['system_user'] == '') $params['system_user'] = '-'; if($params['system_group'] == '') $params['system_group'] = '-'; if($params['log_retention'] == '') $params['log_retention'] = 30; + if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; -- GitLab From 9828141a253118935f5cc22e4b44e2b019fc16dd Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Sun, 7 Aug 2022 14:00:54 +0200 Subject: [PATCH 06/24] Also update html-report-title if goaccess.conf was removed and recopied --- server/lib/classes/cron.d/150-goaccess.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/server/lib/classes/cron.d/150-goaccess.inc.php b/server/lib/classes/cron.d/150-goaccess.inc.php index c21555a6d2..a6c0b287d6 100644 --- a/server/lib/classes/cron.d/150-goaccess.inc.php +++ b/server/lib/classes/cron.d/150-goaccess.inc.php @@ -127,6 +127,7 @@ class cronjob_goaccess extends cronjob { $app->system->copy($goaccess_conf_main, $goaccess_conf); $content = $app->system->file_get_contents($goaccess_conf, true); $content = preg_replace('/^(#)?log-format COMBINED/m', "log-format COMBINED", $content); + $content = preg_replace('/^(#)?html-report-title(.*)/m', "html-report-title $domain", $content); $app->system->file_put_contents($goaccess_conf, $content, true); unset($content); } -- GitLab From f36bb46535528244355928b3646ef4497caa6c92 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Wed, 10 Aug 2022 12:19:40 +0200 Subject: [PATCH 07/24] - Reworked interface part - Added optional enforcement of a max retention period via client template - Added anonymize-ip option --- .../sql/incremental/upd_dev_collection.sql | 3 + install/sql/ispconfig3.sql | 3 + .../validate_statsdb_retention.inc.php | 81 ++++++ interface/web/client/form/client.tform.php | 14 + .../web/client/form/client_template.tform.php | 17 +- interface/web/client/lib/lang/ar_client.lng | 1 + .../client/lib/lang/ar_client_template.lng | 1 + interface/web/client/lib/lang/bg_client.lng | 1 + .../client/lib/lang/bg_client_template.lng | 1 + interface/web/client/lib/lang/br_client.lng | 1 + .../client/lib/lang/br_client_template.lng | 1 + interface/web/client/lib/lang/ca_client.lng | 1 + .../client/lib/lang/ca_client_template.lng | 1 + interface/web/client/lib/lang/cz_client.lng | 1 + .../client/lib/lang/cz_client_template.lng | 1 + interface/web/client/lib/lang/de_client.lng | 1 + .../client/lib/lang/de_client_template.lng | 1 + interface/web/client/lib/lang/dk_client.lng | 1 + .../client/lib/lang/dk_client_template.lng | 1 + interface/web/client/lib/lang/el_client.lng | 1 + .../client/lib/lang/el_client_template.lng | 1 + interface/web/client/lib/lang/en_client.lng | 1 + .../client/lib/lang/en_client_template.lng | 1 + interface/web/client/lib/lang/es_client.lng | 1 + .../client/lib/lang/es_client_template.lng | 1 + interface/web/client/lib/lang/fi_client.lng | 1 + .../client/lib/lang/fi_client_template.lng | 1 + interface/web/client/lib/lang/fr_client.lng | 1 + .../client/lib/lang/fr_client_template.lng | 1 + interface/web/client/lib/lang/hr_client.lng | 1 + .../client/lib/lang/hr_client_template.lng | 1 + interface/web/client/lib/lang/hu_client.lng | 1 + .../client/lib/lang/hu_client_template.lng | 1 + interface/web/client/lib/lang/id_client.lng | 1 + .../client/lib/lang/id_client_template.lng | 1 + interface/web/client/lib/lang/it_client.lng | 239 +++++++++--------- .../client/lib/lang/it_client_template.lng | 139 +++++----- interface/web/client/lib/lang/ja_client.lng | 1 + .../client/lib/lang/ja_client_template.lng | 1 + interface/web/client/lib/lang/nl_client.lng | 1 + .../client/lib/lang/nl_client_template.lng | 1 + interface/web/client/lib/lang/pl_client.lng | 1 + .../client/lib/lang/pl_client_template.lng | 1 + interface/web/client/lib/lang/pt_client.lng | 1 + .../client/lib/lang/pt_client_template.lng | 1 + interface/web/client/lib/lang/ro_client.lng | 1 + .../client/lib/lang/ro_client_template.lng | 1 + interface/web/client/lib/lang/ru_client.lng | 1 + .../client/lib/lang/ru_client_template.lng | 1 + interface/web/client/lib/lang/se_client.lng | 1 + .../client/lib/lang/se_client_template.lng | 1 + interface/web/client/lib/lang/sk_client.lng | 1 + .../client/lib/lang/sk_client_template.lng | 1 + interface/web/client/lib/lang/tr_client.lng | 1 + .../client/lib/lang/tr_client_template.lng | 1 + .../client/templates/client_edit_limits.htm | 7 +- .../web/sites/form/web_vhost_domain.tform.php | 20 +- .../sites/lib/lang/en_web_vhost_domain.lng | 9 +- .../templates/web_vhost_domain_stats.htm | 202 +++++++++------ .../lib/classes/cron.d/150-goaccess.inc.php | 35 ++- 60 files changed, 540 insertions(+), 277 deletions(-) create mode 100644 interface/lib/classes/validate_statsdb_retention.inc.php diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index c282f2fa74..710797a60b 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -1,2 +1,5 @@ ALTER TABLE `sys_user` ADD `otp_type` SET('none', 'email') NOT NULL DEFAULT 'none' AFTER `lost_password_reqtime`, ADD `otp_data` VARCHAR(255) NULL AFTER `otp_type`, ADD `otp_recovery` VARCHAR(64) NULL AFTER `otp_data`, ADD `otp_attempts` TINYINT NOT NULL DEFAULT '0' AFTER `otp_recovery`; ALTER TABLE `web_domain` ADD `statsdb_retention` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `log_retention`; +ALTER TABLE `web_domain` ADD `stats_anonymize_level` INT(11) NOT NULL DEFAULT '0' AFTER `statsdb_retention`; +ALTER TABLE `client` ADD `limit_statsdb_retention` INT(11) NOT NULL DEFAULT '-1' AFTER `limit_openvz_vm_template_id`; +ALTER TABLE `client_template` ADD `limit_statsdb_retention` INT(11) NOT NULL DEFAULT '-1' AFTER `limit_openvz_vm_template_id`; diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index de6e945cd7..1c94ff6c62 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -244,6 +244,7 @@ CREATE TABLE `client` ( `limit_mailmailinglist` int(11) NOT NULL DEFAULT '-1', `limit_openvz_vm` int(11) NOT NULL DEFAULT '0', `limit_openvz_vm_template_id` int(11) NOT NULL DEFAULT '0', + `limit_statsdb_retention` int(11) NOT NULL DEFAULT '-1', `parent_client_id` int(11) unsigned NOT NULL DEFAULT '0', `username` varchar(64) DEFAULT NULL, `password` varchar(200) DEFAULT NULL, @@ -374,6 +375,7 @@ CREATE TABLE `client_template` ( `limit_mailmailinglist` int(11) NOT NULL default '-1', `limit_openvz_vm` int(11) NOT NULL DEFAULT '0', `limit_openvz_vm_template_id` int(11) NOT NULL DEFAULT '0', + `limit_statsdb_retention` int(11) NOT NULL DEFAULT '-1', PRIMARY KEY (`template_id`) ) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -2038,6 +2040,7 @@ CREATE TABLE `web_domain` ( `folder_directive_snippets` text, `log_retention` int(11) NOT NULL DEFAULT '10', `statsdb_retention` int(11) UNSIGNED NOT NULL DEFAULT 0, + `stats_anonymize_level` int(11) NOT NULL DEFAULT 0, `proxy_protocol` enum('n','y') NOT NULL default 'n', `server_php_id` INT(11) UNSIGNED NOT NULL DEFAULT 0, `jailkit_chroot_app_sections` mediumtext NULL DEFAULT NULL, diff --git a/interface/lib/classes/validate_statsdb_retention.inc.php b/interface/lib/classes/validate_statsdb_retention.inc.php new file mode 100644 index 0000000000..19c2678163 --- /dev/null +++ b/interface/lib/classes/validate_statsdb_retention.inc.php @@ -0,0 +1,81 @@ +tform->wordbook[$errmsg])) { + return $app->tform->wordbook[$errmsg]."
\r\n"; + } else { + return $errmsg."
\r\n"; + } + } + + function check_statsdb_value($field_name, $field_value, $validator) { + + global $app; + + $limit_statsdb_retention = null; + + if(!$app->auth->is_admin()) { + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_statsdb_retention FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); + + $retention_value = $_POST['statsdb_retention']; + + if($client['limit_statsdb_retention'] > 0 && $retention_value > $client['limit_statsdb_retention'] || $retention_value <= 0) { + $limit_statsdb_retention_min = 1; + $limit_statsdb_retention_max = $client['limit_statsdb_retention']; + $lng_text = $this->get_error($validator['errmsg']); + $lng_text = str_replace(array('{minimum}', '{maximum}'), array($app->lng($limit_statsdb_retention_min), $app->lng($limit_statsdb_retention_max)), $lng_text); + return $lng_text; + + } else { + return false; + } + + } + + if(!preg_match('/^([0-9]{1,4})$/', $field_value)) { + $limit_statsdb_retention_min = 0; + $limit_statsdb_retention_max = 9999; + $lng_text = $this->get_error($validator['errmsg']); + $lng_text = str_replace(array('{minimum}', '{maximum}'), array($app->lng($limit_statsdb_retention_min), $app->lng($limit_statsdb_retention_max)), $lng_text); + return $lng_text; + } else { + return false; + } + } + + +} + diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 1f60ffe1b4..05e6113fde 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -1290,6 +1290,20 @@ $form["tabs"]['limits'] = array ( 'valuelimit' => 'client:limit_directive_snippets', 'value' => array(0 => 'n', 1 => 'y') ), + 'limit_statsdb_retention' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_statsdb_retention_error_notint'), + ), + 'default' => '0', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), 'default_dnsserver' => array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php index adf72670f8..d4fc8e4ccf 100644 --- a/interface/web/client/form/client_template.tform.php +++ b/interface/web/client/form/client_template.tform.php @@ -701,7 +701,22 @@ $form["tabs"]['limits'] = array ( 'default' => 'n', 'valuelimit' => 'client:limit_directive_snippets', 'value' => array(0 => 'n', 1 => 'y') - ),/* + ), + 'limit_statsdb_retention' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_statsdb_retention_error_notint'), + ), + 'default' => '0', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), + /* 'default_dnsserver' => array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index 8b6ff765c9..b39cfb478d 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng index 464f1426be..187f8b236c 100644 --- a/interface/web/client/lib/lang/ar_client_template.lng +++ b/interface/web/client/lib/lang/ar_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index 233a7c9b27..84cbe78b61 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng index 393af633eb..6793863900 100644 --- a/interface/web/client/lib/lang/bg_client_template.lng +++ b/interface/web/client/lib/lang/bg_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index 58557a3a00..7c552e6b43 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -206,3 +206,4 @@ $wb['email_error_empty'] = 'O email está vazio'; $wb['limit_directive_snippets_txt'] = 'Exibir configurações de seleção do servidor Web'; $wb['Address'] = 'Cliente'; $wb['Limits'] = 'Limites'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng index 92bff5cb06..6428bef042 100644 --- a/interface/web/client/lib/lang/br_client_template.lng +++ b/interface/web/client/lib/lang/br_client_template.lng @@ -128,3 +128,4 @@ $wb['mail_servers_txt'] = 'Servidores de email'; $wb['Limits'] = 'Limites'; $wb['Client-Templates'] = 'Gabaritos de clientes'; $wb['Template'] = 'Gabarito'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/ca_client.lng b/interface/web/client/lib/lang/ca_client.lng index 4482b8f241..eda319df9b 100644 --- a/interface/web/client/lib/lang/ca_client.lng +++ b/interface/web/client/lib/lang/ca_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/ca_client_template.lng b/interface/web/client/lib/lang/ca_client_template.lng index 2a0f6eac45..c56c56e5bd 100644 --- a/interface/web/client/lib/lang/ca_client_template.lng +++ b/interface/web/client/lib/lang/ca_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index 691bac508a..748916098b 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Pro nastavení klikni zde'; $wb['limit_dns_record_error_notint'] = 'Limit DNS záznamů musí být číslo.'; $wb['Address'] = 'Adresa'; $wb['Limits'] = 'Limity'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng index f927e7bffd..e36fb2b99b 100644 --- a/interface/web/client/lib/lang/cz_client_template.lng +++ b/interface/web/client/lib/lang/cz_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webové servery'; $wb['db_servers_txt'] = 'Databázové servery'; $wb['mail_servers_txt'] = 'E-mailové servery'; $wb['Limits'] = 'Limity'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index c75f3263a0..28b30ecef9 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Tage an gespeicherten GoAccess DB-Statistiken'; diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng index f985e19847..d71dc0501c 100644 --- a/interface/web/client/lib/lang/de_client_template.lng +++ b/interface/web/client/lib/lang/de_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Web-Server'; $wb['db_servers_txt'] = 'Datenbank-Server'; $wb['mail_servers_txt'] = 'Mail-Server'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Tage an gespeicherten GoAccess DB-Statistiken'; diff --git a/interface/web/client/lib/lang/dk_client.lng b/interface/web/client/lib/lang/dk_client.lng index c5154dac5d..35c7635034 100644 --- a/interface/web/client/lib/lang/dk_client.lng +++ b/interface/web/client/lib/lang/dk_client.lng @@ -206,3 +206,4 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/dk_client_template.lng b/interface/web/client/lib/lang/dk_client_template.lng index daacc207e4..22f9168dd8 100644 --- a/interface/web/client/lib/lang/dk_client_template.lng +++ b/interface/web/client/lib/lang/dk_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index 373c751a52..de864b8ee1 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng index bd0097b3df..a3ba37bfec 100644 --- a/interface/web/client/lib/lang/el_client_template.lng +++ b/interface/web/client/lib/lang/el_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index acaafeb390..a00a3bd4ee 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -208,3 +208,4 @@ $wb['email_error_empty'] = 'Email is empty'; $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng index ad20fc5699..82296f3fa7 100644 --- a/interface/web/client/lib/lang/en_client_template.lng +++ b/interface/web/client/lib/lang/en_client_template.lng @@ -129,3 +129,4 @@ $wb['xmpp_servers_txt'] = 'XMPP Servers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index d9210b8ec3..d9ed1efdf7 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng index 2099173c19..f1d547d020 100644 --- a/interface/web/client/lib/lang/es_client_template.lng +++ b/interface/web/client/lib/lang/es_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index 68058e1ab5..b3bb65143d 100644 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng index 46ce6e6a8d..99a9c0d88e 100644 --- a/interface/web/client/lib/lang/fi_client_template.lng +++ b/interface/web/client/lib/lang/fi_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index fc96c0d319..8a7fcd9993 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng index 33548deba4..8072bc104a 100644 --- a/interface/web/client/lib/lang/fr_client_template.lng +++ b/interface/web/client/lib/lang/fr_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index ed00a5c520..4b32f60ddc 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng index ce5b3e8ebc..c010c45c46 100644 --- a/interface/web/client/lib/lang/hr_client_template.lng +++ b/interface/web/client/lib/lang/hr_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index 9e6ad94a7b..2616e91274 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng index 74d37e7589..1715ba40d8 100644 --- a/interface/web/client/lib/lang/hu_client_template.lng +++ b/interface/web/client/lib/lang/hu_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng index 47f8971b1f..b4f6da93ce 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng index b4367236f7..238114e0cb 100644 --- a/interface/web/client/lib/lang/id_client_template.lng +++ b/interface/web/client/lib/lang/id_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index 9b2e6492cf..c5011be2bf 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -3,11 +3,11 @@ $wb['limit_maildomain_txt'] = 'Numero massimo di domini di posta'; $wb['limit_mailbox_txt'] = 'Numero massimo di caselle di posta'; $wb['limit_mailalias_txt'] = 'Numero massimo di aliases di posta'; $wb['limit_mailforward_txt'] = 'Numero massimo di forwarders di posta'; -$wb['limit_mailcatchall_txt'] = 'Numero massimo di profili catchall'; +$wb['limit_mailcatchall_txt'] = 'Numero massimo di catchall accounts'; $wb['limit_mailrouting_txt'] = 'Numero massimo di email routes'; $wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries'; $wb['limit_mailfilter_txt'] = 'Numero massimo di email filters'; -$wb['limit_fetchmail_txt'] = 'Numero massimo di profili fetchmail'; +$wb['limit_fetchmail_txt'] = 'Numero massimo di fetchmail accounts'; $wb['limit_mailquota_txt'] = 'Limite quota mailbox'; $wb['limit_spamfilter_wblist_txt'] = 'Numero massimo di filtri spamfilter white / blacklist'; $wb['limit_spamfilter_user_txt'] = 'Numero massimo di utenti spamfilter'; @@ -43,7 +43,7 @@ $wb['limit_subdomain_txt'] = 'limit_subdomain'; $wb['limit_webquota_txt'] = 'limit_webquota'; $wb['limit_database_txt'] = 'Numero massimo database'; $wb['ip_address_txt'] = 'Indirizzi ip'; -$wb['limit_client_error_notint'] = 'Il numero di sub-cliente deve essere un numero.'; +$wb['limit_client_error_notint'] = 'The sub client limit must be a number.'; $wb['firstname_error_empty'] = 'Nome è vuoto.'; $wb['contact_error_empty'] = 'Nome azienda è vuoto.'; $wb['default_webserver_txt'] = 'Webserver predefinito'; @@ -61,95 +61,95 @@ $wb['username_error_unique'] = 'Il nome utente deve essere unico.'; $wb['limit_maildomain_error_notint'] = 'Il limite dei domini email devessere un numero.'; $wb['limit_mailbox_error_notint'] = 'Il limite delle caselle di posta devessere un numero.'; $wb['limit_mailalias_error_notint'] = 'Il limite di email alias deve essere un numero.'; -$wb['limit_mailforward_error_notint'] = 'Il limite delle forward email deve essere un numero.'; -$wb['limit_mailcatchall_error_notint'] = 'Il limite delle mail catchall deve essere un numero.'; -$wb['limit_mailrouting_error_notint'] = 'Il limite di di routing email dve essere un numero.'; -$wb['limit_mail_wblist_error_notint'] = 'Il limite delle liste bianche / nere deve essere un numero.'; -$wb['limit_mailfilter_error_notint'] = 'Il limite di filtri email deve essere un numero.'; -$wb['limit_mailfetchmail_error_notint'] = 'Il limite di fetchmail deve essere un numero.'; -$wb['limit_mailquota_error_notint'] = 'La quota email deve essere un numero.'; -$wb['limit_spamfilter_wblist_error_notint'] = 'Il limite di liste bianche / nere di filtri SPAM deve essere un numero.'; -$wb['limit_spamfilter_user_error_notint'] = 'Il limite di utenti di filtri SPAM deve essere un numero.'; -$wb['limit_spamfilter_policy_error_notint'] = 'Il limite delle politiche di spamfilter deve essere un numero.'; -$wb['limit_web_domain_error_notint'] = 'Il limite di siti web deve essere un numero.'; -$wb['limit_web_aliasdomain_error_notint'] = 'Il limite dei domini web Alias deve essere un numero.'; -$wb['limit_web_subdomain_error_notint'] = 'Il limite dei siti web sottodomini deve essere un numero.'; +$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.'; +$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.'; +$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.'; +$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.'; +$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.'; +$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.'; +$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.'; +$wb['limit_spamfilter_wblist_error_notint'] = 'The spamfilter white / blacklist limit must be a number.'; +$wb['limit_spamfilter_user_error_notint'] = 'The spamfilter user limit must be a number.'; +$wb['limit_spamfilter_policy_error_notint'] = 'The spamfilter policy limit must be a number.'; +$wb['limit_web_domain_error_notint'] = 'The website limit must be a number.'; +$wb['limit_web_aliasdomain_error_notint'] = 'The website alias domain limit must be a number.'; +$wb['limit_web_subdomain_error_notint'] = 'The website subdomain limit must be a number.'; $wb['limit_ftp_user_error_notint'] = 'Il limite degli utenti ftp deve essere un numero.'; $wb['limit_shell_user_error_notint'] = 'Il limite degli utenti shell deve essere un numero.'; $wb['limit_dns_zone_error_notint'] = 'Il limite dei record dns deve essere un numero.'; -$wb['limit_dns_slave_zone_error_notint'] = 'Il limite delle zone DNS slave deve essere un numero.'; +$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.'; $wb['default_dbserver_txt'] = 'Server Database predefinito'; $wb['limit_database_error_notint'] = 'Il limite dei database deve essere un numero.'; $wb['username_error_regex'] = 'Il nome utente contiene caratteri non validi.'; -$wb['password_strength_txt'] = 'Robustezza della Password'; +$wb['password_strength_txt'] = 'Sicurezza della Password'; $wb['template_master_txt'] = 'Principale'; $wb['template_additional_txt'] = 'Aggiuntivo'; -$wb['ssh_chroot_txt'] = 'Opzioni chroot SSH'; -$wb['web_php_options_txt'] = 'Opzioni PHP'; -$wb['limit_cron_txt'] = 'Numero massimo di cron jobs'; -$wb['limit_cron_type_txt'] = 'Massimo tipo di cron jobs (chrooted e completi implica url)'; -$wb['limit_cron_frequency_txt'] = 'Ritardo minimo tra le esecuzioni'; -$wb['limit_cron_error_notint'] = 'Il limite di cron deve essere un numero.'; -$wb['limit_cron_error_frequency'] = 'Il limite di frequenza cron deve essere un numero.'; -$wb['limit_client_error'] = 'Hai raggiunto il numero massimo di clienti.'; -$wb['limit_mailaliasdomain_txt'] = 'Massimo numero di domini Alias'; -$wb['limit_mailaliasdomain_error_notint'] = 'Il numero massimo di domini email alias devve essere un numero.'; +$wb['ssh_chroot_txt'] = 'SSH-Chroot Options'; +$wb['web_php_options_txt'] = 'PHP Options'; +$wb['limit_cron_txt'] = 'Max. number of cron jobs'; +$wb['limit_cron_type_txt'] = 'Max. type of cron jobs (chrooted and full implies url)'; +$wb['limit_cron_frequency_txt'] = 'Min. delay between executions'; +$wb['limit_cron_error_notint'] = 'The cron limit must be a number.'; +$wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.'; +$wb['limit_client_error'] = 'The max. number of clients is reached.'; +$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases'; +$wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must be a number.'; $wb['limit_web_quota_txt'] = 'Quota Web'; $wb['limit_traffic_quota_txt'] = 'Quota Traffico'; -$wb['limit_trafficquota_error_notint'] = 'La quota traffico deve essere un numero.'; -$wb['limit_webdav_user_txt'] = 'Massimo numero di utenti Webdav'; -$wb['limit_webdav_user_error_notint'] = 'Il numero massimo di utenti Webdav deve essere un numero.'; -$wb['customer_no_txt'] = 'n° Cliente'; +$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.'; +$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users'; +$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.'; +$wb['customer_no_txt'] = 'Customer No.'; $wb['vat_id_txt'] = 'P. IVA'; $wb['required_fields_txt'] = '* Campi obbligatori'; -$wb['limit_mailmailinglist_txt'] = 'Massimo numero di mailing lists'; -$wb['limit_mailmailinglist_error_notint'] = 'Il numero di mailing list deve essere un numero.'; +$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; +$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; $wb['company_id_txt'] = 'Azienda/Titolare ID'; $wb['limit_openvz_vm_txt'] = 'Numero massimo server virtuali'; -$wb['limit_openvz_vm_template_id_txt'] = 'Forzare il modello dei server virtuali'; -$wb['limit_openvz_vm_error_notint'] = 'Il limite dei server virtuali deve essere un numero.'; -$wb['web_php_options_notempty'] = 'Nessuna opzione PHP selezionata. Seleziona almeno una opzione PHP.'; -$wb['ssh_chroot_notempty'] = 'Nessuna opzione chroot SSH selezionata. Seleziona almeno una opzione.'; -$wb['username_error_collision'] = 'Il nome utente non può iniziare con la parola -web- o con -web- seguito da un numero.'; -$wb['add_additional_template_txt'] = 'Aggiungi un modello'; -$wb['delete_additional_template_txt'] = 'Elimina un modello'; -$wb['limit_cgi_txt'] = 'CGI disponibile'; -$wb['limit_ssi_txt'] = 'SSI disponibile'; -$wb['limit_perl_txt'] = 'Perl disponibile'; -$wb['limit_ruby_txt'] = 'Ruby disponibile'; -$wb['limit_python_txt'] = 'Python disponibile'; -$wb['force_suexec_txt'] = 'SuEXEC imposto'; -$wb['limit_hterror_txt'] = 'Messaggi di errore personalizzati disponibili'; -$wb['limit_wildcard_txt'] = 'Sottodomini * disponibile'; -$wb['limit_ssl_txt'] = 'SSL disponibile'; -$wb['bank_account_number_txt'] = 'n° Conto corrente bancario'; -$wb['bank_code_txt'] = 'Codice Banca'; -$wb['bank_name_txt'] = 'Nome Banca'; +$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; +$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; +$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one option.'; +$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.'; +$wb['add_additional_template_txt'] = 'Add additional template'; +$wb['delete_additional_template_txt'] = 'Elimina additional template'; +$wb['limit_cgi_txt'] = 'CGI available'; +$wb['limit_ssi_txt'] = 'SSI available'; +$wb['limit_perl_txt'] = 'Perl available'; +$wb['limit_ruby_txt'] = 'Ruby available'; +$wb['limit_python_txt'] = 'Python available'; +$wb['force_suexec_txt'] = 'SuEXEC forced'; +$wb['limit_hterror_txt'] = 'Custom error docs available'; +$wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; +$wb['limit_ssl_txt'] = 'SSL available'; +$wb['bank_account_number_txt'] = 'Bank account no.'; +$wb['bank_code_txt'] = 'Bank code'; +$wb['bank_name_txt'] = 'Bank name'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; -$wb['web_limits_txt'] = 'Limiti Web'; -$wb['email_limits_txt'] = 'Limiti Email'; -$wb['database_limits_txt'] = 'Limiti Database'; -$wb['cron_job_limits_txt'] = 'Limiti Cron Job'; -$wb['dns_limits_txt'] = 'Limiti DNS'; -$wb['virtualization_limits_txt'] = 'Limiti Virtualizzazione'; +$wb['web_limits_txt'] = 'Web Limits'; +$wb['email_limits_txt'] = 'Email Limits'; +$wb['database_limits_txt'] = 'Database Limits'; +$wb['cron_job_limits_txt'] = 'Cron Job Limits'; +$wb['dns_limits_txt'] = 'DNS Limits'; +$wb['virtualization_limits_txt'] = 'Virtualization Limits'; $wb['generate_password_txt'] = 'Genera Password'; $wb['repeat_password_txt'] = 'Ripeti Password'; $wb['password_mismatch_txt'] = 'Le password non coincidono.'; $wb['password_match_txt'] = 'Le password coincidono.'; -$wb['active_template_additional_txt'] = 'Attivo Addons'; -$wb['bank_account_owner_txt'] = 'Titolare conto bancario'; -$wb['email_error_isemail'] = 'Inserire un email valido.'; -$wb['customer_no_error_unique'] = 'Il n° di cliente deve essere univoco (o vuoto).'; -$wb['paypal_email_error_isemail'] = 'Inserire una email valida per PayPal.'; -$wb['paypal_email_txt'] = 'email PayPal'; -$wb['err_msg_master_tpl_set'] = 'Tutti i limiti personalizzati impostati sono ignorati se viene selezionato un modello master diverso da \\"custom\\".'; -$wb['aps_limits_txt'] = 'Limite installazione APS'; -$wb['limit_aps_txt'] = 'Numero massimo di istanze APS'; -$wb['limit_aps_error_notint'] = 'Il limite di istanze APS deve essere un numero.'; -$wb['default_slave_dnsserver_txt'] = 'Server DNS secondario default'; -$wb['locked_txt'] = 'Bloccato (Disabilita tutto eccetto DNS)'; -$wb['canceled_txt'] = 'Cancellato (disabilita il login del cliente)'; +$wb['active_template_additional_txt'] = 'AttivoAddons'; +$wb['bank_account_owner_txt'] = 'Bank account owner'; +$wb['email_error_isemail'] = 'Please enter a valid email address.'; +$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; +$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; +$wb['paypal_email_txt'] = 'PayPal Email'; +$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; +$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['locked_txt'] = 'Locked (disables everything except DNS)'; +$wb['canceled_txt'] = 'Cancellato(disables client login)'; $wb['gender_txt'] = 'Titolo'; $wb['gender_m_txt'] = 'Sig.'; $wb['gender_f_txt'] = 'Sig.ra'; @@ -157,52 +157,53 @@ $wb['added_by_txt'] = 'Aggiunto da'; $wb['added_date_txt'] = 'Data inserimento'; $wb['parent_client_id_txt'] = 'Cliente di rivenditore'; $wb['none_txt'] = 'Nessuno'; -$wb['contact_firstname_txt'] = 'Nome contatto'; -$wb['limit_backup_txt'] = 'Funzione backup disponibile'; -$wb['xmpp_limits_txt'] = 'Limiti XMPPs'; +$wb['contact_firstname_txt'] = 'Contact firstname'; +$wb['limit_backup_txt'] = 'Backupfunction available'; +$wb['xmpp_limits_txt'] = 'XMPP Limits'; $wb['web_servers_txt'] = 'Webservers'; -$wb['web_servers_placeholder'] = 'Seleziona webservers'; -$wb['no_web_server_error'] = 'Almeno un webserver deve essere selezionato.'; -$wb['web_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come sito Web. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; -$wb['dns_servers_txt'] = 'Server DNS'; -$wb['dns_servers_placeholder'] = 'Seleziona i server DNS'; -$wb['no_dns_server_error'] = 'Almeno un server DNS deve essere selezionato.'; -$wb['dns_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come server DNS. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; -$wb['db_servers_txt'] = 'Server Database'; -$wb['db_servers_placeholder'] = 'Seleziona server database'; -$wb['no_db_server_error'] = 'Almeno un server Database server deve essere selezionato.'; -$wb['db_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come server Database. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; +$wb['web_servers_placeholder'] = 'Select webservers'; +$wb['no_web_server_error'] = 'At least one webserver must be selected.'; +$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.'; +$wb['dns_servers_txt'] = 'DNS servers'; +$wb['dns_servers_placeholder'] = 'Select DNS servers'; +$wb['no_dns_server_error'] = 'At least one DNS server must be selected.'; +$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.'; +$wb['db_servers_txt'] = 'Database servers'; +$wb['db_servers_placeholder'] = 'Select database servers'; +$wb['no_db_server_error'] = 'At least one Database server must be selected.'; +$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.'; $wb['mail_servers_txt'] = 'Mailservers'; -$wb['mail_servers_placeholder'] = 'Seleziona mailservers'; -$wb['no_mail_server_error'] = 'Almeno un server mail deve essere selezionato.'; -$wb['mail_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come serve Mail. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; -$wb['xmpp_servers_txt'] = 'Server XMPP'; -$wb['xmpp_servers_placeholder'] = 'Seleziona server XMPP'; -$wb['no_xmpp_server_error'] = 'Almeno un server XMPP deve essere selezionato.'; -$wb['xmpp_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come server XMPP. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; -$wb['limit_xmpp_domain_error_notint'] = 'Il limite dei domini XMPP deve essere un numero.'; -$wb['limit_xmpp_user_error_notint'] = 'Il limite degli utenti XMPP deve essere un numero.'; -$wb['limit_xmpp_domain_txt'] = 'Numero massimo di domini XMPP'; -$wb['limit_xmpp_user_txt'] = 'Massimo numero di profili XMPP'; -$wb['limit_xmpp_muc_txt'] = 'Multiuser chat disponibile'; -$wb['limit_xmpp_pastebin_txt'] = 'Pastebin per MUC disponibile'; -$wb['limit_xmpp_httparchive_txt'] = 'Archivio HTTP per MUC disponibile'; -$wb['limit_xmpp_anon_txt'] = 'host anonimo disponibile'; -$wb['limit_xmpp_vjud_txt'] = 'Rubrica utenti VJUD disponibile'; -$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy disponibile'; -$wb['limit_xmpp_status_txt'] = 'Status host disponibile'; -$wb['limit_database_quota_txt'] = 'quota Database'; -$wb['limit_database_quota_error_notint'] = 'La quota database deve essere un numero.'; -$wb['reseller_txt'] = 'Rivenditori'; -$wb['btn_save_txt'] = 'Salva'; -$wb['btn_cancel_txt'] = 'Annulla'; -$wb['invalid_vat_id'] = 'Il n° di IVA non + valido.'; -$wb['email_error_empty'] = 'Email è vuoto'; -$wb['limit_database_user_txt'] = 'Massimo numero utenti Database'; -$wb['limit_database_user_error_notint'] = 'Il numero di utenti database deve essere un numero.'; -$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt disponibile'; -$wb['limit_directive_snippets_txt'] = 'Mostra selezione di configurazione del server web'; -$wb['password_click_to_set_txt'] = 'Clicca per impostare'; -$wb['limit_dns_record_error_notint'] = 'Il limite di record DNS deve essere un numero.'; -$wb['Address'] = 'Indirizzo'; -$wb['Limits'] = 'Limiti'; +$wb['mail_servers_placeholder'] = 'Select mailservers'; +$wb['no_mail_server_error'] = 'At least one mailserver must be selected.'; +$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.'; +$wb['xmpp_servers_txt'] = 'XMPP Servers'; +$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers'; +$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.'; +$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.'; +$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.'; +$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.'; +$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains'; +$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts'; +$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available'; +$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available'; +$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available'; +$wb['limit_xmpp_anon_txt'] = 'Anonymous host available'; +$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; +$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; +$wb['limit_xmpp_status_txt'] = 'Status host available'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; +$wb['reseller_txt'] = 'Reseller'; +$wb['btn_save_txt'] = 'Save'; +$wb['btn_cancel_txt'] = 'Cancel'; +$wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['email_error_empty'] = 'Email is empty'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available'; +$wb['limit_directive_snippets_txt'] = 'Show web server config selection'; +$wb['password_click_to_set_txt'] = 'Click to set'; +$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; +$wb['Address'] = 'Address'; +$wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng index 418bb033c7..f9fe1f2f7a 100644 --- a/interface/web/client/lib/lang/it_client_template.lng +++ b/interface/web/client/lib/lang/it_client_template.lng @@ -1,24 +1,24 @@ ipo di Modello'; -$wb['limit_mailmailinglist_txt'] = 'Numero massimo delle mailing lists'; -$wb['limit_mailmailinglist_error_notint'] = 'Il limite dell mailing list deve essere un numero.'; -$wb['limit_openvz_vm_txt'] = 'Numero massimo di Virtual Server'; -$wb['limit_openvz_vm_template_id_txt'] = 'Forza modello per virtual server'; -$wb['limit_openvz_vm_error_notint'] = 'Il limite di server virtuali deve essere un numero.'; -$wb['ssh_chroot_txt'] = 'Opzioni chroot SSH'; -$wb['web_php_options_txt'] = 'Opzioni PHP'; -$wb['limit_cgi_txt'] = 'CGI disponibile'; -$wb['limit_ssi_txt'] = 'SSI disponibile'; -$wb['limit_perl_txt'] = 'Perl disponibile'; -$wb['limit_ruby_txt'] = 'Ruby disponibile'; -$wb['limit_python_txt'] = 'Python disponibile'; -$wb['force_suexec_txt'] = 'SuEXEC imposto'; -$wb['limit_hterror_txt'] = 'Messaggi di errore personalizzati disponibile'; -$wb['limit_wildcard_txt'] = 'Sottodomini * disponibile'; -$wb['limit_ssl_txt'] = 'SSL disponibile'; -$wb['web_limits_txt'] = 'Limite Web'; -$wb['email_limits_txt'] = 'Limite Email'; -$wb['database_limits_txt'] = 'Database'; -$wb['cron_job_limits_txt'] = 'Limite Cron Job'; -$wb['dns_limits_txt'] = 'Limite DNS'; -$wb['virtualization_limits_txt'] = 'Limite Virtualizzazioni'; -$wb['aps_limits_txt'] = 'Limite installazione APS'; -$wb['limit_aps_txt'] = 'Numero massimo di istanze APS'; -$wb['limit_aps_error_notint'] = 'Il limite delle istanze APS deve essere un numero.'; -$wb['limit_domainmodule_txt'] = 'Limiti del modulo Domini'; -$wb['client_limits_txt'] = 'Limite Clienti'; -$wb['template_name_txt'] = 'Nome Modello'; -$wb['limit_mail_backup_txt'] = 'Funzione backup email disponibile'; -$wb['default_mailserver_txt'] = 'Mailserver Default'; -$wb['default_webserver_txt'] = 'Webserver Default'; -$wb['default_dnsserver_txt'] = 'Default Server DNS'; -$wb['default_slave_dnsserver_txt'] = 'Default Server DNS Secondario'; -$wb['limit_backup_txt'] = 'Funzione backup disponibile'; +$wb['template_type_txt'] = 'Template type'; +$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; +$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; +$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers'; +$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; +$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; +$wb['ssh_chroot_txt'] = 'SSH-Chroot Options'; +$wb['web_php_options_txt'] = 'PHP Options'; +$wb['limit_cgi_txt'] = 'CGI available'; +$wb['limit_ssi_txt'] = 'SSI available'; +$wb['limit_perl_txt'] = 'Perl available'; +$wb['limit_ruby_txt'] = 'Ruby available'; +$wb['limit_python_txt'] = 'Python available'; +$wb['force_suexec_txt'] = 'SuEXEC forced'; +$wb['limit_hterror_txt'] = 'Custom error docs available'; +$wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; +$wb['limit_ssl_txt'] = 'SSL available'; +$wb['web_limits_txt'] = 'Web Limits'; +$wb['email_limits_txt'] = 'Email Limits'; +$wb['database_limits_txt'] = 'Database Limits'; +$wb['cron_job_limits_txt'] = 'Cron Job Limits'; +$wb['dns_limits_txt'] = 'DNS Limits'; +$wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['aps_limits_txt'] = 'APS Installer Limits'; +$wb['limit_aps_txt'] = 'Max. number of APS instances'; +$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; +$wb['limit_domainmodule_txt'] = 'Domainmodule Limit'; +$wb['client_limits_txt'] = 'Client Limits'; +$wb['template_name_txt'] = 'Template name'; +$wb['limit_mail_backup_txt'] = 'E-mail backup function available'; +$wb['default_mailserver_txt'] = 'Default Mailserver'; +$wb['default_webserver_txt'] = 'Default Webserver'; +$wb['default_dnsserver_txt'] = 'Default DNS Server'; +$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; +$wb['limit_backup_txt'] = 'Backupfunction available'; $wb['default_dbserver_txt'] = 'Default Database Server'; -$wb['limit_database_quota_txt'] = 'Quota Database'; -$wb['limit_database_quota_error_notint'] = 'Il limite di quota database deve essere un numero.'; -$wb['xmpp_limits_txt'] = 'Limiti XMPP'; -$wb['xmpp_servers_txt'] = 'Servers XMPP'; -$wb['xmpp_servers_placeholder'] = 'Seleziona i Server XMPP'; -$wb['no_xmpp_server_error'] = 'Almeno un Server XMPP deve essere selezionato.'; -$wb['xmpp_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è usato come server XMPP. Assicurati che questo server non sia in uso da questo cliente prima di rimuoverlo.'; -$wb['limit_xmpp_domain_error_notint'] = 'Il limite dei domini XMPP deve essere un numero.'; -$wb['limit_xmpp_user_error_notint'] = 'Il limite degli utenti XMPP deve essere un numero.'; -$wb['limit_xmpp_domain_txt'] = 'Numero massimo di domini XMPP'; -$wb['limit_xmpp_user_txt'] = 'Numero massimo di profili XMPP'; -$wb['limit_xmpp_muc_txt'] = 'chat multiutente disponibile'; -$wb['limit_xmpp_pastebin_txt'] = 'Pastebin per MUC disponibile'; -$wb['limit_xmpp_httparchive_txt'] = 'Archivio su HTTP per MUC disponibile'; -$wb['limit_xmpp_anon_txt'] = 'host anonimo disponibile'; -$wb['limit_xmpp_vjud_txt'] = 'Rubrica utenti VJUD disponibile'; -$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy disponibile'; -$wb['limit_xmpp_status_txt'] = 'Status host disponibile'; -$wb['dns_servers_txt'] = 'servers DNS'; -$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt disponibile'; -$wb['limit_directive_snippets_txt'] = 'Mostra selezione configurazione web server'; -$wb['limit_database_user_txt'] = 'Numero massimo utenti database'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; +$wb['xmpp_limits_txt'] = 'XMPP Limits'; +$wb['xmpp_servers_txt'] = 'XMPP Servers'; +$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers'; +$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.'; +$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.'; +$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.'; +$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.'; +$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains'; +$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts'; +$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available'; +$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available'; +$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available'; +$wb['limit_xmpp_anon_txt'] = 'Anonymous host available'; +$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; +$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; +$wb['limit_xmpp_status_txt'] = 'Status host available'; +$wb['dns_servers_txt'] = 'DNS servers'; +$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available'; +$wb['limit_directive_snippets_txt'] = 'Show web server config selection'; +$wb['limit_database_user_txt'] = 'Max. Database users'; $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; -$wb['Limits'] = 'Limiti'; +$wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index 4639125717..2367889d52 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng index a871199051..5b4bbeaad3 100644 --- a/interface/web/client/lib/lang/ja_client_template.lng +++ b/interface/web/client/lib/lang/ja_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index 593d5dbdff..dd22d76db0 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -206,3 +206,4 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng index c31638c132..2a93108e2a 100644 --- a/interface/web/client/lib/lang/nl_client_template.lng +++ b/interface/web/client/lib/lang/nl_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index 6943deef95..caa5570724 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng index 614bf27575..47e049e4fa 100644 --- a/interface/web/client/lib/lang/pl_client_template.lng +++ b/interface/web/client/lib/lang/pl_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index 2b90c823ca..64ebba78ef 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng index 7f63af0df3..c02d7e3acb 100644 --- a/interface/web/client/lib/lang/pt_client_template.lng +++ b/interface/web/client/lib/lang/pt_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index 70407714a8..eb40ce10ed 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng index abd9f64eb1..c0690b3a2e 100644 --- a/interface/web/client/lib/lang/ro_client_template.lng +++ b/interface/web/client/lib/lang/ro_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index d8cd5e4788..16318d3de9 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Клик для установки'; $wb['limit_dns_record_error_notint'] = 'Лимит вторичных DNS-зон должен быть числом.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Лимиты'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng index 65397933ff..02900e9d5a 100644 --- a/interface/web/client/lib/lang/ru_client_template.lng +++ b/interface/web/client/lib/lang/ru_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Web-серверы'; $wb['db_servers_txt'] = 'Серверы баз данных'; $wb['mail_servers_txt'] = 'Серверы почты'; $wb['Limits'] = 'Лимиты'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index 41aca6a6bb..14d66cc829 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng index a1a6f9457b..dd9ce2baae 100644 --- a/interface/web/client/lib/lang/se_client_template.lng +++ b/interface/web/client/lib/lang/se_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index 5ca58b5b0e..a4972a1311 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -206,3 +206,4 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng index 21acadd651..bcb5641808 100644 --- a/interface/web/client/lib/lang/sk_client_template.lng +++ b/interface/web/client/lib/lang/sk_client_template.lng @@ -126,3 +126,4 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index ca1e2f7429..26d42b427c 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -208,3 +208,4 @@ $wb['email_error_empty'] = 'E-posta boş olamaz.'; $wb['limit_directive_snippets_txt'] = 'Web Sunucu Yapılandırma Seçimi Görüntülensin'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Sınırlar'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng index 3d5edfeeba..7887b41793 100644 --- a/interface/web/client/lib/lang/tr_client_template.lng +++ b/interface/web/client/lib/lang/tr_client_template.lng @@ -129,3 +129,4 @@ $wb['xmpp_servers_txt'] = 'XMPP Sunucuları'; $wb['db_servers_txt'] = 'Veritabanı Sunucuları'; $wb['mail_servers_txt'] = 'E-posta Sunucuları'; $wb['Limits'] = 'Sınırlar'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index 9a2578b697..fed18a69f6 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -168,6 +168,9 @@ {tmpl_var name='limit_directive_snippets'} +
+ +
@@ -468,8 +471,9 @@ + diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php index d77fb051af..95b52d2c6d 100644 --- a/interface/web/sites/form/web_vhost_domain.tform.php +++ b/interface/web/sites/form/web_vhost_domain.tform.php @@ -636,14 +636,24 @@ $form["tabs"]['stats'] = array ( 'statsdb_retention' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', - 'validators' => array ( 0 => array ( 'type' => 'REGEX', - 'regex' => '/^([0-9]{1,4})$/', - 'errmsg'=> 'statsdb_retention_error_regex'), + 'validators' => array( + 0 => array( + 'type' => 'CUSTOM', + 'class' => 'validate_statsdb_retention', + 'function' => 'check_statsdb_value', + 'errmsg' => 'statsdb_retention_error_txt' + ) ), 'default' => '0', 'value' => '', - 'width' => '4', - 'maxlength' => '4' + 'width' => '30', + 'maxlength' => '255' + ), + 'stats_anonymize_level' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'default' => 0, + 'value' => array( 0 => 'None', 1 => 'Anonymize last byte', 2 => 'Anonymize last two bytes', 3 => 'Anonymize last three bytes') ), //################################# // END Datatable fields diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain.lng b/interface/web/sites/lib/lang/en_web_vhost_domain.lng index f3e6b6873f..d79cbb15e7 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_domain.lng @@ -74,6 +74,7 @@ $wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded'; $wb['ruby_txt'] = 'Ruby'; $wb['stats_user_txt'] = 'Webstatistics username'; $wb['stats_type_txt'] = 'Webstatistics program'; +$wb['goa_settings_txt'] = 'GoAccess settings'; $wb['custom_php_ini_txt'] = 'Custom php.ini settings'; $wb['none_txt'] = 'None'; $wb['disabled_txt'] = 'Disabled'; @@ -208,5 +209,11 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; + + diff --git a/interface/web/sites/templates/web_vhost_domain_stats.htm b/interface/web/sites/templates/web_vhost_domain_stats.htm index b80c1478fc..42648c9815 100644 --- a/interface/web/sites/templates/web_vhost_domain_stats.htm +++ b/interface/web/sites/templates/web_vhost_domain_stats.htm @@ -1,86 +1,146 @@ -
-

- -

-
{tmpl_var name='config_error_tstamp'} : 
-
{tmpl_var name='config_error_msg'}
-
-

-
- -
- -
   admin
-
-
- -
-
- - - - -
-
-
-
- -
-
-   +
+

+ +

+
{tmpl_var name='config_error_tstamp'} : 
+
{tmpl_var name='config_error_msg'}
-
-
- -
-
-
- - -
-
-
- -
-
+

+
+ +
+ +
+
   admin
+
+
+
+ +
+
+ + + + +
+
+
+
+ +
+
+   +
+
+
+ +
+
+
+
+ + +
+
+
+ +
+
+
+
+ + +
+ +
+
+
+ {tmpl_var name='statsdb_retention_about_txt'}
+
+
-
- -
-
{tmpl_var name='statsdb_retention_about_txt'}
+ + +
+
+ +
+
+
+ {tmpl_var name='stats_anonymize_level_about_txt'}
+
+
+
+
- + -
- - -
+
+
+ + +
+
+
- + } + + \ No newline at end of file diff --git a/server/lib/classes/cron.d/150-goaccess.inc.php b/server/lib/classes/cron.d/150-goaccess.inc.php index a6c0b287d6..083e02cb6a 100644 --- a/server/lib/classes/cron.d/150-goaccess.inc.php +++ b/server/lib/classes/cron.d/150-goaccess.inc.php @@ -56,7 +56,7 @@ class cronjob_goaccess extends cronjob { // Create goaccess statistics //###################################################################################################### - $sql = "SELECT domain_id, sys_groupid, domain, document_root, web_folder, statsdb_retention, type, system_user, system_group, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain' or type = 'vhostalias') and stats_type = 'goaccess' AND server_id = ?"; + $sql = "SELECT domain_id, sys_groupid, domain, document_root, web_folder, statsdb_retention, stats_anonymize_level, type, system_user, system_group, parent_domain_id FROM web_domain WHERE (type = 'vhost' or type = 'vhostsubdomain' or type = 'vhostalias') and stats_type = 'goaccess' AND server_id = ?"; $records = $app->db->queryAllRecords($sql, $conf['server_id']); $goaccess_conf_main = null; @@ -127,7 +127,6 @@ class cronjob_goaccess extends cronjob { $app->system->copy($goaccess_conf_main, $goaccess_conf); $content = $app->system->file_get_contents($goaccess_conf, true); $content = preg_replace('/^(#)?log-format COMBINED/m', "log-format COMBINED", $content); - $content = preg_replace('/^(#)?html-report-title(.*)/m', "html-report-title $domain", $content); $app->system->file_put_contents($goaccess_conf, $content, true); unset($content); } @@ -187,6 +186,9 @@ class cronjob_goaccess extends cronjob { if (preg_match('/[0-9]\.[0-9]{1,2}/', $goaccess_version, $match)) { $goaccess_version = $match[0]; + } else { + $app->log("GoAccess version could not be detected.", LOGLEVEL_DEBUG); + $goaccess_version = null; } @@ -196,12 +198,8 @@ class cronjob_goaccess extends cronjob { $lang_user = $app->db->queryOneRecord($lang_query, $rec_user['client_id']); $cust_lang = $lang_user['language'] . "_" . strtoupper($lang_user['language']) . ".UTF-8"; $statsdb_retention = $rec['statsdb_retention']; + $stats_anonymize_level = $rec['stats_anonymize_level']; - if ($statsdb_retention > 0) { - $keep_last = "--keep-last=" . $statsdb_retention; - } else { - $keep_last = null; - } switch ($lang_user['language']) { case 'en': @@ -243,14 +241,33 @@ class cronjob_goaccess extends cronjob { */ if (version_compare($goaccess_version, 1.4) >= 0) { - $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --restore --persist --db-path=? " . $keep_last . " --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html); + + if ($statsdb_retention > 0) { + $keep_last = "--keep-last=" . $statsdb_retention; + } else { + $keep_last = null; + } + + if ($stats_anonymize_level > 0) { + if (version_compare($goaccess_version, "1.5.6") >= 0) { + $anonymize_level = " --anonymize-ip --anonymize-level=" . $stats_anonymize_level; + } else { + $app->log("GoAccess version is too old. The anonymize-ip option requires GoAccess to be at least >= 1.5.6 or newer", LOGLEVEL_DEBUG); + $anonymize_level = null; + } + } else { + $anonymize_level = null; + } + + $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --restore --persist --db-path=? " . $keep_last . $anonymize_level . " --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html); + } else { $output = $app->system->system_safe('goaccess --help 2>&1'); preg_match('/keep-db-files/', $output, $match); if ($match[0] == "keep-db-files") { $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --load-from-disk --keep-db-files --db-path=? --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html); } else { - $app->log("Stats couldn't be generated. The GoAccess binary wasn't compiled with B+Tree support. Please recompile/reinstall GoAccess with B+Tree support, or install GoAccess version >= 1.4! (recommended)", LOGLEVEL_WARN); + $app->log("Stats couldn't be generated. The GoAccess binary wasn't compiled with B+Tree support. Please recompile/reinstall GoAccess with B+Tree support, or install GoAccess version >= 1.4! (RECOMMENDED)", LOGLEVEL_WARN); } unset($output); } -- GitLab From dfa471d91d35002e1391f423564cc5e4af4f4790 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Wed, 10 Aug 2022 13:03:59 +0200 Subject: [PATCH 08/24] fix .lng files/translations --- interface/web/client/lib/lang/it_client.lng | 238 +++++++++--------- .../client/lib/lang/it_client_template.lng | 138 +++++----- .../sites/lib/lang/ar_web_vhost_domain.lng | 6 +- .../sites/lib/lang/bg_web_vhost_domain.lng | 6 +- .../sites/lib/lang/br_web_vhost_domain.lng | 6 +- .../sites/lib/lang/ca_web_vhost_domain.lng | 6 +- .../sites/lib/lang/cz_web_vhost_domain.lng | 6 +- .../sites/lib/lang/de_web_vhost_domain.lng | 7 +- .../sites/lib/lang/dk_web_vhost_domain.lng | 6 +- .../sites/lib/lang/el_web_vhost_domain.lng | 6 +- .../sites/lib/lang/en_web_vhost_domain.lng | 1 - .../sites/lib/lang/es_web_vhost_domain.lng | 6 +- .../sites/lib/lang/fi_web_vhost_domain.lng | 6 +- .../sites/lib/lang/fr_web_vhost_domain.lng | 6 +- .../sites/lib/lang/hr_web_vhost_domain.lng | 6 +- .../sites/lib/lang/hu_web_vhost_domain.lng | 6 +- .../sites/lib/lang/id_web_vhost_domain.lng | 6 +- .../sites/lib/lang/it_web_vhost_domain.lng | 6 +- .../sites/lib/lang/ja_web_vhost_domain.lng | 6 +- .../sites/lib/lang/nl_web_vhost_domain.lng | 6 +- .../sites/lib/lang/pl_web_vhost_domain.lng | 6 +- .../sites/lib/lang/pt_web_vhost_domain.lng | 6 +- .../sites/lib/lang/ro_web_vhost_domain.lng | 6 +- .../sites/lib/lang/ru_web_vhost_domain.lng | 6 +- .../sites/lib/lang/se_web_vhost_domain.lng | 6 +- .../sites/lib/lang/sk_web_vhost_domain.lng | 6 +- .../sites/lib/lang/tr_web_vhost_domain.lng | 6 +- 27 files changed, 309 insertions(+), 213 deletions(-) diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index c5011be2bf..89759ee4b2 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -3,11 +3,11 @@ $wb['limit_maildomain_txt'] = 'Numero massimo di domini di posta'; $wb['limit_mailbox_txt'] = 'Numero massimo di caselle di posta'; $wb['limit_mailalias_txt'] = 'Numero massimo di aliases di posta'; $wb['limit_mailforward_txt'] = 'Numero massimo di forwarders di posta'; -$wb['limit_mailcatchall_txt'] = 'Numero massimo di catchall accounts'; +$wb['limit_mailcatchall_txt'] = 'Numero massimo di profili catchall'; $wb['limit_mailrouting_txt'] = 'Numero massimo di email routes'; $wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries'; $wb['limit_mailfilter_txt'] = 'Numero massimo di email filters'; -$wb['limit_fetchmail_txt'] = 'Numero massimo di fetchmail accounts'; +$wb['limit_fetchmail_txt'] = 'Numero massimo di profili fetchmail'; $wb['limit_mailquota_txt'] = 'Limite quota mailbox'; $wb['limit_spamfilter_wblist_txt'] = 'Numero massimo di filtri spamfilter white / blacklist'; $wb['limit_spamfilter_user_txt'] = 'Numero massimo di utenti spamfilter'; @@ -43,7 +43,7 @@ $wb['limit_subdomain_txt'] = 'limit_subdomain'; $wb['limit_webquota_txt'] = 'limit_webquota'; $wb['limit_database_txt'] = 'Numero massimo database'; $wb['ip_address_txt'] = 'Indirizzi ip'; -$wb['limit_client_error_notint'] = 'The sub client limit must be a number.'; +$wb['limit_client_error_notint'] = 'Il numero di sub-cliente deve essere un numero.'; $wb['firstname_error_empty'] = 'Nome è vuoto.'; $wb['contact_error_empty'] = 'Nome azienda è vuoto.'; $wb['default_webserver_txt'] = 'Webserver predefinito'; @@ -61,95 +61,95 @@ $wb['username_error_unique'] = 'Il nome utente deve essere unico.'; $wb['limit_maildomain_error_notint'] = 'Il limite dei domini email devessere un numero.'; $wb['limit_mailbox_error_notint'] = 'Il limite delle caselle di posta devessere un numero.'; $wb['limit_mailalias_error_notint'] = 'Il limite di email alias deve essere un numero.'; -$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.'; -$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.'; -$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.'; -$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.'; -$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.'; -$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.'; -$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.'; -$wb['limit_spamfilter_wblist_error_notint'] = 'The spamfilter white / blacklist limit must be a number.'; -$wb['limit_spamfilter_user_error_notint'] = 'The spamfilter user limit must be a number.'; -$wb['limit_spamfilter_policy_error_notint'] = 'The spamfilter policy limit must be a number.'; -$wb['limit_web_domain_error_notint'] = 'The website limit must be a number.'; -$wb['limit_web_aliasdomain_error_notint'] = 'The website alias domain limit must be a number.'; -$wb['limit_web_subdomain_error_notint'] = 'The website subdomain limit must be a number.'; +$wb['limit_mailforward_error_notint'] = 'Il limite delle forward email deve essere un numero.'; +$wb['limit_mailcatchall_error_notint'] = 'Il limite delle mail catchall deve essere un numero.'; +$wb['limit_mailrouting_error_notint'] = 'Il limite di di routing email dve essere un numero.'; +$wb['limit_mail_wblist_error_notint'] = 'Il limite delle liste bianche / nere deve essere un numero.'; +$wb['limit_mailfilter_error_notint'] = 'Il limite di filtri email deve essere un numero.'; +$wb['limit_mailfetchmail_error_notint'] = 'Il limite di fetchmail deve essere un numero.'; +$wb['limit_mailquota_error_notint'] = 'La quota email deve essere un numero.'; +$wb['limit_spamfilter_wblist_error_notint'] = 'Il limite di liste bianche / nere di filtri SPAM deve essere un numero.'; +$wb['limit_spamfilter_user_error_notint'] = 'Il limite di utenti di filtri SPAM deve essere un numero.'; +$wb['limit_spamfilter_policy_error_notint'] = 'Il limite delle politiche di spamfilter deve essere un numero.'; +$wb['limit_web_domain_error_notint'] = 'Il limite di siti web deve essere un numero.'; +$wb['limit_web_aliasdomain_error_notint'] = 'Il limite dei domini web Alias deve essere un numero.'; +$wb['limit_web_subdomain_error_notint'] = 'Il limite dei siti web sottodomini deve essere un numero.'; $wb['limit_ftp_user_error_notint'] = 'Il limite degli utenti ftp deve essere un numero.'; $wb['limit_shell_user_error_notint'] = 'Il limite degli utenti shell deve essere un numero.'; $wb['limit_dns_zone_error_notint'] = 'Il limite dei record dns deve essere un numero.'; -$wb['limit_dns_slave_zone_error_notint'] = 'The dns slave zone limit must be a number.'; +$wb['limit_dns_slave_zone_error_notint'] = 'Il limite delle zone DNS slave deve essere un numero.'; $wb['default_dbserver_txt'] = 'Server Database predefinito'; $wb['limit_database_error_notint'] = 'Il limite dei database deve essere un numero.'; $wb['username_error_regex'] = 'Il nome utente contiene caratteri non validi.'; -$wb['password_strength_txt'] = 'Sicurezza della Password'; +$wb['password_strength_txt'] = 'Robustezza della Password'; $wb['template_master_txt'] = 'Principale'; $wb['template_additional_txt'] = 'Aggiuntivo'; -$wb['ssh_chroot_txt'] = 'SSH-Chroot Options'; -$wb['web_php_options_txt'] = 'PHP Options'; -$wb['limit_cron_txt'] = 'Max. number of cron jobs'; -$wb['limit_cron_type_txt'] = 'Max. type of cron jobs (chrooted and full implies url)'; -$wb['limit_cron_frequency_txt'] = 'Min. delay between executions'; -$wb['limit_cron_error_notint'] = 'The cron limit must be a number.'; -$wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.'; -$wb['limit_client_error'] = 'The max. number of clients is reached.'; -$wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases'; -$wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must be a number.'; +$wb['ssh_chroot_txt'] = 'Opzioni chroot SSH'; +$wb['web_php_options_txt'] = 'Opzioni PHP'; +$wb['limit_cron_txt'] = 'Numero massimo di cron jobs'; +$wb['limit_cron_type_txt'] = 'Massimo tipo di cron jobs (chrooted e completi implica url)'; +$wb['limit_cron_frequency_txt'] = 'Ritardo minimo tra le esecuzioni'; +$wb['limit_cron_error_notint'] = 'Il limite di cron deve essere un numero.'; +$wb['limit_cron_error_frequency'] = 'Il limite di frequenza cron deve essere un numero.'; +$wb['limit_client_error'] = 'Hai raggiunto il numero massimo di clienti.'; +$wb['limit_mailaliasdomain_txt'] = 'Massimo numero di domini Alias'; +$wb['limit_mailaliasdomain_error_notint'] = 'Il numero massimo di domini email alias devve essere un numero.'; $wb['limit_web_quota_txt'] = 'Quota Web'; $wb['limit_traffic_quota_txt'] = 'Quota Traffico'; -$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.'; -$wb['limit_webdav_user_txt'] = 'Max. number of Webdav users'; -$wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.'; -$wb['customer_no_txt'] = 'Customer No.'; +$wb['limit_trafficquota_error_notint'] = 'La quota traffico deve essere un numero.'; +$wb['limit_webdav_user_txt'] = 'Massimo numero di utenti Webdav'; +$wb['limit_webdav_user_error_notint'] = 'Il numero massimo di utenti Webdav deve essere un numero.'; +$wb['customer_no_txt'] = 'n° Cliente'; $wb['vat_id_txt'] = 'P. IVA'; $wb['required_fields_txt'] = '* Campi obbligatori'; -$wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists'; -$wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.'; +$wb['limit_mailmailinglist_txt'] = 'Massimo numero di mailing lists'; +$wb['limit_mailmailinglist_error_notint'] = 'Il numero di mailing list deve essere un numero.'; $wb['company_id_txt'] = 'Azienda/Titolare ID'; $wb['limit_openvz_vm_txt'] = 'Numero massimo server virtuali'; -$wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template'; -$wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.'; -$wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.'; -$wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one option.'; -$wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.'; -$wb['add_additional_template_txt'] = 'Add additional template'; -$wb['delete_additional_template_txt'] = 'Elimina additional template'; -$wb['limit_cgi_txt'] = 'CGI available'; -$wb['limit_ssi_txt'] = 'SSI available'; -$wb['limit_perl_txt'] = 'Perl available'; -$wb['limit_ruby_txt'] = 'Ruby available'; -$wb['limit_python_txt'] = 'Python available'; -$wb['force_suexec_txt'] = 'SuEXEC forced'; -$wb['limit_hterror_txt'] = 'Custom error docs available'; -$wb['limit_wildcard_txt'] = 'Wildcard subdomain available'; -$wb['limit_ssl_txt'] = 'SSL available'; -$wb['bank_account_number_txt'] = 'Bank account no.'; -$wb['bank_code_txt'] = 'Bank code'; -$wb['bank_name_txt'] = 'Bank name'; +$wb['limit_openvz_vm_template_id_txt'] = 'Forzare il modello dei server virtuali'; +$wb['limit_openvz_vm_error_notint'] = 'Il limite dei server virtuali deve essere un numero.'; +$wb['web_php_options_notempty'] = 'Nessuna opzione PHP selezionata. Seleziona almeno una opzione PHP.'; +$wb['ssh_chroot_notempty'] = 'Nessuna opzione chroot SSH selezionata. Seleziona almeno una opzione.'; +$wb['username_error_collision'] = 'Il nome utente non può iniziare con la parola -web- o con -web- seguito da un numero.'; +$wb['add_additional_template_txt'] = 'Aggiungi un modello'; +$wb['delete_additional_template_txt'] = 'Elimina un modello'; +$wb['limit_cgi_txt'] = 'CGI disponibile'; +$wb['limit_ssi_txt'] = 'SSI disponibile'; +$wb['limit_perl_txt'] = 'Perl disponibile'; +$wb['limit_ruby_txt'] = 'Ruby disponibile'; +$wb['limit_python_txt'] = 'Python disponibile'; +$wb['force_suexec_txt'] = 'SuEXEC imposto'; +$wb['limit_hterror_txt'] = 'Messaggi di errore personalizzati disponibili'; +$wb['limit_wildcard_txt'] = 'Sottodomini * disponibile'; +$wb['limit_ssl_txt'] = 'SSL disponibile'; +$wb['bank_account_number_txt'] = 'n° Conto corrente bancario'; +$wb['bank_code_txt'] = 'Codice Banca'; +$wb['bank_name_txt'] = 'Nome Banca'; $wb['bank_account_iban_txt'] = 'IBAN'; $wb['bank_account_swift_txt'] = 'BIC / Swift'; -$wb['web_limits_txt'] = 'Web Limits'; -$wb['email_limits_txt'] = 'Email Limits'; -$wb['database_limits_txt'] = 'Database Limits'; -$wb['cron_job_limits_txt'] = 'Cron Job Limits'; -$wb['dns_limits_txt'] = 'DNS Limits'; -$wb['virtualization_limits_txt'] = 'Virtualization Limits'; +$wb['web_limits_txt'] = 'Limiti Web'; +$wb['email_limits_txt'] = 'Limiti Email'; +$wb['database_limits_txt'] = 'Limiti Database'; +$wb['cron_job_limits_txt'] = 'Limiti Cron Job'; +$wb['dns_limits_txt'] = 'Limiti DNS'; +$wb['virtualization_limits_txt'] = 'Limiti Virtualizzazione'; $wb['generate_password_txt'] = 'Genera Password'; $wb['repeat_password_txt'] = 'Ripeti Password'; $wb['password_mismatch_txt'] = 'Le password non coincidono.'; $wb['password_match_txt'] = 'Le password coincidono.'; -$wb['active_template_additional_txt'] = 'AttivoAddons'; -$wb['bank_account_owner_txt'] = 'Bank account owner'; -$wb['email_error_isemail'] = 'Please enter a valid email address.'; -$wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).'; -$wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.'; -$wb['paypal_email_txt'] = 'PayPal Email'; -$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.'; -$wb['aps_limits_txt'] = 'APS Installer Limits'; -$wb['limit_aps_txt'] = 'Max. number of APS instances'; -$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.'; -$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server'; -$wb['locked_txt'] = 'Locked (disables everything except DNS)'; -$wb['canceled_txt'] = 'Cancellato(disables client login)'; +$wb['active_template_additional_txt'] = 'Attivo Addons'; +$wb['bank_account_owner_txt'] = 'Titolare conto bancario'; +$wb['email_error_isemail'] = 'Inserire un email valido.'; +$wb['customer_no_error_unique'] = 'Il n° di cliente deve essere univoco (o vuoto).'; +$wb['paypal_email_error_isemail'] = 'Inserire una email valida per PayPal.'; +$wb['paypal_email_txt'] = 'email PayPal'; +$wb['err_msg_master_tpl_set'] = 'Tutti i limiti personalizzati impostati sono ignorati se viene selezionato un modello master diverso da \\"custom\\".'; +$wb['aps_limits_txt'] = 'Limite installazione APS'; +$wb['limit_aps_txt'] = 'Numero massimo di istanze APS'; +$wb['limit_aps_error_notint'] = 'Il limite di istanze APS deve essere un numero.'; +$wb['default_slave_dnsserver_txt'] = 'Server DNS secondario default'; +$wb['locked_txt'] = 'Bloccato (Disabilita tutto eccetto DNS)'; +$wb['canceled_txt'] = 'Cancellato (disabilita il login del cliente)'; $wb['gender_txt'] = 'Titolo'; $wb['gender_m_txt'] = 'Sig.'; $wb['gender_f_txt'] = 'Sig.ra'; @@ -157,53 +157,53 @@ $wb['added_by_txt'] = 'Aggiunto da'; $wb['added_date_txt'] = 'Data inserimento'; $wb['parent_client_id_txt'] = 'Cliente di rivenditore'; $wb['none_txt'] = 'Nessuno'; -$wb['contact_firstname_txt'] = 'Contact firstname'; -$wb['limit_backup_txt'] = 'Backupfunction available'; -$wb['xmpp_limits_txt'] = 'XMPP Limits'; +$wb['contact_firstname_txt'] = 'Nome contatto'; +$wb['limit_backup_txt'] = 'Funzione backup disponibile'; +$wb['xmpp_limits_txt'] = 'Limiti XMPPs'; $wb['web_servers_txt'] = 'Webservers'; -$wb['web_servers_placeholder'] = 'Select webservers'; -$wb['no_web_server_error'] = 'At least one webserver must be selected.'; -$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.'; -$wb['dns_servers_txt'] = 'DNS servers'; -$wb['dns_servers_placeholder'] = 'Select DNS servers'; -$wb['no_dns_server_error'] = 'At least one DNS server must be selected.'; -$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.'; -$wb['db_servers_txt'] = 'Database servers'; -$wb['db_servers_placeholder'] = 'Select database servers'; -$wb['no_db_server_error'] = 'At least one Database server must be selected.'; -$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.'; +$wb['web_servers_placeholder'] = 'Seleziona webservers'; +$wb['no_web_server_error'] = 'Almeno un webserver deve essere selezionato.'; +$wb['web_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come sito Web. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; +$wb['dns_servers_txt'] = 'Server DNS'; +$wb['dns_servers_placeholder'] = 'Seleziona i server DNS'; +$wb['no_dns_server_error'] = 'Almeno un server DNS deve essere selezionato.'; +$wb['dns_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come server DNS. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; +$wb['db_servers_txt'] = 'Server Database'; +$wb['db_servers_placeholder'] = 'Seleziona server database'; +$wb['no_db_server_error'] = 'Almeno un server Database server deve essere selezionato.'; +$wb['db_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come server Database. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; $wb['mail_servers_txt'] = 'Mailservers'; -$wb['mail_servers_placeholder'] = 'Select mailservers'; -$wb['no_mail_server_error'] = 'At least one mailserver must be selected.'; -$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.'; -$wb['xmpp_servers_txt'] = 'XMPP Servers'; -$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers'; -$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.'; -$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.'; -$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.'; -$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.'; -$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains'; -$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts'; -$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available'; -$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available'; -$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available'; -$wb['limit_xmpp_anon_txt'] = 'Anonymous host available'; -$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; -$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; -$wb['limit_xmpp_status_txt'] = 'Status host available'; -$wb['limit_database_quota_txt'] = 'Database quota'; -$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; -$wb['reseller_txt'] = 'Reseller'; -$wb['btn_save_txt'] = 'Save'; -$wb['btn_cancel_txt'] = 'Cancel'; -$wb['invalid_vat_id'] = 'The VAT ID is invalid.'; -$wb['email_error_empty'] = 'Email is empty'; -$wb['limit_database_user_txt'] = 'Max. Database users'; -$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; -$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available'; -$wb['limit_directive_snippets_txt'] = 'Show web server config selection'; -$wb['password_click_to_set_txt'] = 'Click to set'; -$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; -$wb['Address'] = 'Address'; -$wb['Limits'] = 'Limits'; +$wb['mail_servers_placeholder'] = 'Seleziona mailservers'; +$wb['no_mail_server_error'] = 'Almeno un server mail deve essere selezionato.'; +$wb['mail_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come serve Mail. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; +$wb['xmpp_servers_txt'] = 'Server XMPP'; +$wb['xmpp_servers_placeholder'] = 'Seleziona server XMPP'; +$wb['no_xmpp_server_error'] = 'Almeno un server XMPP deve essere selezionato.'; +$wb['xmpp_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è in uso come server XMPP. Assicurati che non sia usato dal cliente prima di tentare di rimuoverlo.'; +$wb['limit_xmpp_domain_error_notint'] = 'Il limite dei domini XMPP deve essere un numero.'; +$wb['limit_xmpp_user_error_notint'] = 'Il limite degli utenti XMPP deve essere un numero.'; +$wb['limit_xmpp_domain_txt'] = 'Numero massimo di domini XMPP'; +$wb['limit_xmpp_user_txt'] = 'Massimo numero di profili XMPP'; +$wb['limit_xmpp_muc_txt'] = 'Multiuser chat disponibile'; +$wb['limit_xmpp_pastebin_txt'] = 'Pastebin per MUC disponibile'; +$wb['limit_xmpp_httparchive_txt'] = 'Archivio HTTP per MUC disponibile'; +$wb['limit_xmpp_anon_txt'] = 'host anonimo disponibile'; +$wb['limit_xmpp_vjud_txt'] = 'Rubrica utenti VJUD disponibile'; +$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy disponibile'; +$wb['limit_xmpp_status_txt'] = 'Status host disponibile'; +$wb['limit_database_quota_txt'] = 'quota Database'; +$wb['limit_database_quota_error_notint'] = 'La quota database deve essere un numero.'; +$wb['reseller_txt'] = 'Rivenditori'; +$wb['btn_save_txt'] = 'Salva'; +$wb['btn_cancel_txt'] = 'Annulla'; +$wb['invalid_vat_id'] = 'Il n° di IVA non + valido.'; +$wb['email_error_empty'] = 'Email è vuoto'; +$wb['limit_database_user_txt'] = 'Massimo numero utenti Database'; +$wb['limit_database_user_error_notint'] = 'Il numero di utenti database deve essere un numero.'; +$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt disponibile'; +$wb['limit_directive_snippets_txt'] = 'Mostra selezione di configurazione del server web'; +$wb['password_click_to_set_txt'] = 'Clicca per impostare'; +$wb['limit_dns_record_error_notint'] = 'Il limite di record DNS deve essere un numero.'; +$wb['Address'] = 'Indirizzo'; +$wb['Limits'] = 'Limiti'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng index f9fe1f2f7a..1cc51caccd 100644 --- a/interface/web/client/lib/lang/it_client_template.lng +++ b/interface/web/client/lib/lang/it_client_template.lng @@ -1,24 +1,24 @@ ipo di Modello'; +$wb['limit_mailmailinglist_txt'] = 'Numero massimo delle mailing lists'; +$wb['limit_mailmailinglist_error_notint'] = 'Il limite dell mailing list deve essere un numero.'; +$wb['limit_openvz_vm_txt'] = 'Numero massimo di Virtual Server'; +$wb['limit_openvz_vm_template_id_txt'] = 'Forza modello per virtual server'; +$wb['limit_openvz_vm_error_notint'] = 'Il limite di server virtuali deve essere un numero.'; +$wb['ssh_chroot_txt'] = 'Opzioni chroot SSH'; +$wb['web_php_options_txt'] = 'Opzioni PHP'; +$wb['limit_cgi_txt'] = 'CGI disponibile'; +$wb['limit_ssi_txt'] = 'SSI disponibile'; +$wb['limit_perl_txt'] = 'Perl disponibile'; +$wb['limit_ruby_txt'] = 'Ruby disponibile'; +$wb['limit_python_txt'] = 'Python disponibile'; +$wb['force_suexec_txt'] = 'SuEXEC imposto'; +$wb['limit_hterror_txt'] = 'Messaggi di errore personalizzati disponibile'; +$wb['limit_wildcard_txt'] = 'Sottodomini * disponibile'; +$wb['limit_ssl_txt'] = 'SSL disponibile'; +$wb['web_limits_txt'] = 'Limite Web'; +$wb['email_limits_txt'] = 'Limite Email'; +$wb['database_limits_txt'] = 'Database'; +$wb['cron_job_limits_txt'] = 'Limite Cron Job'; +$wb['dns_limits_txt'] = 'Limite DNS'; +$wb['virtualization_limits_txt'] = 'Limite Virtualizzazioni'; +$wb['aps_limits_txt'] = 'Limite installazione APS'; +$wb['limit_aps_txt'] = 'Numero massimo di istanze APS'; +$wb['limit_aps_error_notint'] = 'Il limite delle istanze APS deve essere un numero.'; +$wb['limit_domainmodule_txt'] = 'Limiti del modulo Domini'; +$wb['client_limits_txt'] = 'Limite Clienti'; +$wb['template_name_txt'] = 'Nome Modello'; +$wb['limit_mail_backup_txt'] = 'Funzione backup email disponibile'; +$wb['default_mailserver_txt'] = 'Mailserver Default'; +$wb['default_webserver_txt'] = 'Webserver Default'; +$wb['default_dnsserver_txt'] = 'Default Server DNS'; +$wb['default_slave_dnsserver_txt'] = 'Default Server DNS Secondario'; +$wb['limit_backup_txt'] = 'Funzione backup disponibile'; $wb['default_dbserver_txt'] = 'Default Database Server'; -$wb['limit_database_quota_txt'] = 'Database quota'; -$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; -$wb['xmpp_limits_txt'] = 'XMPP Limits'; -$wb['xmpp_servers_txt'] = 'XMPP Servers'; -$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers'; -$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.'; -$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.'; -$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.'; -$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.'; -$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains'; -$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts'; -$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available'; -$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available'; -$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available'; -$wb['limit_xmpp_anon_txt'] = 'Anonymous host available'; -$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; -$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; -$wb['limit_xmpp_status_txt'] = 'Status host available'; -$wb['dns_servers_txt'] = 'DNS servers'; -$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt available'; -$wb['limit_directive_snippets_txt'] = 'Show web server config selection'; -$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_quota_txt'] = 'Quota Database'; +$wb['limit_database_quota_error_notint'] = 'Il limite di quota database deve essere un numero.'; +$wb['xmpp_limits_txt'] = 'Limiti XMPP'; +$wb['xmpp_servers_txt'] = 'Servers XMPP'; +$wb['xmpp_servers_placeholder'] = 'Seleziona i Server XMPP'; +$wb['no_xmpp_server_error'] = 'Almeno un Server XMPP deve essere selezionato.'; +$wb['xmpp_servers_used'] = 'Il server che stai cercando di rimuovere da questo cliente è usato come server XMPP. Assicurati che questo server non sia in uso da questo cliente prima di rimuoverlo.'; +$wb['limit_xmpp_domain_error_notint'] = 'Il limite dei domini XMPP deve essere un numero.'; +$wb['limit_xmpp_user_error_notint'] = 'Il limite degli utenti XMPP deve essere un numero.'; +$wb['limit_xmpp_domain_txt'] = 'Numero massimo di domini XMPP'; +$wb['limit_xmpp_user_txt'] = 'Numero massimo di profili XMPP'; +$wb['limit_xmpp_muc_txt'] = 'chat multiutente disponibile'; +$wb['limit_xmpp_pastebin_txt'] = 'Pastebin per MUC disponibile'; +$wb['limit_xmpp_httparchive_txt'] = 'Archivio su HTTP per MUC disponibile'; +$wb['limit_xmpp_anon_txt'] = 'host anonimo disponibile'; +$wb['limit_xmpp_vjud_txt'] = 'Rubrica utenti VJUD disponibile'; +$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy disponibile'; +$wb['limit_xmpp_status_txt'] = 'Status host disponibile'; +$wb['dns_servers_txt'] = 'servers DNS'; +$wb['limit_ssl_letsencrypt_txt'] = 'Let\'s Encrypt disponibile'; +$wb['limit_directive_snippets_txt'] = 'Mostra selezione configurazione web server'; +$wb['limit_database_user_txt'] = 'Numero massimo utenti database'; $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; -$wb['Limits'] = 'Limits'; +$wb['Limits'] = 'Limiti'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; diff --git a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng index 750a2b477c..c4bc15a8b7 100644 --- a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng index f9c29a04a7..7aa379fa79 100644 --- a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/br_web_vhost_domain.lng b/interface/web/sites/lib/lang/br_web_vhost_domain.lng index 7ecdd61f9a..e0112150f4 100644 --- a/interface/web/sites/lib/lang/br_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/br_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Remover chroot Jailkit sem uso'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Remover o ambiente chroot Jailkit quando não há usuários Shell ou tarefas do cron que o requeiram.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng index 049cc81007..031255b12f 100644 --- a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng index 42d1bd55d1..66ba53cf52 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain.lng b/interface/web/sites/lib/lang/de_web_vhost_domain.lng index af4c9d6836..cfda56602c 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_domain.lng @@ -203,5 +203,10 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage Aufbewahrung'; -$wb['statsdb_retention_error_regex'] = 'Aufbewahrungszeit in Tagen (erlaubte Werte: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Aufbewahrungsfrist in Tagen (zulässige numerische Werte): min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Behält die letzte angegebene Anzahl von Tagen im GoAccess Storage. Dadurch werden die GoAccess-Speichertabellen wiederverwendet, z. B. werden nur die letzten 7 Tage aufbewahrt. Der Wert "0" löscht diese Daten nicht und lässt diese für immer im GoAccess Storage.'; +$wb['statsdb_retention_option_txt'] = 'Aufbewahrungsoption'; +$wb['stats_anonymize_level_txt'] = 'Anonymisierungsstufe'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymisierung von IP-Adressen bei der Auswertung der Logdateien des Webservers.

  • Keine - z.B. 192.168.2.1 (Anonymisierung deaktiviert)
  • Anonymisiere letztes Byte - z.B. 192.168.2.0
  • Anonymisiere letzte zwei Bytes - z.B. 192.168.0.0 (Empfohlen)
  • Anonymisiere letzte drei Bytes - z.B. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymisierungsoption'; + diff --git a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng index e92585fcdb..6fe363cc99 100644 --- a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng index ac3681608a..d47f1e512d 100644 --- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain.lng b/interface/web/sites/lib/lang/en_web_vhost_domain.lng index d79cbb15e7..4cc9177c02 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_domain.lng @@ -74,7 +74,6 @@ $wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded'; $wb['ruby_txt'] = 'Ruby'; $wb['stats_user_txt'] = 'Webstatistics username'; $wb['stats_type_txt'] = 'Webstatistics program'; -$wb['goa_settings_txt'] = 'GoAccess settings'; $wb['custom_php_ini_txt'] = 'Custom php.ini settings'; $wb['none_txt'] = 'None'; $wb['disabled_txt'] = 'Disabled'; diff --git a/interface/web/sites/lib/lang/es_web_vhost_domain.lng b/interface/web/sites/lib/lang/es_web_vhost_domain.lng index 37ee6a12bc..1f4aeddbc5 100644 --- a/interface/web/sites/lib/lang/es_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/es_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng index 9cf4923050..99e7dd3fcd 100644 --- a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng index 6af29bee8f..fe8635fdbc 100644 --- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng index cf6381167c..ee00a440d3 100644 --- a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng index 59300069da..f2dd832ef1 100644 --- a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/id_web_vhost_domain.lng b/interface/web/sites/lib/lang/id_web_vhost_domain.lng index 0e879bde23..70005b209f 100644 --- a/interface/web/sites/lib/lang/id_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/id_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/it_web_vhost_domain.lng b/interface/web/sites/lib/lang/it_web_vhost_domain.lng index 146cf12cc9..db73791c4d 100644 --- a/interface/web/sites/lib/lang/it_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/it_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Cancella jailkit chroot non usate'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Cancella l\'ambiente jailkit chroot quando non sono presenti utenti della shell o job cron che lo richiedono.'; $wb['ssl_options_not_for_le_txt'] = 'Hai abilitato i certificati Let\'Encrypt per questo sito Web. Considera che tutte le opzioni di questa pagina si applicano a ai certificati non Let\'Encrypt solamente. Ricorda di deselezionare l\'opzione Let\'s Encrypt nella scheda principale se vuoi passare ad certificato differente.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng index 37a252818d..c1fdbc86b2 100644 --- a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng index 24acbe477d..33db064bbf 100644 --- a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng index f27608b8aa..ceaa68d428 100644 --- a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng index 581dc95bf7..1c86b96c4b 100644 --- a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng index c35f8a5c32..8fc9b398b4 100644 --- a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng index 81f159a95b..7a13a6a597 100644 --- a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain.lng b/interface/web/sites/lib/lang/se_web_vhost_domain.lng index ca8403417f..e64b205515 100644 --- a/interface/web/sites/lib/lang/se_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/se_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng index b4d75e2437..0b2780f46b 100644 --- a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng @@ -203,5 +203,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; diff --git a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng index 5aaab54735..7b8b4343de 100644 --- a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng @@ -205,5 +205,9 @@ $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot'; $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.'; $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; -$wb['statsdb_retention_error_regex'] = 'Retention time in days (allowed values: min. 0 - max. 9999)'; +$wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_option_txt'] = 'Statistic retention option'; +$wb['stats_anonymize_level_txt'] = 'Anonymize level'; +$wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; -- GitLab From 07e17f413bfafff80f8650661f162193ab939c15 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Wed, 10 Aug 2022 16:14:42 +0200 Subject: [PATCH 09/24] enable translation for anonymize select box --- interface/lib/classes/remote.d/sites.inc.php | 6 ++++++ interface/web/sites/form/web_vhost_domain.tform.php | 2 +- interface/web/sites/lib/lang/ar_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/bg_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/br_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/ca_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/cz_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/de_web_vhost_domain.lng | 5 ++++- interface/web/sites/lib/lang/el_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/en_web_vhost_domain.lng | 5 ++++- interface/web/sites/lib/lang/es_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/fi_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/fr_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/hr_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/hu_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/id_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/it_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/ja_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/nl_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/pl_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/pt_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/ro_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/ru_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/se_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/sk_web_vhost_domain.lng | 4 ++++ interface/web/sites/lib/lang/tr_web_vhost_domain.lng | 4 ++++ 26 files changed, 103 insertions(+), 3 deletions(-) diff --git a/interface/lib/classes/remote.d/sites.inc.php b/interface/lib/classes/remote.d/sites.inc.php index a9261fae5a..02c54f1168 100644 --- a/interface/lib/classes/remote.d/sites.inc.php +++ b/interface/lib/classes/remote.d/sites.inc.php @@ -433,6 +433,7 @@ class remoting_sites extends remoting { if($params['system_group'] == '') $params['system_group'] = '-'; if($params['log_retention'] == '') $params['log_retention'] = 30; if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; + if($params['stats_anonymize_level'] == '') $params['stats_anonymize_level'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -456,6 +457,7 @@ class remoting_sites extends remoting { if($params['log_retention'] == '') $params['log_retention'] = 30; if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; + if($params['stats_anonymize_level'] == '') $params['stats_anonymize_level'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -509,6 +511,7 @@ class remoting_sites extends remoting { if($params['system_group'] == '') $params['system_group'] = '-'; if($params['log_retention'] == '') $params['log_retention'] = 30; if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; + if($params['stats_anonymize_level'] == '') $params['stats_anonymize_level'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -530,6 +533,7 @@ class remoting_sites extends remoting { if($params['log_retention'] == '') $params['log_retention'] = 30; if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; + if($params['stats_anonymize_level'] == '') $params['stats_anonymize_level'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -583,6 +587,7 @@ class remoting_sites extends remoting { if($params['system_group'] == '') $params['system_group'] = '-'; if($params['log_retention'] == '') $params['log_retention'] = 30; if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; + if($params['stats_anonymize_level'] == '') $params['stats_anonymize_level'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; @@ -604,6 +609,7 @@ class remoting_sites extends remoting { if($params['log_retention'] == '') $params['log_retention'] = 30; if($params['statsdb_retention'] == '') $params['statsdb_retention'] = 0; + if($params['stats_anonymize_level'] == '') $params['stats_anonymize_level'] = 0; //* Set a few defaults for nginx servers if($params['pm_max_children'] == '') $params['pm_max_children'] = 1; diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php index 95b52d2c6d..9367b8c809 100644 --- a/interface/web/sites/form/web_vhost_domain.tform.php +++ b/interface/web/sites/form/web_vhost_domain.tform.php @@ -653,7 +653,7 @@ $form["tabs"]['stats'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => 0, - 'value' => array( 0 => 'None', 1 => 'Anonymize last byte', 2 => 'Anonymize last two bytes', 3 => 'Anonymize last three bytes') + 'value' => array( 0 => 'anonymize_none_txt', 1 => 'anonymize_last_byte_txt', 2 => 'anonymize_last_two_bytes_txt', 3 => 'anonymize_last_three_bytes_txt') ), //################################# // END Datatable fields diff --git a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng index c4bc15a8b7..9ce90f4cc6 100644 --- a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; diff --git a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng index 7aa379fa79..d15ba07ddd 100644 --- a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/br_web_vhost_domain.lng b/interface/web/sites/lib/lang/br_web_vhost_domain.lng index e0112150f4..1bfc89dab2 100644 --- a/interface/web/sites/lib/lang/br_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/br_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng index 031255b12f..ef42209deb 100644 --- a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng index 66ba53cf52..2c53aafe90 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain.lng b/interface/web/sites/lib/lang/de_web_vhost_domain.lng index cfda56602c..b9e5f16cce 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_domain.lng @@ -209,4 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Aufbewahrungsoption'; $wb['stats_anonymize_level_txt'] = 'Anonymisierungsstufe'; $wb['stats_anonymize_level_about_txt'] = 'Anonymisierung von IP-Adressen bei der Auswertung der Logdateien des Webservers.

  • Keine - z.B. 192.168.2.1 (Anonymisierung deaktiviert)
  • Anonymisiere letztes Byte - z.B. 192.168.2.0
  • Anonymisiere letzte zwei Bytes - z.B. 192.168.0.0 (Empfohlen)
  • Anonymisiere letzte drei Bytes - z.B. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymisierungsoption'; - +$wb['anonymize_none_txt'] = 'Keine'; +$wb['anonymize_last_byte_txt'] = 'Anonymisiere letztes Byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymisiere letzte zwei Bytes'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymisiere letzte drei Bytes'; diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng index d47f1e512d..74a46a67e0 100644 --- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain.lng b/interface/web/sites/lib/lang/en_web_vhost_domain.lng index 4cc9177c02..ab7e560efe 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_domain.lng @@ -214,5 +214,8 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; - +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; diff --git a/interface/web/sites/lib/lang/es_web_vhost_domain.lng b/interface/web/sites/lib/lang/es_web_vhost_domain.lng index 1f4aeddbc5..6ad84ed692 100644 --- a/interface/web/sites/lib/lang/es_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/es_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng index 99e7dd3fcd..ec9132a11c 100644 --- a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng index fe8635fdbc..fbee41031c 100644 --- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng index ee00a440d3..5b51754601 100644 --- a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng index f2dd832ef1..e0174c5d5f 100644 --- a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/id_web_vhost_domain.lng b/interface/web/sites/lib/lang/id_web_vhost_domain.lng index 70005b209f..c19d4e14c4 100644 --- a/interface/web/sites/lib/lang/id_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/id_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/it_web_vhost_domain.lng b/interface/web/sites/lib/lang/it_web_vhost_domain.lng index db73791c4d..8b1d524ef4 100644 --- a/interface/web/sites/lib/lang/it_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/it_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng index c1fdbc86b2..a765a89353 100644 --- a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng index 33db064bbf..a9bbf22f34 100644 --- a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng index ceaa68d428..72f9139b78 100644 --- a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng index 1c86b96c4b..ff7bd0c9f4 100644 --- a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng index 8fc9b398b4..78e4cc6a9e 100644 --- a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng index 7a13a6a597..16ab848975 100644 --- a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain.lng b/interface/web/sites/lib/lang/se_web_vhost_domain.lng index e64b205515..513e05de7c 100644 --- a/interface/web/sites/lib/lang/se_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/se_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng index 0b2780f46b..f6d0b3c9bf 100644 --- a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng @@ -209,3 +209,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng index 7b8b4343de..4997197ba8 100644 --- a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng @@ -211,3 +211,7 @@ $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file -- GitLab From 513e598e00542321f211476ab2a5f7988b317840 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Fri, 12 Aug 2022 12:53:28 +0200 Subject: [PATCH 10/24] - Added statsdb retention to reseller - Added a few missing DK translations --- interface/web/client/form/reseller.tform.php | 14 ++++++++++++++ interface/web/client/lib/lang/ar_client.lng | 1 + .../web/client/lib/lang/ar_client_template.lng | 1 + interface/web/client/lib/lang/ar_reseller.lng | 2 ++ interface/web/client/lib/lang/bg_client.lng | 1 + .../web/client/lib/lang/bg_client_template.lng | 1 + interface/web/client/lib/lang/bg_reseller.lng | 2 ++ interface/web/client/lib/lang/br_client.lng | 1 + .../web/client/lib/lang/br_client_template.lng | 2 ++ interface/web/client/lib/lang/br_reseller.lng | 2 ++ interface/web/client/lib/lang/ca_client.lng | 1 + .../web/client/lib/lang/ca_client_template.lng | 1 + interface/web/client/lib/lang/ca_reseller.lng | 2 ++ interface/web/client/lib/lang/cz_client.lng | 1 + .../web/client/lib/lang/cz_client_template.lng | 1 + interface/web/client/lib/lang/cz_reseller.lng | 2 ++ interface/web/client/lib/lang/de_client.lng | 1 + .../web/client/lib/lang/de_client_template.lng | 1 + interface/web/client/lib/lang/de_reseller.lng | 2 ++ interface/web/client/lib/lang/dk_client.lng | 3 ++- .../web/client/lib/lang/dk_client_template.lng | 1 + interface/web/client/lib/lang/dk_reseller.lng | 2 ++ interface/web/client/lib/lang/el_client.lng | 1 + .../web/client/lib/lang/el_client_template.lng | 1 + interface/web/client/lib/lang/el_reseller.lng | 2 ++ interface/web/client/lib/lang/en_client.lng | 1 + .../web/client/lib/lang/en_client_template.lng | 1 + interface/web/client/lib/lang/en_reseller.lng | 3 ++- interface/web/client/lib/lang/es_client.lng | 1 + .../web/client/lib/lang/es_client_template.lng | 1 + interface/web/client/lib/lang/es_reseller.lng | 2 ++ interface/web/client/lib/lang/fi_client.lng | 1 + .../web/client/lib/lang/fi_client_template.lng | 3 ++- interface/web/client/lib/lang/fi_reseller.lng | 2 ++ interface/web/client/lib/lang/fr_client.lng | 1 + .../web/client/lib/lang/fr_client_template.lng | 1 + interface/web/client/lib/lang/fr_reseller.lng | 2 ++ interface/web/client/lib/lang/hr_client.lng | 1 + .../web/client/lib/lang/hr_client_template.lng | 1 + interface/web/client/lib/lang/hr_reseller.lng | 2 ++ interface/web/client/lib/lang/hu_client.lng | 1 + .../web/client/lib/lang/hu_client_template.lng | 3 ++- interface/web/client/lib/lang/hu_reseller.lng | 2 ++ interface/web/client/lib/lang/id_client.lng | 1 + .../web/client/lib/lang/id_client_template.lng | 3 ++- interface/web/client/lib/lang/id_reseller.lng | 2 ++ interface/web/client/lib/lang/it_client.lng | 1 + .../web/client/lib/lang/it_client_template.lng | 1 + interface/web/client/lib/lang/it_reseller.lng | 2 ++ interface/web/client/lib/lang/ja_client.lng | 1 + .../web/client/lib/lang/ja_client_template.lng | 1 + interface/web/client/lib/lang/ja_reseller.lng | 2 ++ interface/web/client/lib/lang/nl_client.lng | 1 + .../web/client/lib/lang/nl_client_template.lng | 1 + interface/web/client/lib/lang/nl_reseller.lng | 2 ++ interface/web/client/lib/lang/pl_client.lng | 3 ++- .../web/client/lib/lang/pl_client_template.lng | 3 ++- interface/web/client/lib/lang/pl_reseller.lng | 2 ++ interface/web/client/lib/lang/pt_client.lng | 1 + .../web/client/lib/lang/pt_client_template.lng | 1 + interface/web/client/lib/lang/pt_reseller.lng | 2 ++ interface/web/client/lib/lang/ro_client.lng | 1 + .../web/client/lib/lang/ro_client_template.lng | 1 + interface/web/client/lib/lang/ro_reseller.lng | 2 ++ interface/web/client/lib/lang/ru_client.lng | 1 + .../web/client/lib/lang/ru_client_template.lng | 1 + interface/web/client/lib/lang/ru_reseller.lng | 2 ++ interface/web/client/lib/lang/se_client.lng | 1 + .../web/client/lib/lang/se_client_template.lng | 1 + interface/web/client/lib/lang/se_reseller.lng | 2 ++ interface/web/client/lib/lang/sk_client.lng | 1 + .../web/client/lib/lang/sk_client_template.lng | 3 ++- interface/web/client/lib/lang/sk_reseller.lng | 2 ++ interface/web/client/lib/lang/tr_client.lng | 1 + .../web/client/lib/lang/tr_client_template.lng | 1 + interface/web/client/lib/lang/tr_reseller.lng | 3 ++- .../web/client/templates/client_edit_limits.htm | 3 ++- .../web/client/templates/reseller_edit_limits.htm | 8 ++++++-- .../web/sites/lib/lang/dk_web_vhost_domain.lng | 6 +++++- 79 files changed, 135 insertions(+), 13 deletions(-) diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php index d48dea6229..197663662f 100644 --- a/interface/web/client/form/reseller.tform.php +++ b/interface/web/client/form/reseller.tform.php @@ -1266,6 +1266,20 @@ $form["tabs"]['limits'] = array ( 'default' => 'n', 'value' => array(0 => 'n', 1 => 'y') ), + 'limit_statsdb_retention' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_statsdb_retention_error_notint'), + ), + 'default' => '0', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), 'default_dnsserver' => array ( 'datatype' => 'INTEGER', 'formtype' => 'SELECT', diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index b39cfb478d..f826b0cb94 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng index 187f8b236c..914167c291 100644 --- a/interface/web/client/lib/lang/ar_client_template.lng +++ b/interface/web/client/lib/lang/ar_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng index 9f3ce64e80..28f94fe2b1 100644 --- a/interface/web/client/lib/lang/ar_reseller.lng +++ b/interface/web/client/lib/lang/ar_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index 84cbe78b61..e82e30d3b5 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng index 6793863900..63099637cb 100644 --- a/interface/web/client/lib/lang/bg_client_template.lng +++ b/interface/web/client/lib/lang/bg_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng index bd25475c64..cbaf8b9f90 100644 --- a/interface/web/client/lib/lang/bg_reseller.lng +++ b/interface/web/client/lib/lang/bg_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index 7c552e6b43..dd0e112fdf 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -207,3 +207,4 @@ $wb['limit_directive_snippets_txt'] = 'Exibir configurações de seleção do se $wb['Address'] = 'Cliente'; $wb['Limits'] = 'Limites'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng index 6428bef042..9a62ce20f1 100644 --- a/interface/web/client/lib/lang/br_client_template.lng +++ b/interface/web/client/lib/lang/br_client_template.lng @@ -129,3 +129,5 @@ $wb['Limits'] = 'Limites'; $wb['Client-Templates'] = 'Gabaritos de clientes'; $wb['Template'] = 'Gabarito'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; + diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng index fea2945178..570c5de427 100644 --- a/interface/web/client/lib/lang/br_reseller.lng +++ b/interface/web/client/lib/lang/br_reseller.lng @@ -210,3 +210,5 @@ $wb['limit_database_quota_error_notint'] = 'A cota do Banco de Dados deve ser um $wb['Reseller'] = 'Revenda'; $wb['Address'] = 'Revenda'; $wb['Limits'] = 'Limites'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/ca_client.lng b/interface/web/client/lib/lang/ca_client.lng index eda319df9b..d138ead9c8 100644 --- a/interface/web/client/lib/lang/ca_client.lng +++ b/interface/web/client/lib/lang/ca_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ca_client_template.lng b/interface/web/client/lib/lang/ca_client_template.lng index c56c56e5bd..052e416034 100644 --- a/interface/web/client/lib/lang/ca_client_template.lng +++ b/interface/web/client/lib/lang/ca_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ca_reseller.lng b/interface/web/client/lib/lang/ca_reseller.lng index 7d92ced988..842ae7ed58 100644 --- a/interface/web/client/lib/lang/ca_reseller.lng +++ b/interface/web/client/lib/lang/ca_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index 748916098b..758aa619f5 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'Limit DNS záznamů musí být číslo.' $wb['Address'] = 'Adresa'; $wb['Limits'] = 'Limity'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng index e36fb2b99b..097967108a 100644 --- a/interface/web/client/lib/lang/cz_client_template.lng +++ b/interface/web/client/lib/lang/cz_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Databázové servery'; $wb['mail_servers_txt'] = 'E-mailové servery'; $wb['Limits'] = 'Limity'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index 3b137a11bc..8c0bda4ff0 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Pro nastavení klikni zde'; $wb['Reseller'] = 'Prodejce'; $wb['Address'] = 'Adresa'; $wb['Limits'] = 'Limity'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 28b30ecef9..ad1634ba79 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Tage an gespeicherten GoAccess DB-Statistiken'; +$wb['limit_statsdb_retention_error_notint'] = 'Die Aufbewahrungsdauer der GoAccess-Statistiken muss eine Zahl sein'; diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng index d71dc0501c..54fabae72a 100644 --- a/interface/web/client/lib/lang/de_client_template.lng +++ b/interface/web/client/lib/lang/de_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Datenbank-Server'; $wb['mail_servers_txt'] = 'Mail-Server'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Tage an gespeicherten GoAccess DB-Statistiken'; +$wb['limit_statsdb_retention_error_notint'] = 'Die Aufbewahrungsdauer der GoAccess-Statistiken muss eine Zahl sein'; diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index 108cf7cd95..303c9242f6 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Tage an gespeicherten GoAccess DB-Statistiken'; +$wb['limit_statsdb_retention_error_notint'] = 'Die Aufbewahrungsdauer der GoAccess-Statistiken muss eine Zahl sein'; diff --git a/interface/web/client/lib/lang/dk_client.lng b/interface/web/client/lib/lang/dk_client.lng index 35c7635034..cba149ae8e 100644 --- a/interface/web/client/lib/lang/dk_client.lng +++ b/interface/web/client/lib/lang/dk_client.lng @@ -206,4 +206,5 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/dk_client_template.lng b/interface/web/client/lib/lang/dk_client_template.lng index 22f9168dd8..9e29963fc9 100644 --- a/interface/web/client/lib/lang/dk_client_template.lng +++ b/interface/web/client/lib/lang/dk_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/dk_reseller.lng b/interface/web/client/lib/lang/dk_reseller.lng index 816d9a35ef..d413c2faaa 100644 --- a/interface/web/client/lib/lang/dk_reseller.lng +++ b/interface/web/client/lib/lang/dk_reseller.lng @@ -210,3 +210,5 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index de864b8ee1..01a40e7a91 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng index a3ba37bfec..f382a4ca56 100644 --- a/interface/web/client/lib/lang/el_client_template.lng +++ b/interface/web/client/lib/lang/el_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng index 512351c8f0..f0de02e494 100644 --- a/interface/web/client/lib/lang/el_reseller.lng +++ b/interface/web/client/lib/lang/el_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index a00a3bd4ee..f608e6a888 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -209,3 +209,4 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng index 82296f3fa7..1e840052b1 100644 --- a/interface/web/client/lib/lang/en_client_template.lng +++ b/interface/web/client/lib/lang/en_client_template.lng @@ -130,3 +130,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index d243c28cc1..8c6bee9f7c 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -179,7 +179,6 @@ $wb['customer_no_template_txt'] = 'Customer No. template'; $wb['customer_no_template_error_regex_txt'] = 'The customer No. template contains invalid characters'; $wb['customer_no_start_txt'] = 'Customer No. start value'; $wb['customer_no_counter_txt'] = 'Customer No. counter'; - $wb['xmpp_limits_txt'] = 'XMPP Limits'; $wb['xmpp_servers_txt'] = 'XMPP Servers'; $wb['xmpp_servers_placeholder'] = 'Select XMPP Servers'; @@ -214,3 +213,5 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index d9ed1efdf7..4a4898b494 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng index f1d547d020..53d4d9e8cc 100644 --- a/interface/web/client/lib/lang/es_client_template.lng +++ b/interface/web/client/lib/lang/es_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng index 9fe710e6e3..3601950485 100644 --- a/interface/web/client/lib/lang/es_reseller.lng +++ b/interface/web/client/lib/lang/es_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index b3bb65143d..2d04222c27 100644 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng index 99a9c0d88e..bdf3ce9d40 100644 --- a/interface/web/client/lib/lang/fi_client_template.lng +++ b/interface/web/client/lib/lang/fi_client_template.lng @@ -126,4 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng index 5c16e70264..8ecd615be4 100644 --- a/interface/web/client/lib/lang/fi_reseller.lng +++ b/interface/web/client/lib/lang/fi_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index 8a7fcd9993..b9c1c9b9db 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng index 8072bc104a..c9c3440e86 100644 --- a/interface/web/client/lib/lang/fr_client_template.lng +++ b/interface/web/client/lib/lang/fr_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng index 867e9d5da0..87455885f3 100644 --- a/interface/web/client/lib/lang/fr_reseller.lng +++ b/interface/web/client/lib/lang/fr_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index 4b32f60ddc..ba6fa55e72 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng index c010c45c46..2823b8f6c2 100644 --- a/interface/web/client/lib/lang/hr_client_template.lng +++ b/interface/web/client/lib/lang/hr_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng index aaedd0b1c5..bfb473264c 100644 --- a/interface/web/client/lib/lang/hr_reseller.lng +++ b/interface/web/client/lib/lang/hr_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index 2616e91274..21082b7229 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng index 1715ba40d8..d52a463f09 100644 --- a/interface/web/client/lib/lang/hu_client_template.lng +++ b/interface/web/client/lib/lang/hu_client_template.lng @@ -126,4 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng index 26fffbc7e3..7e08de8aff 100644 --- a/interface/web/client/lib/lang/hu_reseller.lng +++ b/interface/web/client/lib/lang/hu_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng index b4f6da93ce..874c5e8e3e 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng index 238114e0cb..ac0dda4118 100644 --- a/interface/web/client/lib/lang/id_client_template.lng +++ b/interface/web/client/lib/lang/id_client_template.lng @@ -126,4 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng index 01195a244c..a0153328ec 100644 --- a/interface/web/client/lib/lang/id_reseller.lng +++ b/interface/web/client/lib/lang/id_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index 89759ee4b2..6b2bd2cb33 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'Il limite di record DNS deve essere un n $wb['Address'] = 'Indirizzo'; $wb['Limits'] = 'Limiti'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng index 1cc51caccd..ae4f42fcfc 100644 --- a/interface/web/client/lib/lang/it_client_template.lng +++ b/interface/web/client/lib/lang/it_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limiti'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng index 2acac2cb60..62c4507339 100644 --- a/interface/web/client/lib/lang/it_reseller.lng +++ b/interface/web/client/lib/lang/it_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Clicca per impostare'; $wb['Reseller'] = 'Rivenditore'; $wb['Address'] = 'Indirizzo'; $wb['Limits'] = 'Limiti'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index 2367889d52..8db40340af 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng index 5b4bbeaad3..6289f2629f 100644 --- a/interface/web/client/lib/lang/ja_client_template.lng +++ b/interface/web/client/lib/lang/ja_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng index 041174da1b..b13d4100b3 100644 --- a/interface/web/client/lib/lang/ja_reseller.lng +++ b/interface/web/client/lib/lang/ja_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index dd22d76db0..69db1e8d33 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng index 2a93108e2a..23ad63c7b7 100644 --- a/interface/web/client/lib/lang/nl_client_template.lng +++ b/interface/web/client/lib/lang/nl_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index e67e560e93..27bd9723ff 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -210,3 +210,5 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index caa5570724..5f99518952 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -206,4 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng index 47e049e4fa..640529c8dd 100644 --- a/interface/web/client/lib/lang/pl_client_template.lng +++ b/interface/web/client/lib/lang/pl_client_template.lng @@ -126,4 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index da566ab4c6..a938e53025 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index 64ebba78ef..37155df099 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng index c02d7e3acb..f4cf99b85a 100644 --- a/interface/web/client/lib/lang/pt_client_template.lng +++ b/interface/web/client/lib/lang/pt_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng index 22c4f107a8..3932a4c643 100644 --- a/interface/web/client/lib/lang/pt_reseller.lng +++ b/interface/web/client/lib/lang/pt_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index eb40ce10ed..fc7498be58 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng index c0690b3a2e..2e7fd5528a 100644 --- a/interface/web/client/lib/lang/ro_client_template.lng +++ b/interface/web/client/lib/lang/ro_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng index 9f3ce64e80..28f94fe2b1 100644 --- a/interface/web/client/lib/lang/ro_reseller.lng +++ b/interface/web/client/lib/lang/ro_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index 16318d3de9..ffd489a7de 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'Лимит вторичных DNS-зон $wb['Address'] = 'Address'; $wb['Limits'] = 'Лимиты'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng index 02900e9d5a..13dd527161 100644 --- a/interface/web/client/lib/lang/ru_client_template.lng +++ b/interface/web/client/lib/lang/ru_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Серверы баз данных'; $wb['mail_servers_txt'] = 'Серверы почты'; $wb['Limits'] = 'Лимиты'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index 3447e52070..3aff5dbaed 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Клик для установки'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Лимиты'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index 14d66cc829..65a24c834c 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng index dd9ce2baae..38e4024296 100644 --- a/interface/web/client/lib/lang/se_client_template.lng +++ b/interface/web/client/lib/lang/se_client_template.lng @@ -127,3 +127,4 @@ $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng index 9f3ce64e80..28f94fe2b1 100644 --- a/interface/web/client/lib/lang/se_reseller.lng +++ b/interface/web/client/lib/lang/se_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index a4972a1311..ef1341fc01 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -207,3 +207,4 @@ $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng index bcb5641808..49d528b983 100644 --- a/interface/web/client/lib/lang/sk_client_template.lng +++ b/interface/web/client/lib/lang/sk_client_template.lng @@ -126,4 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng index a00b1a4156..6c51dd84ad 100644 --- a/interface/web/client/lib/lang/sk_reseller.lng +++ b/interface/web/client/lib/lang/sk_reseller.lng @@ -210,3 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index 26d42b427c..fdb7759d5c 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -209,3 +209,4 @@ $wb['limit_directive_snippets_txt'] = 'Web Sunucu Yapılandırma Seçimi Görün $wb['Address'] = 'Address'; $wb['Limits'] = 'Sınırlar'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng index 7887b41793..aebaccc5e1 100644 --- a/interface/web/client/lib/lang/tr_client_template.lng +++ b/interface/web/client/lib/lang/tr_client_template.lng @@ -130,3 +130,4 @@ $wb['db_servers_txt'] = 'Veritabanı Sunucuları'; $wb['mail_servers_txt'] = 'E-posta Sunucuları'; $wb['Limits'] = 'Sınırlar'; $wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng index 31da0d1bc4..7eda056246 100644 --- a/interface/web/client/lib/lang/tr_reseller.lng +++ b/interface/web/client/lib/lang/tr_reseller.lng @@ -179,7 +179,6 @@ $wb['customer_no_template_txt'] = 'Müşteri No Kalıbı'; $wb['customer_no_template_error_regex_txt'] = 'Müşteri no kalıbında geçersiz karakterler var'; $wb['customer_no_start_txt'] = 'Müşteri No Başlangıç Değeri'; $wb['customer_no_counter_txt'] = 'Müşteri No Sayacı'; - $wb['xmpp_limits_txt'] = 'XMPP Sınırları'; $wb['xmpp_servers_txt'] = 'XMPP Sunucular'; $wb['xmpp_servers_placeholder'] = 'XMPP Sunucuları Seçin'; @@ -214,3 +213,5 @@ $wb['limit_database_quota_error_notint'] = 'Veritabanı kotası sınırı bir sa $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Sınırlar'; +$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index fed18a69f6..b16f1cb22d 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -170,7 +170,8 @@
-
+
+
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm index eee685ac51..d4b5b99570 100644 --- a/interface/web/client/templates/reseller_edit_limits.htm +++ b/interface/web/client/templates/reseller_edit_limits.htm @@ -170,6 +170,10 @@ {tmpl_var name='limit_directive_snippets'} +
+ +
+
@@ -494,7 +498,7 @@ diff --git a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng index 6fe363cc99..a9ebd56aec 100644 --- a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng @@ -208,4 +208,8 @@ $wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; -$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; \ No newline at end of file +$wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; +$wb['anonymize_none_txt'] = 'None'; +$wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file -- GitLab From 54130c756f7789d4ee688a82f20a8857733e4343 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 16 Aug 2022 11:52:17 +0200 Subject: [PATCH 11/24] Updated cronjob --- .../lib/classes/cron.d/150-goaccess.inc.php | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/server/lib/classes/cron.d/150-goaccess.inc.php b/server/lib/classes/cron.d/150-goaccess.inc.php index 083e02cb6a..b75f6c0ff1 100644 --- a/server/lib/classes/cron.d/150-goaccess.inc.php +++ b/server/lib/classes/cron.d/150-goaccess.inc.php @@ -194,26 +194,22 @@ class cronjob_goaccess extends cronjob { $sql_user = "SELECT client_id FROM sys_group WHERE groupid = ?"; $rec_user = $app->db->queryOneRecord($sql_user, $rec['sys_groupid']); - $lang_query = "SELECT country,language FROM client WHERE client_id = ?"; + $lang_query = "SELECT language FROM client WHERE client_id = ?"; $lang_user = $app->db->queryOneRecord($lang_query, $rec_user['client_id']); - $cust_lang = $lang_user['language'] . "_" . strtoupper($lang_user['language']) . ".UTF-8"; + $cust_lang = $lang_user['language']."_".strtoupper($lang_user['language']).".UTF-8"; + + $statsdb_retention = $rec['statsdb_retention']; $stats_anonymize_level = $rec['stats_anonymize_level']; switch ($lang_user['language']) { - case 'en': - $cust_lang = 'en_UK.UTF-8'; - break; case 'br': $cust_lang = 'pt_BR.UTF-8'; break; case 'pt': $cust_lang = 'pt_BR.UTF-8'; break; - case 'ca': - $cust_lang = 'en_US.UTF-8'; - break; case 'ja': $cust_lang = 'ja_JP.UTF-8'; break; @@ -240,32 +236,44 @@ class cronjob_goaccess extends cronjob { For versions prior 1.4 you need GoAccess with B+Tree support compiled! */ - if (version_compare($goaccess_version, 1.4) >= 0) { + if (version_compare($goaccess_version, "1.4") >= 0) { + // GoAccess defaults to EN, so we simply skip the LANG variable if none was set or if the client's language was set to EN. + if ($lang_user['language'] == 'en' || is_null($lang_user['language'])) { + $goa_cmd = "goaccess -f " . $logfile . " --config-file " . $goaccess_conf . " --restore --persist"; + } else { + $goa_cmd = "LANG=" . $cust_lang . " goaccess -f " . $logfile . " --config-file " . $goaccess_conf . " --restore --persist"; + } if ($statsdb_retention > 0) { - $keep_last = "--keep-last=" . $statsdb_retention; - } else { - $keep_last = null; + $goa_cmd .= " --keep-last=" . $statsdb_retention; } if ($stats_anonymize_level > 0) { if (version_compare($goaccess_version, "1.5.6") >= 0) { - $anonymize_level = " --anonymize-ip --anonymize-level=" . $stats_anonymize_level; + $goa_cmd .= " --anonymize-ip --anonymize-level=" . $stats_anonymize_level; } else { $app->log("GoAccess version is too old. The anonymize-ip option requires GoAccess to be at least >= 1.5.6 or newer", LOGLEVEL_DEBUG); - $anonymize_level = null; } - } else { - $anonymize_level = null; } - - $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --restore --persist --db-path=? " . $keep_last . $anonymize_level . " --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html); + + $goa_cmd .= " --db-path=" . $goa_db_dir . " --output=" . $output_html; + + $app->system->exec_safe($goa_cmd); } else { $output = $app->system->system_safe('goaccess --help 2>&1'); preg_match('/keep-db-files/', $output, $match); if ($match[0] == "keep-db-files") { - $app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --load-from-disk --keep-db-files --db-path=? --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html); + if ($lang_user['language'] == 'en' || is_null($lang_user['language'])) { + $goa_cmd = "goaccess -f " . $logfile . " --config-file " . $goaccess_conf . " --load-from-disk --keep-db-files"; + } else { + $goa_cmd = "LANG=" . $cust_lang . " goaccess -f " . $logfile . " --config-file " . $goaccess_conf . " --load-from-disk --keep-db-files"; + } + + $goa_cmd .= " --db-path=" . $goa_db_dir . " --output=" . $output_html; + + $app->system->exec_safe($goa_cmd); + } else { $app->log("Stats couldn't be generated. The GoAccess binary wasn't compiled with B+Tree support. Please recompile/reinstall GoAccess with B+Tree support, or install GoAccess version >= 1.4! (RECOMMENDED)", LOGLEVEL_WARN); } @@ -278,6 +286,7 @@ class cronjob_goaccess extends cronjob { unset($lang_query); unset($lang_user); unset($keep_last); + unset($goa_cmd); if (!is_file($rec['document_root'] . "/" . $web_folder . "/stats/index.php")) { if (file_exists("/usr/local/ispconfig/server/conf-custom/goaccess_index.php.master")) { -- GitLab From e20573c1f4dbbef6aedd5ff07b87fe7a2ae35c4c Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Fri, 26 Aug 2022 14:00:17 +0200 Subject: [PATCH 12/24] Update formatting --- server/lib/classes/cron.d/150-goaccess.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/classes/cron.d/150-goaccess.inc.php b/server/lib/classes/cron.d/150-goaccess.inc.php index b75f6c0ff1..7fc419c876 100644 --- a/server/lib/classes/cron.d/150-goaccess.inc.php +++ b/server/lib/classes/cron.d/150-goaccess.inc.php @@ -196,7 +196,7 @@ class cronjob_goaccess extends cronjob { $rec_user = $app->db->queryOneRecord($sql_user, $rec['sys_groupid']); $lang_query = "SELECT language FROM client WHERE client_id = ?"; $lang_user = $app->db->queryOneRecord($lang_query, $rec_user['client_id']); - $cust_lang = $lang_user['language']."_".strtoupper($lang_user['language']).".UTF-8"; + $cust_lang = $lang_user['language'] . "_" . strtoupper($lang_user['language']) . ".UTF-8"; $statsdb_retention = $rec['statsdb_retention']; -- GitLab From e6ffc75f2132cb9f6d666601e92542bb394a1e54 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Wed, 14 Sep 2022 14:03:39 +0200 Subject: [PATCH 13/24] Update regex pattern --- interface/lib/classes/validate_statsdb_retention.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/lib/classes/validate_statsdb_retention.inc.php b/interface/lib/classes/validate_statsdb_retention.inc.php index 19c2678163..02dd9f9c55 100644 --- a/interface/lib/classes/validate_statsdb_retention.inc.php +++ b/interface/lib/classes/validate_statsdb_retention.inc.php @@ -65,7 +65,7 @@ class validate_statsdb_retention { } - if(!preg_match('/^([0-9]{1,4})$/', $field_value)) { + if(!preg_match('/^(0|[1-9][0-9]?[0-9]?[0-9]?)$/', $field_value)) { $limit_statsdb_retention_min = 0; $limit_statsdb_retention_max = 9999; $lng_text = $this->get_error($validator['errmsg']); -- GitLab From b3d4e8b8e11cf6fb6248b362a0f565dd9dbe6fcf Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Wed, 14 Sep 2022 17:24:53 +0200 Subject: [PATCH 14/24] Fix typo in lng files --- interface/web/sites/lib/lang/ar_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/bg_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/br_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/ca_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/cz_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/dk_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/el_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/en_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/es_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/fi_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/fr_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/hr_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/hu_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/id_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/it_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/ja_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/nl_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/pl_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/pt_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/ro_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/ru_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/se_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/sk_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/tr_web_vhost_domain.lng | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng index 9ce90f4cc6..f9848b898b 100644 --- a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; diff --git a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng index d15ba07ddd..c86c7b05cf 100644 --- a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/br_web_vhost_domain.lng b/interface/web/sites/lib/lang/br_web_vhost_domain.lng index 1bfc89dab2..13a0304ee0 100644 --- a/interface/web/sites/lib/lang/br_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/br_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng index ef42209deb..5d2c20edd5 100644 --- a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng index 2c53aafe90..3ad287f3a7 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng index a9ebd56aec..06ded1af06 100644 --- a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng index 74a46a67e0..a09e579ae3 100644 --- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain.lng b/interface/web/sites/lib/lang/en_web_vhost_domain.lng index ab7e560efe..4b933f398b 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_domain.lng @@ -216,6 +216,6 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; diff --git a/interface/web/sites/lib/lang/es_web_vhost_domain.lng b/interface/web/sites/lib/lang/es_web_vhost_domain.lng index 6ad84ed692..b41b3ce3ca 100644 --- a/interface/web/sites/lib/lang/es_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/es_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng index ec9132a11c..bd2a65eefc 100644 --- a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng index fbee41031c..45fcf27021 100644 --- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng index 5b51754601..e60bb06cad 100644 --- a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng index e0174c5d5f..bc77ea088b 100644 --- a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/id_web_vhost_domain.lng b/interface/web/sites/lib/lang/id_web_vhost_domain.lng index c19d4e14c4..ca9f2d19ce 100644 --- a/interface/web/sites/lib/lang/id_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/id_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/it_web_vhost_domain.lng b/interface/web/sites/lib/lang/it_web_vhost_domain.lng index 8b1d524ef4..6253ee6c9d 100644 --- a/interface/web/sites/lib/lang/it_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/it_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng index a765a89353..1641c6aee1 100644 --- a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng index a9bbf22f34..799ad5571e 100644 --- a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng index 72f9139b78..6a58471e15 100644 --- a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng index ff7bd0c9f4..b2a2eae7af 100644 --- a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng index 78e4cc6a9e..a844053775 100644 --- a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng index 16ab848975..298f044cde 100644 --- a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain.lng b/interface/web/sites/lib/lang/se_web_vhost_domain.lng index 513e05de7c..9f68e2d4de 100644 --- a/interface/web/sites/lib/lang/se_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/se_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng index f6d0b3c9bf..7022b59bc9 100644 --- a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng @@ -211,5 +211,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file diff --git a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng index 4997197ba8..2334cb6d4e 100644 --- a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng @@ -213,5 +213,5 @@ $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when pro $wb['stats_anonymize_level_option_txt'] = 'Anonymization option'; $wb['anonymize_none_txt'] = 'None'; $wb['anonymize_last_byte_txt'] = 'Anonymize last byte'; -$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last byte'; +$wb['anonymize_last_two_bytes_txt'] = 'Anonymize last two bytes'; $wb['anonymize_last_three_bytes_txt'] = 'Anonymize last three bytes'; \ No newline at end of file -- GitLab From cd780c4eba97783dcdd409b7cab252ab284d8df9 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Sun, 9 Oct 2022 13:11:53 +0200 Subject: [PATCH 15/24] update labels --- interface/web/client/lib/lang/ar_client.lng | 2 +- interface/web/client/lib/lang/ar_client_template.lng | 2 +- interface/web/client/lib/lang/ar_reseller.lng | 2 +- interface/web/client/lib/lang/bg_client.lng | 2 +- interface/web/client/lib/lang/bg_client_template.lng | 2 +- interface/web/client/lib/lang/bg_reseller.lng | 2 +- interface/web/client/lib/lang/br_client.lng | 2 +- interface/web/client/lib/lang/br_client_template.lng | 2 +- interface/web/client/lib/lang/br_reseller.lng | 2 +- interface/web/client/lib/lang/ca_client.lng | 2 +- interface/web/client/lib/lang/ca_client_template.lng | 2 +- interface/web/client/lib/lang/ca_reseller.lng | 2 +- interface/web/client/lib/lang/cz_client.lng | 2 +- interface/web/client/lib/lang/cz_client_template.lng | 2 +- interface/web/client/lib/lang/cz_reseller.lng | 2 +- interface/web/client/lib/lang/dk_client.lng | 2 +- interface/web/client/lib/lang/dk_client_template.lng | 2 +- interface/web/client/lib/lang/dk_reseller.lng | 2 +- interface/web/client/lib/lang/el_client.lng | 2 +- interface/web/client/lib/lang/el_client_template.lng | 2 +- interface/web/client/lib/lang/el_reseller.lng | 2 +- interface/web/client/lib/lang/en_client.lng | 2 +- interface/web/client/lib/lang/en_client_template.lng | 2 +- interface/web/client/lib/lang/en_reseller.lng | 2 +- interface/web/client/lib/lang/es_client.lng | 2 +- interface/web/client/lib/lang/es_client_template.lng | 2 +- interface/web/client/lib/lang/es_reseller.lng | 2 +- interface/web/client/lib/lang/fi_client.lng | 2 +- interface/web/client/lib/lang/fi_client_template.lng | 2 +- interface/web/client/lib/lang/fi_reseller.lng | 2 +- interface/web/client/lib/lang/fr_client.lng | 2 +- interface/web/client/lib/lang/fr_client_template.lng | 2 +- interface/web/client/lib/lang/fr_reseller.lng | 2 +- interface/web/client/lib/lang/hr_client.lng | 2 +- interface/web/client/lib/lang/hr_client_template.lng | 2 +- interface/web/client/lib/lang/hr_reseller.lng | 2 +- interface/web/client/lib/lang/hu_client.lng | 2 +- interface/web/client/lib/lang/hu_client_template.lng | 2 +- interface/web/client/lib/lang/hu_reseller.lng | 2 +- interface/web/client/lib/lang/id_client.lng | 2 +- interface/web/client/lib/lang/id_client_template.lng | 2 +- interface/web/client/lib/lang/id_reseller.lng | 2 +- interface/web/client/lib/lang/it_client.lng | 2 +- interface/web/client/lib/lang/it_client_template.lng | 2 +- interface/web/client/lib/lang/it_reseller.lng | 2 +- interface/web/client/lib/lang/ja_client.lng | 2 +- interface/web/client/lib/lang/ja_client_template.lng | 2 +- interface/web/client/lib/lang/ja_reseller.lng | 2 +- interface/web/client/lib/lang/nl_client.lng | 2 +- interface/web/client/lib/lang/nl_client_template.lng | 2 +- interface/web/client/lib/lang/nl_reseller.lng | 2 +- interface/web/client/lib/lang/pl_client.lng | 2 +- interface/web/client/lib/lang/pl_client_template.lng | 2 +- interface/web/client/lib/lang/pl_reseller.lng | 2 +- interface/web/client/lib/lang/pt_client.lng | 2 +- interface/web/client/lib/lang/pt_client_template.lng | 2 +- interface/web/client/lib/lang/pt_reseller.lng | 2 +- interface/web/client/lib/lang/ro_client.lng | 2 +- interface/web/client/lib/lang/ro_client_template.lng | 2 +- interface/web/client/lib/lang/ro_reseller.lng | 2 +- interface/web/client/lib/lang/ru_client.lng | 2 +- interface/web/client/lib/lang/ru_client_template.lng | 2 +- interface/web/client/lib/lang/ru_reseller.lng | 2 +- interface/web/client/lib/lang/se_client.lng | 2 +- interface/web/client/lib/lang/se_client_template.lng | 2 +- interface/web/client/lib/lang/se_reseller.lng | 2 +- interface/web/client/lib/lang/sk_client.lng | 2 +- interface/web/client/lib/lang/sk_client_template.lng | 2 +- interface/web/client/lib/lang/sk_reseller.lng | 2 +- interface/web/client/lib/lang/tr_client.lng | 2 +- interface/web/client/lib/lang/tr_client_template.lng | 2 +- interface/web/client/lib/lang/tr_reseller.lng | 2 +- 72 files changed, 72 insertions(+), 72 deletions(-) diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index f826b0cb94..842e03007a 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng index 914167c291..c2bcb5a2a4 100644 --- a/interface/web/client/lib/lang/ar_client_template.lng +++ b/interface/web/client/lib/lang/ar_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng index 28f94fe2b1..ba3748cd9f 100644 --- a/interface/web/client/lib/lang/ar_reseller.lng +++ b/interface/web/client/lib/lang/ar_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index e82e30d3b5..e9d445d491 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng index 63099637cb..aef949053a 100644 --- a/interface/web/client/lib/lang/bg_client_template.lng +++ b/interface/web/client/lib/lang/bg_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng index cbaf8b9f90..3167539970 100644 --- a/interface/web/client/lib/lang/bg_reseller.lng +++ b/interface/web/client/lib/lang/bg_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index dd0e112fdf..f0c58b10e6 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -206,5 +206,5 @@ $wb['email_error_empty'] = 'O email está vazio'; $wb['limit_directive_snippets_txt'] = 'Exibir configurações de seleção do servidor Web'; $wb['Address'] = 'Cliente'; $wb['Limits'] = 'Limites'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng index 9a62ce20f1..d744afdaf4 100644 --- a/interface/web/client/lib/lang/br_client_template.lng +++ b/interface/web/client/lib/lang/br_client_template.lng @@ -128,6 +128,6 @@ $wb['mail_servers_txt'] = 'Servidores de email'; $wb['Limits'] = 'Limites'; $wb['Client-Templates'] = 'Gabaritos de clientes'; $wb['Template'] = 'Gabarito'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng index 570c5de427..01e9369b18 100644 --- a/interface/web/client/lib/lang/br_reseller.lng +++ b/interface/web/client/lib/lang/br_reseller.lng @@ -210,5 +210,5 @@ $wb['limit_database_quota_error_notint'] = 'A cota do Banco de Dados deve ser um $wb['Reseller'] = 'Revenda'; $wb['Address'] = 'Revenda'; $wb['Limits'] = 'Limites'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/ca_client.lng b/interface/web/client/lib/lang/ca_client.lng index d138ead9c8..c6e50bf73c 100644 --- a/interface/web/client/lib/lang/ca_client.lng +++ b/interface/web/client/lib/lang/ca_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ca_client_template.lng b/interface/web/client/lib/lang/ca_client_template.lng index 052e416034..a3947da8d7 100644 --- a/interface/web/client/lib/lang/ca_client_template.lng +++ b/interface/web/client/lib/lang/ca_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ca_reseller.lng b/interface/web/client/lib/lang/ca_reseller.lng index 842ae7ed58..4337bf4405 100644 --- a/interface/web/client/lib/lang/ca_reseller.lng +++ b/interface/web/client/lib/lang/ca_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index 758aa619f5..7159bbcb02 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Pro nastavení klikni zde'; $wb['limit_dns_record_error_notint'] = 'Limit DNS záznamů musí být číslo.'; $wb['Address'] = 'Adresa'; $wb['Limits'] = 'Limity'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng index 097967108a..9efc4243c2 100644 --- a/interface/web/client/lib/lang/cz_client_template.lng +++ b/interface/web/client/lib/lang/cz_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webové servery'; $wb['db_servers_txt'] = 'Databázové servery'; $wb['mail_servers_txt'] = 'E-mailové servery'; $wb['Limits'] = 'Limity'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index 8c0bda4ff0..a67d393d8e 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Pro nastavení klikni zde'; $wb['Reseller'] = 'Prodejce'; $wb['Address'] = 'Adresa'; $wb['Limits'] = 'Limity'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/dk_client.lng b/interface/web/client/lib/lang/dk_client.lng index cba149ae8e..d58b4384c6 100644 --- a/interface/web/client/lib/lang/dk_client.lng +++ b/interface/web/client/lib/lang/dk_client.lng @@ -206,5 +206,5 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/dk_client_template.lng b/interface/web/client/lib/lang/dk_client_template.lng index 9e29963fc9..24afad5e06 100644 --- a/interface/web/client/lib/lang/dk_client_template.lng +++ b/interface/web/client/lib/lang/dk_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/dk_reseller.lng b/interface/web/client/lib/lang/dk_reseller.lng index d413c2faaa..6604f812f4 100644 --- a/interface/web/client/lib/lang/dk_reseller.lng +++ b/interface/web/client/lib/lang/dk_reseller.lng @@ -210,5 +210,5 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index 01a40e7a91..8cdb6b3cb3 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng index f382a4ca56..d88d536d2f 100644 --- a/interface/web/client/lib/lang/el_client_template.lng +++ b/interface/web/client/lib/lang/el_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng index f0de02e494..9904f2a2e3 100644 --- a/interface/web/client/lib/lang/el_reseller.lng +++ b/interface/web/client/lib/lang/el_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index f608e6a888..0a08fa2864 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -208,5 +208,5 @@ $wb['email_error_empty'] = 'Email is empty'; $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng index 1e840052b1..8436f30260 100644 --- a/interface/web/client/lib/lang/en_client_template.lng +++ b/interface/web/client/lib/lang/en_client_template.lng @@ -129,5 +129,5 @@ $wb['xmpp_servers_txt'] = 'XMPP Servers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index 8c6bee9f7c..e6948c4475 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -213,5 +213,5 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index 4a4898b494..a4f69dbdfa 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng index 53d4d9e8cc..85350d7816 100644 --- a/interface/web/client/lib/lang/es_client_template.lng +++ b/interface/web/client/lib/lang/es_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng index 3601950485..58fe34f128 100644 --- a/interface/web/client/lib/lang/es_reseller.lng +++ b/interface/web/client/lib/lang/es_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index 2d04222c27..7c97ddf3c5 100644 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng index bdf3ce9d40..952868bab5 100644 --- a/interface/web/client/lib/lang/fi_client_template.lng +++ b/interface/web/client/lib/lang/fi_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng index 8ecd615be4..e013d217af 100644 --- a/interface/web/client/lib/lang/fi_reseller.lng +++ b/interface/web/client/lib/lang/fi_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index b9c1c9b9db..a0a3e85799 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng index c9c3440e86..c73997d346 100644 --- a/interface/web/client/lib/lang/fr_client_template.lng +++ b/interface/web/client/lib/lang/fr_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng index 87455885f3..4b2f075d0b 100644 --- a/interface/web/client/lib/lang/fr_reseller.lng +++ b/interface/web/client/lib/lang/fr_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index ba6fa55e72..885cfc5fe0 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng index 2823b8f6c2..f9385b6585 100644 --- a/interface/web/client/lib/lang/hr_client_template.lng +++ b/interface/web/client/lib/lang/hr_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng index bfb473264c..b5387155ea 100644 --- a/interface/web/client/lib/lang/hr_reseller.lng +++ b/interface/web/client/lib/lang/hr_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index 21082b7229..446839d4a4 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng index d52a463f09..09818aaa97 100644 --- a/interface/web/client/lib/lang/hu_client_template.lng +++ b/interface/web/client/lib/lang/hu_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng index 7e08de8aff..98bdb4df7c 100644 --- a/interface/web/client/lib/lang/hu_reseller.lng +++ b/interface/web/client/lib/lang/hu_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng index 874c5e8e3e..7707245873 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng index ac0dda4118..62e913195a 100644 --- a/interface/web/client/lib/lang/id_client_template.lng +++ b/interface/web/client/lib/lang/id_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng index a0153328ec..aceb20c1c1 100644 --- a/interface/web/client/lib/lang/id_reseller.lng +++ b/interface/web/client/lib/lang/id_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index 6b2bd2cb33..5444ff474d 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Clicca per impostare'; $wb['limit_dns_record_error_notint'] = 'Il limite di record DNS deve essere un numero.'; $wb['Address'] = 'Indirizzo'; $wb['Limits'] = 'Limiti'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng index ae4f42fcfc..ba9722d001 100644 --- a/interface/web/client/lib/lang/it_client_template.lng +++ b/interface/web/client/lib/lang/it_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limiti'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng index 62c4507339..b79fe324d4 100644 --- a/interface/web/client/lib/lang/it_reseller.lng +++ b/interface/web/client/lib/lang/it_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Clicca per impostare'; $wb['Reseller'] = 'Rivenditore'; $wb['Address'] = 'Indirizzo'; $wb['Limits'] = 'Limiti'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index 8db40340af..f7193c82a3 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng index 6289f2629f..c3da566938 100644 --- a/interface/web/client/lib/lang/ja_client_template.lng +++ b/interface/web/client/lib/lang/ja_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng index b13d4100b3..20eae08277 100644 --- a/interface/web/client/lib/lang/ja_reseller.lng +++ b/interface/web/client/lib/lang/ja_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index 69db1e8d33..b1f6cb2ab0 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -206,5 +206,5 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng index 23ad63c7b7..0a2533e72c 100644 --- a/interface/web/client/lib/lang/nl_client_template.lng +++ b/interface/web/client/lib/lang/nl_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index 27bd9723ff..661cb52444 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -210,5 +210,5 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index 5f99518952..a39ec7238e 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng index 640529c8dd..b938781b11 100644 --- a/interface/web/client/lib/lang/pl_client_template.lng +++ b/interface/web/client/lib/lang/pl_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index a938e53025..a9d6cecd2d 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index 37155df099..13bb074dbe 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng index f4cf99b85a..8e81e0101b 100644 --- a/interface/web/client/lib/lang/pt_client_template.lng +++ b/interface/web/client/lib/lang/pt_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng index 3932a4c643..777885c4d6 100644 --- a/interface/web/client/lib/lang/pt_reseller.lng +++ b/interface/web/client/lib/lang/pt_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index fc7498be58..22dbc86426 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng index 2e7fd5528a..22186b83e6 100644 --- a/interface/web/client/lib/lang/ro_client_template.lng +++ b/interface/web/client/lib/lang/ro_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng index 28f94fe2b1..ba3748cd9f 100644 --- a/interface/web/client/lib/lang/ro_reseller.lng +++ b/interface/web/client/lib/lang/ro_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index ffd489a7de..748c4ac485 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Клик для установки'; $wb['limit_dns_record_error_notint'] = 'Лимит вторичных DNS-зон должен быть числом.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Лимиты'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng index 13dd527161..ac311a1227 100644 --- a/interface/web/client/lib/lang/ru_client_template.lng +++ b/interface/web/client/lib/lang/ru_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Web-серверы'; $wb['db_servers_txt'] = 'Серверы баз данных'; $wb['mail_servers_txt'] = 'Серверы почты'; $wb['Limits'] = 'Лимиты'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index 3aff5dbaed..b9f40ed2cf 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Клик для установки'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Лимиты'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index 65a24c834c..e47b3266f4 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng index 38e4024296..5df8048b34 100644 --- a/interface/web/client/lib/lang/se_client_template.lng +++ b/interface/web/client/lib/lang/se_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng index 28f94fe2b1..ba3748cd9f 100644 --- a/interface/web/client/lib/lang/se_reseller.lng +++ b/interface/web/client/lib/lang/se_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index ef1341fc01..8e33a68957 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng index 49d528b983..580da11eef 100644 --- a/interface/web/client/lib/lang/sk_client_template.lng +++ b/interface/web/client/lib/lang/sk_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng index 6c51dd84ad..cf526dea91 100644 --- a/interface/web/client/lib/lang/sk_reseller.lng +++ b/interface/web/client/lib/lang/sk_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index fdb7759d5c..e4ff6adeac 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -208,5 +208,5 @@ $wb['email_error_empty'] = 'E-posta boş olamaz.'; $wb['limit_directive_snippets_txt'] = 'Web Sunucu Yapılandırma Seçimi Görüntülensin'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Sınırlar'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng index aebaccc5e1..f3e7833220 100644 --- a/interface/web/client/lib/lang/tr_client_template.lng +++ b/interface/web/client/lib/lang/tr_client_template.lng @@ -129,5 +129,5 @@ $wb['xmpp_servers_txt'] = 'XMPP Sunucuları'; $wb['db_servers_txt'] = 'Veritabanı Sunucuları'; $wb['mail_servers_txt'] = 'E-posta Sunucuları'; $wb['Limits'] = 'Sınırlar'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng index 7eda056246..253b9faf45 100644 --- a/interface/web/client/lib/lang/tr_reseller.lng +++ b/interface/web/client/lib/lang/tr_reseller.lng @@ -213,5 +213,5 @@ $wb['limit_database_quota_error_notint'] = 'Veritabanı kotası sınırı bir sa $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Sınırlar'; -$wb['limit_statsdb_retention_txt'] = 'Max. Days of stored GoAccess DB-statistics'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; $wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; -- GitLab From a4f33028c3427d91cff99b3d29b609579d06f6d4 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Wed, 26 Oct 2022 13:41:42 +0200 Subject: [PATCH 16/24] updated wording --- interface/web/client/lib/lang/ar_client.lng | 4 ++-- interface/web/client/lib/lang/ar_client_template.lng | 4 ++-- interface/web/client/lib/lang/ar_reseller.lng | 4 ++-- interface/web/client/lib/lang/bg_client.lng | 4 ++-- interface/web/client/lib/lang/bg_client_template.lng | 4 ++-- interface/web/client/lib/lang/bg_reseller.lng | 4 ++-- interface/web/client/lib/lang/br_client.lng | 4 ++-- interface/web/client/lib/lang/br_client_template.lng | 4 ++-- interface/web/client/lib/lang/br_reseller.lng | 4 ++-- interface/web/client/lib/lang/ca_client.lng | 4 ++-- interface/web/client/lib/lang/ca_client_template.lng | 4 ++-- interface/web/client/lib/lang/ca_reseller.lng | 4 ++-- interface/web/client/lib/lang/cz_client.lng | 4 ++-- interface/web/client/lib/lang/cz_client_template.lng | 4 ++-- interface/web/client/lib/lang/cz_reseller.lng | 4 ++-- interface/web/client/lib/lang/de_client.lng | 4 ++-- interface/web/client/lib/lang/de_client_template.lng | 4 ++-- interface/web/client/lib/lang/de_reseller.lng | 4 ++-- interface/web/client/lib/lang/dk_client.lng | 4 ++-- interface/web/client/lib/lang/dk_client_template.lng | 4 ++-- interface/web/client/lib/lang/dk_reseller.lng | 4 ++-- interface/web/client/lib/lang/el_client.lng | 4 ++-- interface/web/client/lib/lang/el_client_template.lng | 4 ++-- interface/web/client/lib/lang/el_reseller.lng | 4 ++-- interface/web/client/lib/lang/en_client.lng | 4 ++-- interface/web/client/lib/lang/en_client_template.lng | 4 ++-- interface/web/client/lib/lang/en_reseller.lng | 4 ++-- interface/web/client/lib/lang/es_client.lng | 4 ++-- interface/web/client/lib/lang/es_client_template.lng | 4 ++-- interface/web/client/lib/lang/es_reseller.lng | 4 ++-- interface/web/client/lib/lang/fi_client.lng | 4 ++-- interface/web/client/lib/lang/fi_client_template.lng | 4 ++-- interface/web/client/lib/lang/fi_reseller.lng | 4 ++-- interface/web/client/lib/lang/fr_client.lng | 4 ++-- interface/web/client/lib/lang/fr_client_template.lng | 4 ++-- interface/web/client/lib/lang/fr_reseller.lng | 4 ++-- interface/web/client/lib/lang/hr_client.lng | 4 ++-- interface/web/client/lib/lang/hr_client_template.lng | 4 ++-- interface/web/client/lib/lang/hr_reseller.lng | 4 ++-- interface/web/client/lib/lang/hu_client.lng | 4 ++-- interface/web/client/lib/lang/hu_client_template.lng | 4 ++-- interface/web/client/lib/lang/hu_reseller.lng | 4 ++-- interface/web/client/lib/lang/id_client.lng | 4 ++-- interface/web/client/lib/lang/id_client_template.lng | 4 ++-- interface/web/client/lib/lang/id_reseller.lng | 4 ++-- interface/web/client/lib/lang/it_client.lng | 4 ++-- interface/web/client/lib/lang/it_client_template.lng | 4 ++-- interface/web/client/lib/lang/it_reseller.lng | 4 ++-- interface/web/client/lib/lang/ja_client.lng | 4 ++-- interface/web/client/lib/lang/ja_client_template.lng | 4 ++-- interface/web/client/lib/lang/ja_reseller.lng | 4 ++-- interface/web/client/lib/lang/nl_client.lng | 4 ++-- interface/web/client/lib/lang/nl_client_template.lng | 4 ++-- interface/web/client/lib/lang/nl_reseller.lng | 4 ++-- interface/web/client/lib/lang/pl_client.lng | 4 ++-- interface/web/client/lib/lang/pl_client_template.lng | 4 ++-- interface/web/client/lib/lang/pl_reseller.lng | 4 ++-- interface/web/client/lib/lang/pt_client.lng | 4 ++-- interface/web/client/lib/lang/pt_client_template.lng | 4 ++-- interface/web/client/lib/lang/pt_reseller.lng | 4 ++-- interface/web/client/lib/lang/ro_client.lng | 4 ++-- interface/web/client/lib/lang/ro_client_template.lng | 4 ++-- interface/web/client/lib/lang/ro_reseller.lng | 4 ++-- interface/web/client/lib/lang/ru_client.lng | 4 ++-- interface/web/client/lib/lang/ru_client_template.lng | 4 ++-- interface/web/client/lib/lang/ru_reseller.lng | 4 ++-- interface/web/client/lib/lang/se_client.lng | 4 ++-- interface/web/client/lib/lang/se_client_template.lng | 4 ++-- interface/web/client/lib/lang/se_reseller.lng | 4 ++-- interface/web/client/lib/lang/sk_client.lng | 4 ++-- interface/web/client/lib/lang/sk_client_template.lng | 4 ++-- interface/web/client/lib/lang/sk_reseller.lng | 4 ++-- interface/web/client/lib/lang/tr_client.lng | 4 ++-- interface/web/client/lib/lang/tr_client_template.lng | 4 ++-- interface/web/client/lib/lang/tr_reseller.lng | 4 ++-- 75 files changed, 150 insertions(+), 150 deletions(-) diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index 842e03007a..c79882a1a3 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng index c2bcb5a2a4..72b7a50914 100644 --- a/interface/web/client/lib/lang/ar_client_template.lng +++ b/interface/web/client/lib/lang/ar_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng index ba3748cd9f..a1d39eebc1 100644 --- a/interface/web/client/lib/lang/ar_reseller.lng +++ b/interface/web/client/lib/lang/ar_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index e9d445d491..d893c08c2c 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng index aef949053a..239d0c1ea9 100644 --- a/interface/web/client/lib/lang/bg_client_template.lng +++ b/interface/web/client/lib/lang/bg_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng index 3167539970..a5acf07b6e 100644 --- a/interface/web/client/lib/lang/bg_reseller.lng +++ b/interface/web/client/lib/lang/bg_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index f0c58b10e6..22bf5169bb 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -206,5 +206,5 @@ $wb['email_error_empty'] = 'O email está vazio'; $wb['limit_directive_snippets_txt'] = 'Exibir configurações de seleção do servidor Web'; $wb['Address'] = 'Cliente'; $wb['Limits'] = 'Limites'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng index d744afdaf4..e764666944 100644 --- a/interface/web/client/lib/lang/br_client_template.lng +++ b/interface/web/client/lib/lang/br_client_template.lng @@ -128,6 +128,6 @@ $wb['mail_servers_txt'] = 'Servidores de email'; $wb['Limits'] = 'Limites'; $wb['Client-Templates'] = 'Gabaritos de clientes'; $wb['Template'] = 'Gabarito'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng index 01e9369b18..b5e6e9e097 100644 --- a/interface/web/client/lib/lang/br_reseller.lng +++ b/interface/web/client/lib/lang/br_reseller.lng @@ -210,5 +210,5 @@ $wb['limit_database_quota_error_notint'] = 'A cota do Banco de Dados deve ser um $wb['Reseller'] = 'Revenda'; $wb['Address'] = 'Revenda'; $wb['Limits'] = 'Limites'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/ca_client.lng b/interface/web/client/lib/lang/ca_client.lng index c6e50bf73c..9fc8b9d04a 100644 --- a/interface/web/client/lib/lang/ca_client.lng +++ b/interface/web/client/lib/lang/ca_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ca_client_template.lng b/interface/web/client/lib/lang/ca_client_template.lng index a3947da8d7..9a6a204e4c 100644 --- a/interface/web/client/lib/lang/ca_client_template.lng +++ b/interface/web/client/lib/lang/ca_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ca_reseller.lng b/interface/web/client/lib/lang/ca_reseller.lng index 4337bf4405..33e348a0a5 100644 --- a/interface/web/client/lib/lang/ca_reseller.lng +++ b/interface/web/client/lib/lang/ca_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index 7159bbcb02..01883f25cb 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Pro nastavení klikni zde'; $wb['limit_dns_record_error_notint'] = 'Limit DNS záznamů musí být číslo.'; $wb['Address'] = 'Adresa'; $wb['Limits'] = 'Limity'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng index 9efc4243c2..e82e947b2a 100644 --- a/interface/web/client/lib/lang/cz_client_template.lng +++ b/interface/web/client/lib/lang/cz_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webové servery'; $wb['db_servers_txt'] = 'Databázové servery'; $wb['mail_servers_txt'] = 'E-mailové servery'; $wb['Limits'] = 'Limity'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index a67d393d8e..8459c5ab15 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Pro nastavení klikni zde'; $wb['Reseller'] = 'Prodejce'; $wb['Address'] = 'Adresa'; $wb['Limits'] = 'Limity'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index ad1634ba79..d5fe101a4a 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Tage an gespeicherten GoAccess DB-Statistiken'; -$wb['limit_statsdb_retention_error_notint'] = 'Die Aufbewahrungsdauer der GoAccess-Statistiken muss eine Zahl sein'; +$wb['limit_statsdb_retention_txt'] = 'Maximal zulässige Aufbewahrungsdauer der GoAccess-Speicherdatenbank (Tage)'; +$wb['limit_statsdb_retention_error_notint'] = 'Die Aufbewahrungsdauer der GoAccess-Speicherdatenbank muss eine Zahl sein'; diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng index 54fabae72a..8aa689561b 100644 --- a/interface/web/client/lib/lang/de_client_template.lng +++ b/interface/web/client/lib/lang/de_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Web-Server'; $wb['db_servers_txt'] = 'Datenbank-Server'; $wb['mail_servers_txt'] = 'Mail-Server'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Tage an gespeicherten GoAccess DB-Statistiken'; -$wb['limit_statsdb_retention_error_notint'] = 'Die Aufbewahrungsdauer der GoAccess-Statistiken muss eine Zahl sein'; +$wb['limit_statsdb_retention_txt'] = 'Maximal zulässige Aufbewahrungsdauer der GoAccess-Speicherdatenbank (Tage)'; +$wb['limit_statsdb_retention_error_notint'] = 'Die Aufbewahrungsdauer der GoAccess-Speicherdatenbank muss eine Zahl sein'; diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index 303c9242f6..f5b4212db1 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Max. Tage an gespeicherten GoAccess DB-Statistiken'; -$wb['limit_statsdb_retention_error_notint'] = 'Die Aufbewahrungsdauer der GoAccess-Statistiken muss eine Zahl sein'; +$wb['limit_statsdb_retention_txt'] = 'Maximal zulässige Aufbewahrungsdauer der GoAccess-Speicherdatenbank (Tage)'; +$wb['limit_statsdb_retention_error_notint'] = 'Die Aufbewahrungsdauer der GoAccess-Speicherdatenbank muss eine Zahl sein'; diff --git a/interface/web/client/lib/lang/dk_client.lng b/interface/web/client/lib/lang/dk_client.lng index d58b4384c6..112a95a771 100644 --- a/interface/web/client/lib/lang/dk_client.lng +++ b/interface/web/client/lib/lang/dk_client.lng @@ -206,5 +206,5 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/dk_client_template.lng b/interface/web/client/lib/lang/dk_client_template.lng index 24afad5e06..0329d7e04d 100644 --- a/interface/web/client/lib/lang/dk_client_template.lng +++ b/interface/web/client/lib/lang/dk_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/dk_reseller.lng b/interface/web/client/lib/lang/dk_reseller.lng index 6604f812f4..a83f50d55d 100644 --- a/interface/web/client/lib/lang/dk_reseller.lng +++ b/interface/web/client/lib/lang/dk_reseller.lng @@ -210,5 +210,5 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index 8cdb6b3cb3..5ecaef7c9d 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng index d88d536d2f..d168878a77 100644 --- a/interface/web/client/lib/lang/el_client_template.lng +++ b/interface/web/client/lib/lang/el_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng index 9904f2a2e3..94c7b23830 100644 --- a/interface/web/client/lib/lang/el_reseller.lng +++ b/interface/web/client/lib/lang/el_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index 0a08fa2864..6ff2adf0a8 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -208,5 +208,5 @@ $wb['email_error_empty'] = 'Email is empty'; $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng index 8436f30260..b5ec77b2ee 100644 --- a/interface/web/client/lib/lang/en_client_template.lng +++ b/interface/web/client/lib/lang/en_client_template.lng @@ -129,5 +129,5 @@ $wb['xmpp_servers_txt'] = 'XMPP Servers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index e6948c4475..d0053e5ddc 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -213,5 +213,5 @@ $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a n $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index a4f69dbdfa..9de88688bb 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng index 85350d7816..75735c6b24 100644 --- a/interface/web/client/lib/lang/es_client_template.lng +++ b/interface/web/client/lib/lang/es_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng index 58fe34f128..521d41f76a 100644 --- a/interface/web/client/lib/lang/es_reseller.lng +++ b/interface/web/client/lib/lang/es_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index 7c97ddf3c5..851d369a5a 100644 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng index 952868bab5..d5a840272d 100644 --- a/interface/web/client/lib/lang/fi_client_template.lng +++ b/interface/web/client/lib/lang/fi_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng index e013d217af..63e0483b3b 100644 --- a/interface/web/client/lib/lang/fi_reseller.lng +++ b/interface/web/client/lib/lang/fi_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index a0a3e85799..03f98c0228 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng index c73997d346..35f68bba1e 100644 --- a/interface/web/client/lib/lang/fr_client_template.lng +++ b/interface/web/client/lib/lang/fr_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng index 4b2f075d0b..254000ce29 100644 --- a/interface/web/client/lib/lang/fr_reseller.lng +++ b/interface/web/client/lib/lang/fr_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index 885cfc5fe0..5256dc9574 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng index f9385b6585..c8ca87e0a1 100644 --- a/interface/web/client/lib/lang/hr_client_template.lng +++ b/interface/web/client/lib/lang/hr_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng index b5387155ea..67560dc3f2 100644 --- a/interface/web/client/lib/lang/hr_reseller.lng +++ b/interface/web/client/lib/lang/hr_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index 446839d4a4..dbd3f7fa18 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng index 09818aaa97..0c6bc102ee 100644 --- a/interface/web/client/lib/lang/hu_client_template.lng +++ b/interface/web/client/lib/lang/hu_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng index 98bdb4df7c..a788231ce9 100644 --- a/interface/web/client/lib/lang/hu_reseller.lng +++ b/interface/web/client/lib/lang/hu_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng index 7707245873..4388c427fd 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng index 62e913195a..e672f5affa 100644 --- a/interface/web/client/lib/lang/id_client_template.lng +++ b/interface/web/client/lib/lang/id_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng index aceb20c1c1..f159e19583 100644 --- a/interface/web/client/lib/lang/id_reseller.lng +++ b/interface/web/client/lib/lang/id_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index 5444ff474d..75f2488d10 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Clicca per impostare'; $wb['limit_dns_record_error_notint'] = 'Il limite di record DNS deve essere un numero.'; $wb['Address'] = 'Indirizzo'; $wb['Limits'] = 'Limiti'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng index ba9722d001..5f75626470 100644 --- a/interface/web/client/lib/lang/it_client_template.lng +++ b/interface/web/client/lib/lang/it_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limiti'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng index b79fe324d4..30c461641a 100644 --- a/interface/web/client/lib/lang/it_reseller.lng +++ b/interface/web/client/lib/lang/it_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Clicca per impostare'; $wb['Reseller'] = 'Rivenditore'; $wb['Address'] = 'Indirizzo'; $wb['Limits'] = 'Limiti'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index f7193c82a3..5566ee6c0c 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng index c3da566938..faf67f1fd8 100644 --- a/interface/web/client/lib/lang/ja_client_template.lng +++ b/interface/web/client/lib/lang/ja_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng index 20eae08277..2aab9270d7 100644 --- a/interface/web/client/lib/lang/ja_reseller.lng +++ b/interface/web/client/lib/lang/ja_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index b1f6cb2ab0..62a8573043 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -206,5 +206,5 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng index 0a2533e72c..1d2f182602 100644 --- a/interface/web/client/lib/lang/nl_client_template.lng +++ b/interface/web/client/lib/lang/nl_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index 661cb52444..ba769c5335 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -210,5 +210,5 @@ $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index a39ec7238e..996093e0f4 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng index b938781b11..33116a6587 100644 --- a/interface/web/client/lib/lang/pl_client_template.lng +++ b/interface/web/client/lib/lang/pl_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index a9d6cecd2d..fa9cfdf17a 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index 13bb074dbe..5908ed46a3 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng index 8e81e0101b..cf98e3712b 100644 --- a/interface/web/client/lib/lang/pt_client_template.lng +++ b/interface/web/client/lib/lang/pt_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng index 777885c4d6..53aeb6997b 100644 --- a/interface/web/client/lib/lang/pt_reseller.lng +++ b/interface/web/client/lib/lang/pt_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index 22dbc86426..64d8c2cb55 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng index 22186b83e6..f457dbfad5 100644 --- a/interface/web/client/lib/lang/ro_client_template.lng +++ b/interface/web/client/lib/lang/ro_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng index ba3748cd9f..a1d39eebc1 100644 --- a/interface/web/client/lib/lang/ro_reseller.lng +++ b/interface/web/client/lib/lang/ro_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index 748c4ac485..8d08d5b2de 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Клик для установки'; $wb['limit_dns_record_error_notint'] = 'Лимит вторичных DNS-зон должен быть числом.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Лимиты'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng index ac311a1227..156a6bc6ef 100644 --- a/interface/web/client/lib/lang/ru_client_template.lng +++ b/interface/web/client/lib/lang/ru_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Web-серверы'; $wb['db_servers_txt'] = 'Серверы баз данных'; $wb['mail_servers_txt'] = 'Серверы почты'; $wb['Limits'] = 'Лимиты'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index b9f40ed2cf..4f51f42fcb 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Клик для установки'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Лимиты'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index e47b3266f4..185bd4d51a 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng index 5df8048b34..53a680f01e 100644 --- a/interface/web/client/lib/lang/se_client_template.lng +++ b/interface/web/client/lib/lang/se_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng index ba3748cd9f..a1d39eebc1 100644 --- a/interface/web/client/lib/lang/se_reseller.lng +++ b/interface/web/client/lib/lang/se_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index 8e33a68957..03d5de8afc 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -206,5 +206,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng index 580da11eef..2e0221e8b8 100644 --- a/interface/web/client/lib/lang/sk_client_template.lng +++ b/interface/web/client/lib/lang/sk_client_template.lng @@ -126,5 +126,5 @@ $wb['web_servers_txt'] = 'Webservers'; $wb['db_servers_txt'] = 'Database servers'; $wb['mail_servers_txt'] = 'Mailservers'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; \ No newline at end of file +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; \ No newline at end of file diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng index cf526dea91..4baecb19b4 100644 --- a/interface/web/client/lib/lang/sk_reseller.lng +++ b/interface/web/client/lib/lang/sk_reseller.lng @@ -210,5 +210,5 @@ $wb['password_click_to_set_txt'] = 'Click to set'; $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Limits'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index e4ff6adeac..cdb4b24d45 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -208,5 +208,5 @@ $wb['email_error_empty'] = 'E-posta boş olamaz.'; $wb['limit_directive_snippets_txt'] = 'Web Sunucu Yapılandırma Seçimi Görüntülensin'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Sınırlar'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng index f3e7833220..502086331d 100644 --- a/interface/web/client/lib/lang/tr_client_template.lng +++ b/interface/web/client/lib/lang/tr_client_template.lng @@ -129,5 +129,5 @@ $wb['xmpp_servers_txt'] = 'XMPP Sunucuları'; $wb['db_servers_txt'] = 'Veritabanı Sunucuları'; $wb['mail_servers_txt'] = 'E-posta Sunucuları'; $wb['Limits'] = 'Sınırlar'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng index 253b9faf45..ae35cf0d24 100644 --- a/interface/web/client/lib/lang/tr_reseller.lng +++ b/interface/web/client/lib/lang/tr_reseller.lng @@ -213,5 +213,5 @@ $wb['limit_database_quota_error_notint'] = 'Veritabanı kotası sınırı bir sa $wb['Reseller'] = 'Reseller'; $wb['Address'] = 'Address'; $wb['Limits'] = 'Sınırlar'; -$wb['limit_statsdb_retention_txt'] = 'Maximum allowed number of stored GoAccess DB statistics (days)'; -$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess statistics must be a number'; +$wb['limit_statsdb_retention_txt'] = 'Maximum allowed retention period of the GoAccess storage database (days)'; +$wb['limit_statsdb_retention_error_notint'] = 'The retention period of the GoAccess storage database must be a number'; -- GitLab From a1c9b428ba901ae26f3bcbd9192c9ffc2a1f3716 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 8 Apr 2022 21:24:23 +0200 Subject: [PATCH 17/24] update web_vhost_domain labels and resolve merge conflict --- install/sql/incremental/upd_dev_collection.sql | 1 + interface/web/sites/lib/lang/ar_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/bg_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/br_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/ca_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/cz_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/de_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/dk_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/el_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/en_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/es_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/fi_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/fr_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/hr_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/hu_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/id_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/it_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/ja_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/nl_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/pl_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/pt_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/ro_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/ru_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/se_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/sk_web_vhost_domain.lng | 2 +- interface/web/sites/lib/lang/tr_web_vhost_domain.lng | 2 +- 26 files changed, 26 insertions(+), 25 deletions(-) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index cf7b1ab9d7..00f833de04 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -1,3 +1,4 @@ +ALTER TABLE `mail_user` CHANGE `quota` `quota` BIGINT(20) NOT NULL DEFAULT '0'; ALTER TABLE `web_domain` ADD `statsdb_retention` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `log_retention`; ALTER TABLE `web_domain` ADD `stats_anonymize_level` INT(11) NOT NULL DEFAULT '0' AFTER `statsdb_retention`; ALTER TABLE `client` ADD `limit_statsdb_retention` INT(11) NOT NULL DEFAULT '-1' AFTER `limit_openvz_vm_template_id`; diff --git a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng index f9848b898b..be4453e82f 100644 --- a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng index c86c7b05cf..b469fe1784 100644 --- a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/br_web_vhost_domain.lng b/interface/web/sites/lib/lang/br_web_vhost_domain.lng index 13a0304ee0..ac8497dcfb 100644 --- a/interface/web/sites/lib/lang/br_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/br_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Remover o ambiente chroot Jailkit qu $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng index 5d2c20edd5..2c4b892a16 100644 --- a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng index 3ad287f3a7..5d19b45c22 100644 --- a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain.lng b/interface/web/sites/lib/lang/de_web_vhost_domain.lng index 4f133ce03e..4cd6eab3ab 100644 --- a/interface/web/sites/lib/lang/de_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/de_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Lösche die Jailkit-Chroot-Umgebung, $wb['ssl_options_not_for_le_txt'] = 'Sie haben Let\'s Encrypt-Zertifikate für diese Website aktiviert. Bitte beachten Sie, dass alle Optionen auf dieser Seite nur für Nicht-Let\'s Encrypt-Zertifikate gelten. Denken Sie daran, Let\'s Encrypt auf der Hauptregisterkarte zu deaktivieren, wenn Sie zu einem anderen Zertifikat wechseln möchten.'; $wb['statsdb_retention_txt'] = 'DB-Storage Aufbewahrung'; $wb['statsdb_retention_error_txt'] = 'Aufbewahrungsfrist in Tagen (zulässige numerische Werte): min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Behält die letzte angegebene Anzahl von Tagen im GoAccess Storage. Dadurch werden die GoAccess-Speichertabellen wiederverwendet, z. B. werden nur die letzten 7 Tage aufbewahrt. Der Wert "0" löscht diese Daten nicht und lässt diese für immer im GoAccess Storage.'; +$wb['statsdb_retention_about_txt'] = 'Behält die letzte angegebene Anzahl von Tagen im GoAccess Storage. Dadurch werden die GoAccess-Speichertabellen wiederverwendet, z. B. werden nur die letzten 7 Tage aufbewahrt.
Der Wert "0" löscht diese Daten nicht und lässt diese für immer im GoAccess Storage.'; $wb['statsdb_retention_option_txt'] = 'Aufbewahrungsoption'; $wb['stats_anonymize_level_txt'] = 'Anonymisierungsstufe'; $wb['stats_anonymize_level_about_txt'] = 'Anonymisierung von IP-Adressen bei der Auswertung der Logdateien des Webservers.

  • Keine - z.B. 192.168.2.1 (Anonymisierung deaktiviert)
  • Anonymisiere letztes Byte - z.B. 192.168.2.0
  • Anonymisiere letzte zwei Bytes - z.B. 192.168.0.0 (Empfohlen)
  • Anonymisiere letzte drei Bytes - z.B. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng index 06ded1af06..79edc2fdb6 100644 --- a/interface/web/sites/lib/lang/dk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/dk_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng index a09e579ae3..d0c76b7911 100644 --- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/en_web_vhost_domain.lng b/interface/web/sites/lib/lang/en_web_vhost_domain.lng index 4b933f398b..c2589ca1d4 100644 --- a/interface/web/sites/lib/lang/en_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/en_web_vhost_domain.lng @@ -209,7 +209,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/es_web_vhost_domain.lng b/interface/web/sites/lib/lang/es_web_vhost_domain.lng index b41b3ce3ca..93ee2fccd6 100644 --- a/interface/web/sites/lib/lang/es_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/es_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng index bd2a65eefc..381590a44d 100644 --- a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng index 45fcf27021..73236bf63e 100644 --- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng index e60bb06cad..7da4a29797 100644 --- a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng index bc77ea088b..0e4f373b91 100644 --- a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/id_web_vhost_domain.lng b/interface/web/sites/lib/lang/id_web_vhost_domain.lng index ca9f2d19ce..b0e7e462aa 100644 --- a/interface/web/sites/lib/lang/id_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/id_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/it_web_vhost_domain.lng b/interface/web/sites/lib/lang/it_web_vhost_domain.lng index 6253ee6c9d..b9239d169b 100644 --- a/interface/web/sites/lib/lang/it_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/it_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Cancella l\'ambiente jailkit chroot $wb['ssl_options_not_for_le_txt'] = 'Hai abilitato i certificati Let\'Encrypt per questo sito Web. Considera che tutte le opzioni di questa pagina si applicano a ai certificati non Let\'Encrypt solamente. Ricorda di deselezionare l\'opzione Let\'s Encrypt nella scheda principale se vuoi passare ad certificato differente.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng index 1641c6aee1..cdbb70c657 100644 --- a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng index 799ad5571e..ae647b68c9 100644 --- a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng index 6a58471e15..6b8fdad08d 100644 --- a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng index b2a2eae7af..f01ffe4d65 100644 --- a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng index a844053775..8d55ee8462 100644 --- a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng index 298f044cde..876fc4e717 100644 --- a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain.lng b/interface/web/sites/lib/lang/se_web_vhost_domain.lng index 9f68e2d4de..928daa8669 100644 --- a/interface/web/sites/lib/lang/se_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/se_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng index 7022b59bc9..ab361040de 100644 --- a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng @@ -204,7 +204,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; diff --git a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng index 2334cb6d4e..a40d02d05c 100644 --- a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng +++ b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng @@ -206,7 +206,7 @@ $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environmen $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.'; $wb['statsdb_retention_txt'] = 'DB-Storage retention'; $wb['statsdb_retention_error_txt'] = 'Retention period in days (allowed numeric values: min. {minimum} - max. {maximum})'; -$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days. The value "0" will keep the data in the storage forever.'; +$wb['statsdb_retention_about_txt'] = 'Keep the last specified number of days in storage. This will recycle the GoAccess storage tables. e.g., keep & show only the last 7 days.
The value "0" will keep the data in the storage forever.'; $wb['statsdb_retention_option_txt'] = 'Statistic retention option'; $wb['stats_anonymize_level_txt'] = 'Anonymize level'; $wb['stats_anonymize_level_about_txt'] = 'Anonymization of IP addresses when processing the log files of the webserver.

  • None - e.g. 192.168.2.1 (anomyzation disabled)
  • Anonymize last byte - e.g. 192.168.2.0
  • Anonymize last two bytes - e.g. 192.168.0.0 (Recommended)
  • Anonymize last three bytes - e.g. 192.0.0.0
'; -- GitLab From ae36bac77f157e11a12ce3b97a49152780c68692 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 27 Dec 2022 20:33:05 +0100 Subject: [PATCH 18/24] update copyright --- interface/lib/classes/validate_statsdb_retention.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/lib/classes/validate_statsdb_retention.inc.php b/interface/lib/classes/validate_statsdb_retention.inc.php index 02dd9f9c55..86f6ca1524 100644 --- a/interface/lib/classes/validate_statsdb_retention.inc.php +++ b/interface/lib/classes/validate_statsdb_retention.inc.php @@ -1,7 +1,7 @@ Date: Thu, 26 May 2022 13:29:25 +0200 Subject: [PATCH 19/24] Fix reseller notifications (#6347) --- .../classes/cron.d/300-quota_notify.inc.php | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/server/lib/classes/cron.d/300-quota_notify.inc.php b/server/lib/classes/cron.d/300-quota_notify.inc.php index 2d8ddc5b86..7733676fd8 100644 --- a/server/lib/classes/cron.d/300-quota_notify.inc.php +++ b/server/lib/classes/cron.d/300-quota_notify.inc.php @@ -252,8 +252,18 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; +======= + $client_group_id = $rec["sys_groupid"]; + $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); + if($client['parent_client_id'] > 0) { + $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); + } + if($reseller['email'] != '') { + $recipients[] = $reseller['email']; +>>>>>>> 073df620a (Fix reseller notifications (#6347)) } } @@ -292,8 +302,18 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; +======= + $client_group_id = $rec["sys_groupid"]; + $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); + if($client['parent_client_id'] > 0) { + $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); + } + if($reseller['email'] != '') { + $recipients[] = $reseller['email']; +>>>>>>> 073df620a (Fix reseller notifications (#6347)) } } @@ -390,8 +410,18 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; +======= + $client_group_id = $rec["sys_groupid"]; + $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); + if($client['parent_client_id'] > 0) { + $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); + } + if($reseller['email'] != '') { + $recipients[] = $reseller['email']; +>>>>>>> 073df620a (Fix reseller notifications (#6347)) } } @@ -430,8 +460,18 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; +======= + $client_group_id = $rec["sys_groupid"]; + $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); + if($client['parent_client_id'] > 0) { + $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); + } + if($reseller['email'] != '') { + $recipients[] = $reseller['email']; +>>>>>>> 073df620a (Fix reseller notifications (#6347)) } } @@ -519,8 +559,18 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_db_notify_reseller'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; +======= + $client_group_id = $rec["sys_groupid"]; + $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); + if($client['parent_client_id'] > 0) { + $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); + } + if($reseller['email'] != '') { + $recipients[] = $reseller['email']; +>>>>>>> 073df620a (Fix reseller notifications (#6347)) } } @@ -557,17 +607,38 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_db_notify_reseller'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; +======= + $client_group_id = $rec["sys_groupid"]; + $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); + if($client['parent_client_id'] > 0) { + $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); + } + if($reseller['email'] != '') { + $recipients[] = $reseller['email']; +>>>>>>> 073df620a (Fix reseller notifications (#6347)) } } //* Send email to client if($mail_config['overquota_notify_client'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; } } +======= + $client_group_id = $rec["sys_groupid"]; + $client = $app->db->queryOneRecord("SELECT client.email FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); + if($client['email'] != '') { + $recipients[] = $client['email']; + } + } + + +>>>>>>> 073df620a (Fix reseller notifications (#6347)) $this->_tools->send_notification_email('db_quota_ok_notification', $placeholders, $recipients); } -- GitLab From ab2972ce259c9085b42eabdddf3a8838cb5f5a0f Mon Sep 17 00:00:00 2001 From: Thom Pol Date: Thu, 26 May 2022 13:55:16 +0200 Subject: [PATCH 20/24] Clean up code --- .../classes/cron.d/300-quota_notify.inc.php | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/server/lib/classes/cron.d/300-quota_notify.inc.php b/server/lib/classes/cron.d/300-quota_notify.inc.php index 7733676fd8..33b191effc 100644 --- a/server/lib/classes/cron.d/300-quota_notify.inc.php +++ b/server/lib/classes/cron.d/300-quota_notify.inc.php @@ -57,6 +57,7 @@ class cronjob_quota_notify extends cronjob { $web_config = $app->getconf->get_server_config($conf['server_id'], 'web'); +<<<<<<< HEAD // Get client email and eventual reseller email in array $clients = []; $sql = "SELECT client.email,client.parent_client_id, sys_group.groupid FROM sys_group, client WHERE sys_group.client_id = client.client_id"; @@ -69,6 +70,13 @@ class cronjob_quota_notify extends cronjob { 'reseller' => $reseller ]; } +======= + // Get client email and eventual reseller email + $client_group_id = $rec["sys_groupid"]; + $client = $app->db->queryOneRecord("SELECT client.email, client.parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); + if($client['parent_client_id'] > 0) { + $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); +>>>>>>> 44d21b5c7 (Clean up code) } //###################################################################################################### @@ -252,6 +260,7 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { +<<<<<<< HEAD <<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; @@ -261,6 +270,8 @@ class cronjob_quota_notify extends cronjob { if($client['parent_client_id'] > 0) { $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); } +======= +>>>>>>> 44d21b5c7 (Clean up code) if($reseller['email'] != '') { $recipients[] = $reseller['email']; >>>>>>> 073df620a (Fix reseller notifications (#6347)) @@ -269,8 +280,13 @@ class cronjob_quota_notify extends cronjob { //* Send email to client if($web_config['overquota_notify_client'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; +======= + if($client['email'] != '') { + $recipients[] = $client['email']; +>>>>>>> 44d21b5c7 (Clean up code) } } $this->_tools->send_notification_email('web_quota_ok_notification', $placeholders, $recipients); @@ -302,6 +318,7 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { +<<<<<<< HEAD <<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; @@ -311,6 +328,8 @@ class cronjob_quota_notify extends cronjob { if($client['parent_client_id'] > 0) { $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); } +======= +>>>>>>> 44d21b5c7 (Clean up code) if($reseller['email'] != '') { $recipients[] = $reseller['email']; >>>>>>> 073df620a (Fix reseller notifications (#6347)) @@ -319,8 +338,13 @@ class cronjob_quota_notify extends cronjob { //* Send email to client if($web_config['overquota_notify_client'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; +======= + if($client['email'] != '') { + $recipients[] = $client['email']; +>>>>>>> 44d21b5c7 (Clean up code) } } $this->_tools->send_notification_email('web_quota_notification', $placeholders, $recipients); @@ -410,6 +434,7 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { +<<<<<<< HEAD <<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; @@ -419,6 +444,8 @@ class cronjob_quota_notify extends cronjob { if($client['parent_client_id'] > 0) { $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); } +======= +>>>>>>> 44d21b5c7 (Clean up code) if($reseller['email'] != '') { $recipients[] = $reseller['email']; >>>>>>> 073df620a (Fix reseller notifications (#6347)) @@ -427,8 +454,13 @@ class cronjob_quota_notify extends cronjob { //* Send email to client if($mail_config['overquota_notify_client'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; +======= + if($client['email'] != '') { + $recipients[] = $client['email']; +>>>>>>> 44d21b5c7 (Clean up code) } } @@ -460,6 +492,7 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { +<<<<<<< HEAD <<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; @@ -469,6 +502,8 @@ class cronjob_quota_notify extends cronjob { if($client['parent_client_id'] > 0) { $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); } +======= +>>>>>>> 44d21b5c7 (Clean up code) if($reseller['email'] != '') { $recipients[] = $reseller['email']; >>>>>>> 073df620a (Fix reseller notifications (#6347)) @@ -477,8 +512,13 @@ class cronjob_quota_notify extends cronjob { //* Send email to client if($mail_config['overquota_notify_client'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; +======= + if($client['email'] != '') { + $recipients[] = $client['email']; +>>>>>>> 44d21b5c7 (Clean up code) } } @@ -559,6 +599,7 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_db_notify_reseller'] == 'y') { +<<<<<<< HEAD <<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; @@ -568,6 +609,8 @@ class cronjob_quota_notify extends cronjob { if($client['parent_client_id'] > 0) { $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); } +======= +>>>>>>> 44d21b5c7 (Clean up code) if($reseller['email'] != '') { $recipients[] = $reseller['email']; >>>>>>> 073df620a (Fix reseller notifications (#6347)) @@ -576,10 +619,18 @@ class cronjob_quota_notify extends cronjob { //* Send email to client if($web_config['overquota_db_notify_client'] == 'y') { +<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; } } +======= + if($client['email'] != '') { + $recipients[] = $client['email']; + } + + +>>>>>>> 44d21b5c7 (Clean up code) $this->_tools->send_notification_email('db_quota_notification', $placeholders, $recipients); } @@ -607,6 +658,7 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_db_notify_reseller'] == 'y') { +<<<<<<< HEAD <<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; @@ -616,6 +668,8 @@ class cronjob_quota_notify extends cronjob { if($client['parent_client_id'] > 0) { $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); } +======= +>>>>>>> 44d21b5c7 (Clean up code) if($reseller['email'] != '') { $recipients[] = $reseller['email']; >>>>>>> 073df620a (Fix reseller notifications (#6347)) @@ -624,6 +678,7 @@ class cronjob_quota_notify extends cronjob { //* Send email to client if($mail_config['overquota_notify_client'] == 'y') { +<<<<<<< HEAD <<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; @@ -632,6 +687,8 @@ class cronjob_quota_notify extends cronjob { ======= $client_group_id = $rec["sys_groupid"]; $client = $app->db->queryOneRecord("SELECT client.email FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); +======= +>>>>>>> 44d21b5c7 (Clean up code) if($client['email'] != '') { $recipients[] = $client['email']; } -- GitLab From 8d5a5e59396db919a5d69dc4da7c3f11f4d73f33 Mon Sep 17 00:00:00 2001 From: Thom Pol Date: Thu, 26 May 2022 14:04:39 +0200 Subject: [PATCH 21/24] Fix typo --- server/lib/classes/cron.d/300-quota_notify.inc.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/server/lib/classes/cron.d/300-quota_notify.inc.php b/server/lib/classes/cron.d/300-quota_notify.inc.php index 33b191effc..71767b46b5 100644 --- a/server/lib/classes/cron.d/300-quota_notify.inc.php +++ b/server/lib/classes/cron.d/300-quota_notify.inc.php @@ -57,7 +57,6 @@ class cronjob_quota_notify extends cronjob { $web_config = $app->getconf->get_server_config($conf['server_id'], 'web'); -<<<<<<< HEAD // Get client email and eventual reseller email in array $clients = []; $sql = "SELECT client.email,client.parent_client_id, sys_group.groupid FROM sys_group, client WHERE sys_group.client_id = client.client_id"; @@ -70,13 +69,6 @@ class cronjob_quota_notify extends cronjob { 'reseller' => $reseller ]; } -======= - // Get client email and eventual reseller email - $client_group_id = $rec["sys_groupid"]; - $client = $app->db->queryOneRecord("SELECT client.email, client.parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); - if($client['parent_client_id'] > 0) { - $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); ->>>>>>> 44d21b5c7 (Clean up code) } //###################################################################################################### @@ -628,9 +620,13 @@ class cronjob_quota_notify extends cronjob { if($client['email'] != '') { $recipients[] = $client['email']; } +<<<<<<< HEAD >>>>>>> 44d21b5c7 (Clean up code) +======= + } +>>>>>>> 48edbdf0e (Fix typo) $this->_tools->send_notification_email('db_quota_notification', $placeholders, $recipients); } -- GitLab From 6db8d50cd05cf0f8694ea933de991f2628fde7bb Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 28 Dec 2020 11:36:37 +0100 Subject: [PATCH 22/24] Add bind_keyfiles_dir config option --- server/plugins-available/bind_plugin.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index 2a5ccca269..b4c359f322 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -241,7 +241,11 @@ class bind_plugin { foreach($key_files as $file) { unlink($file); } +<<<<<<< HEAD unlink($dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_masterprefix'].$domain.'.signed'); +======= + unlink($dns_config['bind_zonefiles_dir'].'/'.$this->zone_file_prefix().$domain.'.signed'); +>>>>>>> 19522cdb7 (Add bind_keyfiles_dir config option) unlink($dns_config['bind_keyfiles_dir'].'/dsset-'.$domain.'.'); if ($app->dbmaster !== $app->db) $app->dbmaster->query('UPDATE dns_soa SET dnssec_info=\'\', dnssec_initialized=\'N\' WHERE id=?', intval($data['new']['id'])); -- GitLab From d28ee42d5ca05dfd6bfbde9bfd30f3e64059efc9 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 28 Dec 2020 12:21:01 +0100 Subject: [PATCH 23/24] Add strings for bind_keyfiles_dir --- interface/web/admin/lib/lang/en_server_config.lng | 3 +++ 1 file changed, 3 insertions(+) diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 1ee224a44a..ff125f50ec 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -91,8 +91,11 @@ $wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain'; $wb['bind_user_txt'] = 'BIND User'; $wb['bind_group_txt'] = 'BIND Group'; $wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory'; +<<<<<<< HEAD $wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix'; $wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix'; +======= +>>>>>>> 165cc8b1c (Add strings for bind_keyfiles_dir) $wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory'; $wb['named_conf_path_txt'] = 'BIND named.conf path'; $wb['bind_user_error_empty'] = 'BIND user is empty.'; -- GitLab From 3382ca7956a498da4f7584de3b60befa10ff2c26 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Tue, 7 Nov 2023 16:59:24 +0100 Subject: [PATCH 24/24] Resolve merge conflicts --- .../web/admin/lib/lang/en_server_config.lng | 3 - .../classes/cron.d/300-quota_notify.inc.php | 124 ------------------ server/plugins-available/bind_plugin.inc.php | 6 +- 3 files changed, 1 insertion(+), 132 deletions(-) diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 242f703a9d..af7beb9a4d 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -91,11 +91,8 @@ $wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain'; $wb['bind_user_txt'] = 'BIND User'; $wb['bind_group_txt'] = 'BIND Group'; $wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory'; -<<<<<<< HEAD $wb['bind_zonefiles_masterprefix_txt'] = 'BIND master zonefiles prefix'; $wb['bind_zonefiles_slaveprefix_txt'] = 'BIND slave zonefiles prefix'; -======= ->>>>>>> 165cc8b1c (Add strings for bind_keyfiles_dir) $wb['bind_keyfiles_dir_txt'] = 'BIND keyfiles directory'; $wb['named_conf_path_txt'] = 'BIND named.conf path'; $wb['bind_user_error_empty'] = 'BIND user is empty.'; diff --git a/server/lib/classes/cron.d/300-quota_notify.inc.php b/server/lib/classes/cron.d/300-quota_notify.inc.php index 6da5aef43a..8dd30b5a31 100644 --- a/server/lib/classes/cron.d/300-quota_notify.inc.php +++ b/server/lib/classes/cron.d/300-quota_notify.inc.php @@ -252,33 +252,15 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { -<<<<<<< HEAD -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; -======= - $client_group_id = $rec["sys_groupid"]; - $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); - if($client['parent_client_id'] > 0) { - $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); - } -======= ->>>>>>> 44d21b5c7 (Clean up code) - if($reseller['email'] != '') { - $recipients[] = $reseller['email']; ->>>>>>> 073df620a (Fix reseller notifications (#6347)) } } //* Send email to client if($web_config['overquota_notify_client'] == 'y') { -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; -======= - if($client['email'] != '') { - $recipients[] = $client['email']; ->>>>>>> 44d21b5c7 (Clean up code) } } $this->_tools->send_notification_email('web_quota_ok_notification', $placeholders, $recipients); @@ -310,33 +292,15 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { -<<<<<<< HEAD -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; -======= - $client_group_id = $rec["sys_groupid"]; - $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); - if($client['parent_client_id'] > 0) { - $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); - } -======= ->>>>>>> 44d21b5c7 (Clean up code) - if($reseller['email'] != '') { - $recipients[] = $reseller['email']; ->>>>>>> 073df620a (Fix reseller notifications (#6347)) } } //* Send email to client if($web_config['overquota_notify_client'] == 'y') { -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; -======= - if($client['email'] != '') { - $recipients[] = $client['email']; ->>>>>>> 44d21b5c7 (Clean up code) } } $this->_tools->send_notification_email('web_quota_notification', $placeholders, $recipients); @@ -426,33 +390,15 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { -<<<<<<< HEAD -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; -======= - $client_group_id = $rec["sys_groupid"]; - $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); - if($client['parent_client_id'] > 0) { - $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); - } -======= ->>>>>>> 44d21b5c7 (Clean up code) - if($reseller['email'] != '') { - $recipients[] = $reseller['email']; ->>>>>>> 073df620a (Fix reseller notifications (#6347)) } } //* Send email to client if($mail_config['overquota_notify_client'] == 'y') { -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; -======= - if($client['email'] != '') { - $recipients[] = $client['email']; ->>>>>>> 44d21b5c7 (Clean up code) } } @@ -484,33 +430,15 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_notify_reseller'] == 'y') { -<<<<<<< HEAD -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; -======= - $client_group_id = $rec["sys_groupid"]; - $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); - if($client['parent_client_id'] > 0) { - $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); - } -======= ->>>>>>> 44d21b5c7 (Clean up code) - if($reseller['email'] != '') { - $recipients[] = $reseller['email']; ->>>>>>> 073df620a (Fix reseller notifications (#6347)) } } //* Send email to client if($mail_config['overquota_notify_client'] == 'y') { -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; -======= - if($client['email'] != '') { - $recipients[] = $client['email']; ->>>>>>> 44d21b5c7 (Clean up code) } } @@ -591,42 +519,17 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_db_notify_reseller'] == 'y') { -<<<<<<< HEAD -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; -======= - $client_group_id = $rec["sys_groupid"]; - $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); - if($client['parent_client_id'] > 0) { - $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); - } -======= ->>>>>>> 44d21b5c7 (Clean up code) - if($reseller['email'] != '') { - $recipients[] = $reseller['email']; ->>>>>>> 073df620a (Fix reseller notifications (#6347)) } } //* Send email to client if($web_config['overquota_db_notify_client'] == 'y') { -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; } } -======= - if($client['email'] != '') { - $recipients[] = $client['email']; - } -<<<<<<< HEAD - - ->>>>>>> 44d21b5c7 (Clean up code) -======= - } ->>>>>>> 48edbdf0e (Fix typo) $this->_tools->send_notification_email('db_quota_notification', $placeholders, $recipients); } @@ -654,44 +557,17 @@ class cronjob_quota_notify extends cronjob { //* Send email to reseller if($web_config['overquota_db_notify_reseller'] == 'y') { -<<<<<<< HEAD -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['reseller'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['reseller']; -======= - $client_group_id = $rec["sys_groupid"]; - $client = $app->db->queryOneRecord("SELECT parent_client_id FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); - if($client['parent_client_id'] > 0) { - $reseller = $app->db->queryOneRecord("SELECT email FROM client WHERE client_id = ?", $client['parent_client_id']); - } -======= ->>>>>>> 44d21b5c7 (Clean up code) - if($reseller['email'] != '') { - $recipients[] = $reseller['email']; ->>>>>>> 073df620a (Fix reseller notifications (#6347)) } } //* Send email to client if($mail_config['overquota_notify_client'] == 'y') { -<<<<<<< HEAD -<<<<<<< HEAD if($clients[$rec['sys_groupid']]['email'] != '') { $recipients[] = $clients[$rec['sys_groupid']]['email']; } } -======= - $client_group_id = $rec["sys_groupid"]; - $client = $app->db->queryOneRecord("SELECT client.email FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); -======= ->>>>>>> 44d21b5c7 (Clean up code) - if($client['email'] != '') { - $recipients[] = $client['email']; - } - } - - ->>>>>>> 073df620a (Fix reseller notifications (#6347)) $this->_tools->send_notification_email('db_quota_ok_notification', $placeholders, $recipients); } diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index 6d3f6a3dd7..d0bad2d78d 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -241,11 +241,7 @@ class bind_plugin { foreach($key_files as $file) { unlink($file); } -<<<<<<< HEAD unlink($dns_config['bind_zonefiles_dir'].'/'.$dns_config['bind_zonefiles_masterprefix'].$domain.'.signed'); -======= - unlink($dns_config['bind_zonefiles_dir'].'/'.$this->zone_file_prefix().$domain.'.signed'); ->>>>>>> 19522cdb7 (Add bind_keyfiles_dir config option) unlink($dns_config['bind_keyfiles_dir'].'/dsset-'.$domain.'.'); if ($app->running_on_slaveserver()) $app->dbmaster->query('UPDATE dns_soa SET dnssec_info=\'\', dnssec_initialized=\'N\' WHERE id=?', intval($data['new']['id'])); @@ -316,7 +312,7 @@ class bind_plugin { } else { $hex[1] = '0005'.strtoupper($hex[1]); if ($caa_add_rec > 0) { - // remove previously added issue ";" + // remove previously added issue ";" array_pop($records); } $caa_add_rec = -2; -- GitLab