Skip to content

Commit 6ac2ee4

Browse files
jnorelljnorell
committed
add client limit for number of white / blacklist
1 parent 90bee49 commit 6ac2ee4

File tree

139 files changed

+329
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+329
-124
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
ALTER TABLE `remote_user` MODIFY `remote_password` VARCHAR(200) NOT NULL DEFAULT '';
1+
ALTER TABLE `remote_user` MODIFY `remote_password` VARCHAR(200) NOT NULL DEFAULT '';
2+
3+
ALTER TABLE `client` ADD COLUMN `limit_mail_wblist` INT(11) NOT NULL DEFAULT '0' AFTER `limit_mailrouting`;
4+
ALTER TABLE `client_template` ADD COLUMN `limit_mail_wblist` INT(11) NOT NULL DEFAULT '0' AFTER `limit_mailrouting`;

‎install/sql/ispconfig3.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ CREATE TABLE `client` (
178178
`limit_mailforward` int(11) NOT NULL DEFAULT '-1',
179179
`limit_mailcatchall` int(11) NOT NULL DEFAULT '-1',
180180
`limit_mailrouting` int(11) NOT NULL DEFAULT '0',
181+
`limit_mail_wblist` int(11) NOT NULL DEFAULT '0',
181182
`limit_mailfilter` int(11) NOT NULL DEFAULT '-1',
182183
`limit_fetchmail` int(11) NOT NULL DEFAULT '-1',
183184
`limit_mailquota` int(11) NOT NULL DEFAULT '-1',
@@ -309,6 +310,7 @@ CREATE TABLE `client_template` (
309310
`limit_mailforward` int(11) NOT NULL default '-1',
310311
`limit_mailcatchall` int(11) NOT NULL default '-1',
311312
`limit_mailrouting` int(11) NOT NULL default '0',
313+
`limit_mail_wblist` int(11) NOT NULL default '0',
312314
`limit_mailfilter` int(11) NOT NULL default '-1',
313315
`limit_fetchmail` int(11) NOT NULL default '-1',
314316
`limit_mailquota` int(11) NOT NULL default '-1',

‎interface/web/client/form/client.tform.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,20 @@
840840
'rows' => '',
841841
'cols' => ''
842842
),
843+
'limit_mail_wblist' => array (
844+
'datatype' => 'INTEGER',
845+
'formtype' => 'TEXT',
846+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
847+
'errmsg'=> 'limit_mail_wblist_error_notint'),
848+
),
849+
'default' => '-1',
850+
'value' => '',
851+
'separator' => '',
852+
'width' => '10',
853+
'maxlength' => '10',
854+
'rows' => '',
855+
'cols' => ''
856+
),
843857
'limit_mailfilter' => array (
844858
'datatype' => 'INTEGER',
845859
'formtype' => 'TEXT',

‎interface/web/client/form/client_template.tform.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,20 @@
256256
'rows' => '',
257257
'cols' => ''
258258
),
259+
'limit_mail_wblist' => array (
260+
'datatype' => 'INTEGER',
261+
'formtype' => 'TEXT',
262+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
263+
'errmsg'=> 'limit_mail_wblist_error_notint'),
264+
),
265+
'default' => '-1',
266+
'value' => '',
267+
'separator' => '',
268+
'width' => '10',
269+
'maxlength' => '10',
270+
'rows' => '',
271+
'cols' => ''
272+
),
259273
'limit_mailfilter' => array (
260274
'datatype' => 'INTEGER',
261275
'formtype' => 'TEXT',

‎interface/web/client/form/reseller.tform.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,20 @@
838838
'rows' => '',
839839
'cols' => ''
840840
),
841+
'limit_mail_wblist' => array (
842+
'datatype' => 'INTEGER',
843+
'formtype' => 'TEXT',
844+
'validators' => array ( 0 => array ( 'type' => 'ISINT',
845+
'errmsg'=> 'limit_mail_wblist_error_notint'),
846+
),
847+
'default' => '-1',
848+
'value' => '',
849+
'separator' => '',
850+
'width' => '10',
851+
'maxlength' => '10',
852+
'rows' => '',
853+
'cols' => ''
854+
),
841855
'limit_mailfilter' => array (
842856
'datatype' => 'INTEGER',
843857
'formtype' => 'TEXT',

‎interface/web/client/lib/lang/ar_client.lng‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
66
$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
77
$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
88
$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
9+
$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
910
$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
1011
$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
1112
$wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -68,6 +69,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must b
6869
$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
6970
$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
7071
$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
72+
$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
7173
$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
7274
$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
7375
$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
202204
$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
203205
$wb['Address'] = 'Address';
204206
$wb['Limits'] = 'Limits';
205-
?>

‎interface/web/client/lib/lang/ar_client_template.lng‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
88
$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
99
$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
1010
$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
11+
$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
1112
$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
1213
$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
1314
$wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -37,6 +38,7 @@ $wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must b
3738
$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
3839
$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
3940
$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
41+
$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
4042
$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
4143
$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
4244
$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
122124
$wb['db_servers_txt'] = 'Database servers';
123125
$wb['mail_servers_txt'] = 'Mailservers';
124126
$wb['Limits'] = 'Limits';
125-
?>

‎interface/web/client/lib/lang/ar_reseller.lng‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Max. number of email aliases';
55
$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
66
$wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
77
$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
8+
$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
89
$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
910
$wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
1011
$wb['limit_mailquota_txt'] = 'Mailbox quota';
@@ -66,6 +67,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
6667
$wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
6768
$wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
6869
$wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
70+
$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
6971
$wb['limit_mailfilter_error_notint'] = 'The email filter limit must be a number.';
7072
$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail limit must be a number.';
7173
$wb['limit_mailquota_error_notint'] = 'The email quota limit must be a number.';
@@ -206,4 +208,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
206208
$wb['Reseller'] = 'Reseller';
207209
$wb['Address'] = 'Address';
208210
$wb['Limits'] = 'Limits';
209-
?>

‎interface/web/client/lib/lang/bg_client.lng‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ $wb['limit_mailalias_txt'] = 'Макс. брой email aliases';
55
$wb['limit_mailforward_txt'] = 'Макс. брой email forwarders';
66
$wb['limit_mailcatchall_txt'] = 'Макс. брой email catchall accounts';
77
$wb['limit_mailrouting_txt'] = 'Макс. брой email routes';
8+
$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
89
$wb['limit_mailfilter_txt'] = 'Макс. брой email filters';
910
$wb['limit_fetchmail_txt'] = 'Макс. брой fetchmail accounts';
1011
$wb['limit_mailquota_txt'] = 'Размер на пощенските кутии';
@@ -63,6 +64,7 @@ $wb['limit_mailalias_error_notint'] = ' The email alias трябва да е ч
6364
$wb['limit_mailforward_error_notint'] = 'The email forward трябва да е число';
6465
$wb['limit_mailcatchall_error_notint'] = 'The email catchall трябва да е число';
6566
$wb['limit_mailrouting_error_notint'] = 'The email routing трябва да е число';
67+
$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
6668
$wb['limit_mailfilter_error_notint'] = 'The email filter трябва да е число';
6769
$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail трябва да е число';
6870
$wb['limit_mailquota_error_notint'] = 'Размерът на пощенските кутии трябва да е число.';
@@ -202,4 +204,3 @@ $wb['password_click_to_set_txt'] = 'Click to set';
202204
$wb['limit_dns_record_error_notint'] = 'The dns record limit must be a number.';
203205
$wb['Address'] = 'Address';
204206
$wb['Limits'] = 'Limits';
205-
?>

‎interface/web/client/lib/lang/bg_client_template.lng‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $wb['limit_mailalias_txt'] = 'Макс. брой на email aliases';
77
$wb['limit_mailforward_txt'] = 'Макс. брой на email forwarders';
88
$wb['limit_mailcatchall_txt'] = 'Макс. брой на email catchall accounts';
99
$wb['limit_mailrouting_txt'] = 'Макс. брой на email routes';
10+
$wb['limit_mail_wblist_txt'] = 'Max. number of email white / blacklist entries';
1011
$wb['limit_mailfilter_txt'] = 'Макс. брой на email filters';
1112
$wb['limit_fetchmail_txt'] = 'Макс. брой на fetchmail accounts';
1213
$wb['limit_mailquota_txt'] = 'Квота на пощенската кутия';
@@ -32,6 +33,7 @@ $wb['limit_mailalias_error_notint'] = 'The email alias трябва да е чи
3233
$wb['limit_mailforward_error_notint'] = 'The email forward трябва да е число';
3334
$wb['limit_mailcatchall_error_notint'] = 'The email catchall трябва да е число';
3435
$wb['limit_mailrouting_error_notint'] = 'The email routing трябва да е число';
36+
$wb['limit_mail_wblist_error_notint'] = 'The email white / blacklist limit must be a number.';
3537
$wb['limit_mailfilter_error_notint'] = 'The email filter трябва да е число';
3638
$wb['limit_mailfetchmail_error_notint'] = 'The fetchmail трябва да е число';
3739
$wb['limit_mailquota_error_notint'] = 'The email quota трябва да е число';
@@ -122,4 +124,3 @@ $wb['web_servers_txt'] = 'Webservers';
122124
$wb['db_servers_txt'] = 'Database servers';
123125
$wb['mail_servers_txt'] = 'Mailservers';
124126
$wb['Limits'] = 'Limits';
125-
?>

0 commit comments

Comments
 (0)