Skip to content

Commit 0856a23

Browse files
author
thom
committed
Limit email backup tab through client limits (#5732)
1 parent c8ddb95 commit 0856a23

File tree

84 files changed

+123
-5
lines changed

Some content is hidden

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

84 files changed

+123
-5
lines changed
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
1+
-- Add column for email backup limit (#5732)
2+
ALTER TABLE `client_template` ADD `limit_mail_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_spamfilter_policy`;
3+
ALTER TABLE `client` ADD `limit_mail_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_spamfilter_policy`;

install/sql/ispconfig3.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ CREATE TABLE `client` (
184184
`limit_spamfilter_wblist` int(11) NOT NULL DEFAULT '0',
185185
`limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
186186
`limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
187+
`limit_mail_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
187188
`default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
188189
`xmpp_servers` text,
189190
`limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',
@@ -315,6 +316,7 @@ CREATE TABLE `client_template` (
315316
`limit_spamfilter_wblist` int(11) NOT NULL default '0',
316317
`limit_spamfilter_user` int(11) NOT NULL default '0',
317318
`limit_spamfilter_policy` int(11) NOT NULL default '0',
319+
`limit_mail_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
318320
`default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
319321
`xmpp_servers` text,
320322
`limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1',

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,13 @@
924924
'rows' => '',
925925
'cols' => ''
926926
),
927+
'limit_mail_backup' => array (
928+
'datatype' => 'VARCHAR',
929+
'formtype' => 'CHECKBOX',
930+
'default' => 'y',
931+
'valuelimit' => 'client:limit_mail_backup',
932+
'value' => array(0 => 'n', 1 => 'y')
933+
),
927934
'default_xmppserver' => array (
928935
'datatype' => 'INTEGER',
929936
'formtype' => 'SELECT',

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,13 @@
339339
'maxlength' => '10',
340340
'rows' => '',
341341
'cols' => ''
342+
),
343+
'limit_mail_backup' => array (
344+
'datatype' => 'VARCHAR',
345+
'formtype' => 'CHECKBOX',
346+
'default' => 'y',
347+
'valuelimit' => 'client:limit_mail_backup',
348+
'value' => array(0 => 'n', 1 => 'y')
342349
),/*
343350
'default_xmppserver' => array (
344351
'datatype' => 'INTEGER',

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -922,6 +922,13 @@
922922
'rows' => '',
923923
'cols' => ''
924924
),
925+
'limit_mail_backup' => array (
926+
'datatype' => 'VARCHAR',
927+
'formtype' => 'CHECKBOX',
928+
'default' => 'y',
929+
'valuelimit' => 'client:limit_mail_backup',
930+
'value' => array(0 => 'n', 1 => 'y')
931+
),
925932
'default_xmppserver' => array (
926933
'datatype' => 'INTEGER',
927934
'formtype' => 'SELECT',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ $wb['limit_mailquota_txt'] = 'Mailbox quota';
1212
$wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
1313
$wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
1414
$wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
15+
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
1516
$wb['default_mailserver_txt'] = 'Default Mailserver';
1617
$wb['company_name_txt'] = 'Company name';
1718
$wb['contact_firstname_txt'] = 'Contact firstname';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
9191
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
9292
$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
9393
$wb['client_limits_txt'] = 'Client Limits';
94+
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
9495
$wb['default_mailserver_txt'] = 'Default Mailserver';
9596
$wb['default_webserver_txt'] = 'Default Webserver';
9697
$wb['default_dnsserver_txt'] = 'Default DNS Server';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailquota_txt'] = 'Mailbox quota';
1111
$wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
1212
$wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
1313
$wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
14+
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
1415
$wb['default_mailserver_txt'] = 'Default Mailserver';
1516
$wb['company_name_txt'] = 'Company name';
1617
$wb['contact_firstname_txt'] = 'Contact firstname';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $wb['limit_mailquota_txt'] = 'Размер на пощенските кутии'
1111
$wb['limit_spamfilter_wblist_txt'] = 'Макс. брой spamfilter white / blacklist filters';
1212
$wb['limit_spamfilter_user_txt'] = 'Макс. брой spamfilter users';
1313
$wb['limit_spamfilter_policy_txt'] = 'Макс. брой spamfilter policys';
14+
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
1415
$wb['default_mailserver_txt'] = 'Пощенски сървър по подразбиране';
1516
$wb['company_name_txt'] = 'Компания';
1617
$wb['contact_firstname_txt'] = 'Contact firstname';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
9191
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
9292
$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
9393
$wb['client_limits_txt'] = 'Client Limits';
94+
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
9495
$wb['default_mailserver_txt'] = 'Default Mailserver';
9596
$wb['default_webserver_txt'] = 'Default Webserver';
9697
$wb['default_dnsserver_txt'] = 'Default DNS Server';

0 commit comments

Comments
 (0)