diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index 8799e1f34c7efec3ec6e375659ea31b1ef31f833..6fc05368db326faaefd14de3b5ed5f10e0e3924a 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -103,6 +103,7 @@ enable_sni=y skip_le_check=n enable_ip_wildcard=y overtraffic_notify_admin=y +overtraffic_notify_reseller=y overtraffic_notify_client=y nginx_cgi_socket=/var/run/fcgiwrap.socket php_fpm_init_script=php5-fpm diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 185fa892c86a62f9d531a4e7d983ace5ff068185..af87df628f71fbedd2147549dbf84e6896c6e1ec 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -1082,6 +1082,12 @@ $form["tabs"]['web'] = array( 'default' => 'y', 'value' => array(0 => 'n', 1 => 'y') ), + 'overtraffic_notify_reseller' => array( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n', 1 => 'y') + ), 'overtraffic_notify_client' => array( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng index 58e7833fd6ef457ecb796e7099df3dc8db778497..f06dbc330eed7865a90bfd8fc359cf69277fa490 100644 --- a/interface/web/admin/lib/lang/ar_server_config.lng +++ b/interface/web/admin/lib/lang/ar_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng index 0d87a4daa0fbd6d6416e187a5501422d89d54035..773b6c5da1832cd990e512f588ef0b21911c9079 100644 --- a/interface/web/admin/lib/lang/bg_server_config.lng +++ b/interface/web/admin/lib/lang/bg_server_config.lng @@ -192,6 +192,7 @@ $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attribu $wb['website_autoalias_txt'] = 'Website auto alias'; $wb['website_autoalias_note_txt'] = 'Placeholders:'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng index e749dcc0235250e07f77b135dc19302b7cdd8554..0d0e8b6d185bd606e7b398613f7cf8ea0997cfd7 100644 --- a/interface/web/admin/lib/lang/br_server_config.lng +++ b/interface/web/admin/lib/lang/br_server_config.lng @@ -199,6 +199,7 @@ $wb['mailbox_quota_stats_txt'] = 'EstatÃsticas das cotas para contas de email'; $wb['enable_ip_wildcard_txt'] = 'Habilitar curingas IP (*)'; $wb['web_folder_protection_txt'] = 'Tornar pastas Web imutáveis (atributos estendidos)'; $wb['overtraffic_notify_admin_txt'] = 'Enviar notificação de tráfego excedido para o administrador'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Enviar notificação de tráfego excedido para o cliente'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Por favor, insira nomes de host válidos para RBLs.'; diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng index 50125cf334c1024a86b57e38c3c4adc38b5e39dd..acadb5b31337786b638c340870bf11a80f5490dc 100644 --- a/interface/web/admin/lib/lang/ca_server_config.lng +++ b/interface/web/admin/lib/lang/ca_server_config.lng @@ -195,6 +195,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng index 36d009dbcee76290d6fdd8ada60e252d2a0b0668..7f9da6ce697fa1ce12e85dec056e02e2b5734968 100644 --- a/interface/web/admin/lib/lang/cz_server_config.lng +++ b/interface/web/admin/lib/lang/cz_server_config.lng @@ -178,6 +178,7 @@ $wb['mailbox_quota_stats_txt'] = 'Statistika kvóty poÅ¡tovnà schránky'; $wb['enable_ip_wildcard_txt'] = 'Aktivovat IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'PÅ™i pÅ™ekroÄenà limitu pÅ™enesených dat, poslat oznámenà adminovi'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'PÅ™i pÅ™ekroÄenà limitu pÅ™enesených dat, poslat oznámenà klientovi'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng index 2536731433f5154af62ddcf3b4bb1246fd3f476c..9b82a429dd091f08bab6bd094b3951556bebfd57 100644 --- a/interface/web/admin/lib/lang/de_server_config.lng +++ b/interface/web/admin/lib/lang/de_server_config.lng @@ -198,6 +198,7 @@ $wb['mailbox_quota_stats_txt'] = 'E-Mailkonto Beschränkung Statistiken'; $wb['enable_ip_wildcard_txt'] = 'IP Adressen Wildcard (*) aktivieren'; $wb['web_folder_protection_txt'] = 'Webverzeichnis unveränderlich machen (erweiterte Attribute)'; $wb['overtraffic_notify_admin_txt'] = 'Ãœberschreiten des Datentransfer Limits an den Administrator senden'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Ãœberschreiten des Datentransfer Limits an den Kunden senden'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Bitte geben Sie gültige RBL-Hostnamen an.'; diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng index e83fa0e09e6811556aa7a3c78093897b28523c1c..d4194e02e8258941d3114a6becb865122a51d0da 100644 --- a/interface/web/admin/lib/lang/dk_server_config.lng +++ b/interface/web/admin/lib/lang/dk_server_config.lng @@ -181,6 +181,7 @@ $wb['mailbox_quota_stats_txt'] = 'Postboks kvota statistik'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Gør web mapper immume (udvidede attributter)'; $wb['overtraffic_notify_admin_txt'] = 'Send over-trafik meddelelse til admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send over-trafik meddelelse til kunde'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Angiv gyldige RBL værtsnavne.'; diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng index c87c151f8cdfc05d65b237a0ae44a50e764bf325..e4dd91cfb904b1c3503b1d0764d1cefe22513f55 100644 --- a/interface/web/admin/lib/lang/el_server_config.lng +++ b/interface/web/admin/lib/lang/el_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 452f698fd7a53fdfc8d1d00d79d042b365f7b07b..714f563357cc1c38ac42d2ec546f921c27645b35 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -205,6 +205,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng index 83b03af94cf53b1462f47cb667d2d4324094e42e..0ff3716c8038ae768bf173e8b6439b87462e2769 100644 --- a/interface/web/admin/lib/lang/es_server_config.lng +++ b/interface/web/admin/lib/lang/es_server_config.lng @@ -200,6 +200,7 @@ $wb['overquota_notify_freq_note_txt'] = '0 = enviar mensaje solo una vez, sin vo $wb['overquota_notify_freq_txt'] = 'Enviar advertencia de cuota cada X dÃas'; $wb['overquota_notify_onok_txt'] = 'Enviar al cliente información de cuota correcta'; $wb['overtraffic_notify_admin_txt'] = 'Enviar notificación de tráfico sobrepasado al administrador'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Enviar notificación de tráfico sobrepasado al cliente'; $wb['permissions_txt'] = 'Permisos'; $wb['php_fpm_ini_path_error_empty'] = 'La ruta al archivo php.ini de PHP-FPM está vacÃo.'; diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng index 6bd628411b1145ef45f0d290a60cdd47b0ed89ed..aac24a6a34fa27750b11bfe979133733302297cd 100644 --- a/interface/web/admin/lib/lang/fi_server_config.lng +++ b/interface/web/admin/lib/lang/fi_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng index 3d4bfb14cde4780f11b41292d891f5d23295118a..572e3f4f77f54f70c528babe913ecf565804a794 100644 --- a/interface/web/admin/lib/lang/fr_server_config.lng +++ b/interface/web/admin/lib/lang/fr_server_config.lng @@ -180,6 +180,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng index 1f970f8638b0c7e545f5e93f6c6c5fab4e9e6f14..c512715f982633fac79d290a9b96d9a0ee708bd0 100644 --- a/interface/web/admin/lib/lang/hr_server_config.lng +++ b/interface/web/admin/lib/lang/hr_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Statistika limita sanduÄića'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng index 25d30c24515a24a0010ec852083a2b82e43299f7..8f8347053fd0343b2dbdb93d96576092c721afb9 100644 --- a/interface/web/admin/lib/lang/hu_server_config.lng +++ b/interface/web/admin/lib/lang/hu_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng index f6a54151f30aa69629b02bcde54503f6fe93c263..b632a9f2873041926a23cd11e66e2916878b4c19 100644 --- a/interface/web/admin/lib/lang/id_server_config.lng +++ b/interface/web/admin/lib/lang/id_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng index 7d67123662c722bfd20962d11914acf4cc48a581..d5afddbcffffac35a47b9cc767bc6a038cddb998 100644 --- a/interface/web/admin/lib/lang/it_server_config.lng +++ b/interface/web/admin/lib/lang/it_server_config.lng @@ -180,6 +180,7 @@ $wb['mailbox_quota_stats_txt'] = 'Statistiche Quota Casella di Posta'; $wb['enable_ip_wildcard_txt'] = 'Abilita IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Imposta cartelle sito in moaniera non modificabile (attributi estesi)'; $wb['overtraffic_notify_admin_txt'] = 'Trasmetti notifiche superamento traffico ad admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Trasmetti notifiche superamento traffico al cliente'; $wb['overtraffic_disable_web_txt'] = 'Disabilita i siti web che eccedono il limiti di traffico'; $wb['rbl_error_regex'] = 'Per cortesia specificare nomi host RBL validi.'; diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng index a78f0900d81481bd6a55a9e5db99becaae380af1..589fccb6e51f88cd7313a03552dbbedfd539a03b 100644 --- a/interface/web/admin/lib/lang/ja_server_config.lng +++ b/interface/web/admin/lib/lang/ja_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index fc39a2a25683542b2a2b7504996775bacbb05ae4..cb8cafc822e71e96388f230610ed0b63547d7bff 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index 4b838bd3ea3efbd9c9d247f0f2845cb3b83eff3a..ef351a1431e0627581eba7ea557dc2521e4b57ce 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Statystyki użycia skrzynek email'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'PrzeÅ›lij informacje o przekroczeniu transferu do admina'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'PrzeÅ›lij informacje o przekroczeniu transferu do klienta'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng index d42a415958513eeb320e5cc77a8fcd4871e06f58..07530dfee8117e0add2e8bf81a5e86e3b1549783 100644 --- a/interface/web/admin/lib/lang/pt_server_config.lng +++ b/interface/web/admin/lib/lang/pt_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng index 81488177c015041ca0bca2488f99e4c98973c5ad..59ff1a77f1daae2296dee2478deaa6e446c7f12b 100644 --- a/interface/web/admin/lib/lang/ro_server_config.lng +++ b/interface/web/admin/lib/lang/ro_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng index bce96e9339a72100c11e5c6c13fcd04a18c4fd2e..8a68657fe80df62d022fe584d327bb8b18659d7f 100644 --- a/interface/web/admin/lib/lang/ru_server_config.lng +++ b/interface/web/admin/lib/lang/ru_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'СтатиÑтика квоты почтово $wb['enable_ip_wildcard_txt'] = 'Включить IP подÑтановочный знак (*)'; $wb['web_folder_protection_txt'] = 'Сделать веб-папки неизменÑемыми (раÑширенные атрибуты)'; $wb['overtraffic_notify_admin_txt'] = 'ПриÑылать уведомление трафика админиÑтратору'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'ПриÑылать уведомление трафика клиенту'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'ПожалуйÑта, укажите дейÑтвительные имена хоÑтов RBL.'; diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng index 4f8d24411785d3b608c600a4e8e6995eba60cd6a..c6fc39fad79ec8a67de3adcb34b41f7face78891 100644 --- a/interface/web/admin/lib/lang/se_server_config.lng +++ b/interface/web/admin/lib/lang/se_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng index b13462584ea441f8bc34d002070a4ed00b749346..aea4f45cf6d03d3a52b4a8d6341024d65a0beb05 100644 --- a/interface/web/admin/lib/lang/sk_server_config.lng +++ b/interface/web/admin/lib/lang/sk_server_config.lng @@ -192,6 +192,7 @@ $wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics'; $wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)'; $wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)'; $wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.'; diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng index e15677aa3d5ac8d274f1a4fbd4202deddc4dca64..3058506d2de974a9a7377aa5f2adb8c8e08941fb 100644 --- a/interface/web/admin/lib/lang/tr_server_config.lng +++ b/interface/web/admin/lib/lang/tr_server_config.lng @@ -199,6 +199,7 @@ $wb['mailbox_quota_stats_txt'] = 'E-posta Kutusu Kota Ä°statistikleri'; $wb['enable_ip_wildcard_txt'] = 'IP Genel Karakteri (*) Kullanılsın'; $wb['web_folder_protection_txt'] = 'Web klasörleri ayarlanamasın (geniÅŸletilmiÅŸ öznitelikler)'; $wb['overtraffic_notify_admin_txt'] = 'Trafik Aşımı Bildirimi Yöneticiye Gönderilsin'; +$wb['overtraffic_notify_reseller_txt'] = 'Send overtraffic notification to reseller'; $wb['overtraffic_notify_client_txt'] = 'Trafik Aşımı Bildirimi Müşteriye Gönderilsin'; $wb['overtraffic_disable_web_txt'] = 'Disable websites that exceed traffic limit'; $wb['rbl_error_regex'] = 'Lütfen geçerli RBL sunucu adları yazın.'; diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm index 5cf5c43a75826bce63f1c089366bf87bb3383fec..630dc200a66b26dcebb429277480681112628de7 100644 --- a/interface/web/admin/templates/server_config_web_edit.htm +++ b/interface/web/admin/templates/server_config_web_edit.htm @@ -133,6 +133,12 @@ {tmpl_var name='overtraffic_notify_admin'} </div> </div> + <div class="form-group"> + <label class="col-sm-3 control-label">{tmpl_var name='overtraffic_notify_reseller_txt'}</label> + <div class="col-sm-9"> + {tmpl_var name='overtraffic_notify_reseller'} + </div> + </div> <div class="form-group"> <label class="col-sm-3 control-label">{tmpl_var name='overtraffic_notify_client_txt'}</label> <div class="col-sm-9"> 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 ac7ae0aa5c70fab9c8e539145f558c950d174563..ea9944409674460bc93ab42fad3cdbf6489bfe75 100644 --- a/server/lib/classes/cron.d/300-quota_notify.inc.php +++ b/server/lib/classes/cron.d/300-quota_notify.inc.php @@ -105,6 +105,18 @@ class cronjob_quota_notify extends cronjob { $recipients[] = $global_config['admin_mail']; } + //* Send email to reseller + if($web_config['overtraffic_notify_reseller'] == 'y') { + $client_group_id = $rec["sys_groupid"]; + $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']; + } + } + //* Send email to client if($web_config['overtraffic_notify_client'] == 'y') { $client_group_id = $rec["sys_groupid"];