Skip to content

Commit 4a1ae3f

Browse files
author
Thom Pol
committed
Implement quota notification to reseller for all notification types (#6346)
1 parent 6d0e969 commit 4a1ae3f

30 files changed

+161
-0
lines changed

install/tpl/server.ini.master

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ mailbox_quota_stats=y
6060
realtime_blackhole_list=zen.spamhaus.org
6161
overquota_notify_threshold=90
6262
overquota_notify_admin=y
63+
overquota_notify_reseller=y
6364
overquota_notify_client=y
6465
overquota_notify_freq=7
6566
overquota_notify_onok=n
@@ -122,10 +123,12 @@ php_ini_check_minutes=1
122123
overtraffic_disable_web=y
123124
overquota_notify_threshold=90
124125
overquota_notify_admin=y
126+
overquota_notify_reseller=y
125127
overquota_notify_client=y
126128
overquota_notify_freq=7
127129
overquota_db_notify_threshold=90
128130
overquota_db_notify_admin=y
131+
overquota_db_notify_reseller=y
129132
overquota_db_notify_client=y
130133
overquota_notify_onok=n
131134
logging=yes

interface/web/admin/form/server_config.tform.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,12 @@
758758
'default' => 'y',
759759
'value' => array(0 => 'n', 1 => 'y')
760760
),
761+
'overquota_notify_reseller' => array(
762+
'datatype' => 'VARCHAR',
763+
'formtype' => 'CHECKBOX',
764+
'default' => 'y',
765+
'value' => array(0 => 'n', 1 => 'y')
766+
),
761767
'overquota_notify_client' => array(
762768
'datatype' => 'VARCHAR',
763769
'formtype' => 'CHECKBOX',
@@ -1118,6 +1124,12 @@
11181124
'default' => 'y',
11191125
'value' => array(0 => 'n', 1 => 'y')
11201126
),
1127+
'overquota_notify_reseller' => array(
1128+
'datatype' => 'VARCHAR',
1129+
'formtype' => 'CHECKBOX',
1130+
'default' => 'y',
1131+
'value' => array(0 => 'n', 1 => 'y')
1132+
),
11211133
'overquota_notify_client' => array(
11221134
'datatype' => 'VARCHAR',
11231135
'formtype' => 'CHECKBOX',
@@ -1142,6 +1154,12 @@
11421154
'default' => 'y',
11431155
'value' => array(0 => 'n', 1 => 'y')
11441156
),
1157+
'overquota_db_notify_reseller' => array(
1158+
'datatype' => 'VARCHAR',
1159+
'formtype' => 'CHECKBOX',
1160+
'default' => 'y',
1161+
'value' => array(0 => 'n', 1 => 'y')
1162+
),
11451163
'overquota_db_notify_client' => array(
11461164
'datatype' => 'VARCHAR',
11471165
'formtype' => 'CHECKBOX',

interface/web/admin/lib/lang/ar_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
199199
$wb['overquota_notify_threshold_txt'] = 'Quota warning usage level';
200200
$wb['overquota_notify_threshold_error'] = 'Quota warning usage level must be between 0-100%';
201201
$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
202+
$wb['overquota_notify_reseller_txt'] = 'Send quota warnings to reseller';
202203
$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';
203204
$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client';
204205
$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
@@ -280,6 +281,7 @@ $wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
280281
$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
281282
$wb['overquota_db_notify_threshold_txt'] = 'DB quota warning usage level';
282283
$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
284+
$wb['overquota_db_notify_reseller_txt'] = 'Send DB quota warnings to reseller';
283285
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
284286
$wb['php_handler_txt'] = 'Default PHP Handler';
285287
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';

interface/web/admin/lib/lang/bg_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
199199
$wb['overquota_notify_threshold_txt'] = 'Quota warning usage level';
200200
$wb['overquota_notify_threshold_error'] = 'Quota warning usage level must be between 0-100%';
201201
$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
202+
$wb['overquota_notify_reseller_txt'] = 'Send quota warnings to reseller';
202203
$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';
203204
$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client';
204205
$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
@@ -280,6 +281,7 @@ $wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
280281
$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
281282
$wb['overquota_db_notify_threshold_txt'] = 'DB quota warning usage level';
282283
$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
284+
$wb['overquota_db_notify_reseller_txt'] = 'Send DB quota warnings to reseller';
283285
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
284286
$wb['php_handler_txt'] = 'Default PHP Handler';
285287
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';

interface/web/admin/lib/lang/br_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ $wb['rbl_error_regex'] = 'Por favor, insira nomes de host válidos para RBLs.';
206206
$wb['overquota_notify_threshold_txt'] = 'Quota warning usage level';
207207
$wb['overquota_notify_threshold_error'] = 'Quota warning usage level must be between 0-100%';
208208
$wb['overquota_notify_admin_txt'] = 'Enviar alerta da cota para o administrador';
209+
$wb['overquota_notify_reseller_txt'] = 'Send quota warnings to reseller';
209210
$wb['overquota_notify_client_txt'] = 'Enviar alerta da cota para o cliente';
210211
$wb['overquota_notify_onok_txt'] = 'Enviar mensagem da cota para o cliente';
211212
$wb['overquota_notify_freq_txt'] = 'Enviar alerta da cota a cada N dias';
@@ -230,6 +231,7 @@ $wb['backup_dir_mount_cmd_txt'] = 'Comando mount, se o diretório não está mon
230231
$wb['backup_delete_txt'] = 'Remover backups de domínios/site';
231232
$wb['overquota_db_notify_threshold_txt'] = 'DB quota warning usage level';
232233
$wb['overquota_db_notify_admin_txt'] = 'Enviar alerta da cota do Banco de Dados para o administrador';
234+
$wb['overquota_db_notify_reseller_txt'] = 'Send DB quota warnings to reseller';
233235
$wb['overquota_db_notify_client_txt'] = 'Enviar alerta da cota do Banco de Dados para o cliente';
234236
$wb['monitor_system_updates_txt'] = 'Verificar por atualizações do sistema';
235237
$wb['php_handler_txt'] = 'Manipulador padrão PHP';

interface/web/admin/lib/lang/ca_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
202202
$wb['overquota_notify_threshold_txt'] = 'Quota warning usage level';
203203
$wb['overquota_notify_threshold_error'] = 'Quota warning usage level must be between 0-100%';
204204
$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
205+
$wb['overquota_notify_reseller_txt'] = 'Send quota warnings to reseller';
205206
$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';
206207
$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client';
207208
$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
@@ -226,6 +227,7 @@ $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounte
226227
$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
227228
$wb['overquota_db_notify_threshold_txt'] = 'DB quota warning usage level';
228229
$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
230+
$wb['overquota_db_notify_reseller_txt'] = 'Send DB quota warnings to reseller';
229231
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
230232
$wb['monitor_system_updates_txt'] = 'Check for Linux updates';
231233
$wb['php_handler_txt'] = 'Default PHP Handler';

interface/web/admin/lib/lang/cz_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
185185
$wb['overquota_notify_threshold_txt'] = 'Quota warning usage level';
186186
$wb['overquota_notify_threshold_error'] = 'Quota warning usage level must be between 0-100%';
187187
$wb['overquota_notify_admin_txt'] = 'Poslat varování o překročení nebo vyčerpání kvót adminovi';
188+
$wb['overquota_notify_reseller_txt'] = 'Send quota warnings to reseller';
188189
$wb['overquota_notify_client_txt'] = 'Poslat varování o překročení nebo vyčerpání kvót klientovi';
189190
$wb['overquota_notify_onok_txt'] = 'Poslat zprávu klientovi, že kvóta je již v pořádku';
190191
$wb['overquota_notify_freq_txt'] = 'Poslat varování o kvótách každý X dní';
@@ -276,6 +277,7 @@ $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounte
276277
$wb['backup_delete_txt'] = 'Odstranit zálohy pokud byla smazána doména/webové stránky';
277278
$wb['overquota_db_notify_threshold_txt'] = 'DB quota warning usage level';
278279
$wb['overquota_db_notify_admin_txt'] = 'Poslat varování o překročení nebo vyčerpání DB kvót adminovi';
280+
$wb['overquota_db_notify_reseller_txt'] = 'Send DB quota warnings to reseller';
279281
$wb['overquota_db_notify_client_txt'] = 'Poslat varování o překročení nebo vyčerpání DB kvót klientovi';
280282
$wb['php_handler_txt'] = 'Výchozí PHP obslužná rutina';
281283
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';

interface/web/admin/lib/lang/de_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ $wb['rbl_error_regex'] = 'Bitte geben Sie gültige RBL-Hostnamen an.';
205205
$wb['overquota_notify_threshold_txt'] = 'Quota warning usage level';
206206
$wb['overquota_notify_threshold_error'] = 'Quota warning usage level must be between 0-100%';
207207
$wb['overquota_notify_admin_txt'] = 'Quota-Warnungen an den Administrator senden';
208+
$wb['overquota_notify_reseller_txt'] = 'Send quota warnings to reseller';
208209
$wb['overquota_notify_client_txt'] = 'Quota-Warnungen an den Kunden senden';
209210
$wb['overquota_notify_onok_txt'] = 'Meldung an den Kunden senden, wenn Belegung wieder ok';
210211
$wb['overquota_notify_freq_txt'] = 'Quota-Warnung alle X Tage versenden';
@@ -283,6 +284,7 @@ $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
283284
$wb['network_filesystem_txt'] = 'Netzwerk-Dateisystem';
284285
$wb['overquota_db_notify_threshold_txt'] = 'DB quota warning usage level';
285286
$wb['overquota_db_notify_admin_txt'] = 'Datenbank-Quota-Warnungen an den Administrator senden';
287+
$wb['overquota_db_notify_reseller_txt'] = 'Send DB quota warnings to reseller';
286288
$wb['overquota_db_notify_client_txt'] = 'Datenbank-Quota-Warnungen an den Kunden senden';
287289
$wb['php_ini_check_minutes_txt'] = 'Prüfe php.ini alle X Minuten auf Änderungen';
288290
$wb['php_ini_check_minutes_error_empty'] = 'Bitte geben Sie einen Wert an, wie oft die php.ini auf Änderungen geprüft werden soll.';

interface/web/admin/lib/lang/dk_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ $wb['rbl_error_regex'] = 'Angiv gyldige RBL værtsnavne.';
188188
$wb['overquota_notify_threshold_txt'] = 'Quota warning usage level';
189189
$wb['overquota_notify_threshold_error'] = 'Quota warning usage level must be between 0-100%';
190190
$wb['overquota_notify_admin_txt'] = 'Send kvote advarsler til admin';
191+
$wb['overquota_notify_reseller_txt'] = 'Send quota warnings to reseller';
191192
$wb['overquota_notify_client_txt'] = 'Send kvote advarsler til kunde';
192193
$wb['overquota_notify_onok_txt'] = 'Send kvote ok meddelelse til kunde';
193194
$wb['overquota_notify_freq_txt'] = 'Send kvote advarsler X dage';
@@ -279,6 +280,7 @@ $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounte
279280
$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
280281
$wb['overquota_db_notify_threshold_txt'] = 'DB quota warning usage level';
281282
$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
283+
$wb['overquota_db_notify_reseller_txt'] = 'Send DB quota warnings to reseller';
282284
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
283285
$wb['php_handler_txt'] = 'Default PHP Handler';
284286
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';

interface/web/admin/lib/lang/el_server_config.lng

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ $wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
199199
$wb['overquota_notify_threshold_txt'] = 'Quota warning usage level';
200200
$wb['overquota_notify_threshold_error'] = 'Quota warning usage level must be between 0-100%';
201201
$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
202+
$wb['overquota_notify_reseller_txt'] = 'Send quota warnings to reseller';
202203
$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';
203204
$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client';
204205
$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
@@ -280,6 +281,7 @@ $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounte
280281
$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
281282
$wb['overquota_db_notify_threshold_txt'] = 'DB quota warning usage level';
282283
$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
284+
$wb['overquota_db_notify_reseller_txt'] = 'Send DB quota warnings to reseller';
283285
$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
284286
$wb['php_handler_txt'] = 'Default PHP Handler';
285287
$wb['php_fpm_default_chroot_txt'] = 'Default chrooted PHP-FPM';

0 commit comments

Comments
 (0)