Merge branch '5732-email-backup' into 'develop'

Limit email backup tab through client limits (#5732)

Closes #5732

See merge request ispconfig/ispconfig3!1250

Author: Marius Burkard

install/sql/incremental/upd_dev_collection.sql

@@ -1,3 +1,7 @@
+-- Add column for email backup limit (#5732)
+ALTER TABLE `client_template` ADD `limit_mail_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_spamfilter_policy`;
+ALTER TABLE `client` ADD `limit_mail_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_spamfilter_policy`;
+
 -- default spamfilter_users.policy_id to 0
 ALTER TABLE `spamfilter_users` ALTER `policy_id` SET DEFAULT 0;
 

install/sql/ispconfig3.sql

@@ -185,6 +185,7 @@ CREATE TABLE `client` (
   `limit_spamfilter_wblist` int(11) NOT NULL DEFAULT '0',
   `limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
   `limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
+  `limit_mail_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
   `limit_relayhost` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n',
   `default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
   `xmpp_servers` text,
@@ -318,6 +319,7 @@ CREATE TABLE `client_template` (
   `limit_spamfilter_wblist` int(11) NOT NULL default '0',
   `limit_spamfilter_user` int(11) NOT NULL default '0',
   `limit_spamfilter_policy` int(11) NOT NULL default '0',
+  `limit_mail_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
   `limit_relayhost` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n',
   `default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1',
   `xmpp_servers` text,

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

@@ -938,6 +938,13 @@
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_mail_backup' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'valuelimit' => 'client:limit_mail_backup',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
 		'limit_relayhost' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

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

@@ -354,6 +354,13 @@
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_mail_backup' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'valuelimit' => 'client:limit_mail_backup',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
 		'limit_relayhost' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

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

@@ -936,6 +936,12 @@
 			'rows'  => '',
 			'cols'  => ''
 		),
+		'limit_mail_backup' => array (
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value'  => array(0 => 'n', 1 => 'y')
+		),
 		'limit_relayhost' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

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

@@ -13,6 +13,7 @@ $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
 $wb['contact_firstname_txt'] = 'Contact firstname';

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

@@ -94,6 +94,7 @@ $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['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';

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

@@ -12,6 +12,7 @@ $wb['limit_mailquota_txt'] = 'Mailbox quota';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
+$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
 $wb['contact_firstname_txt'] = 'Contact firstname';

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

@@ -12,6 +12,7 @@ $wb['limit_mailquota_txt'] = 'Размер на пощенските кутии'
 $wb['limit_spamfilter_wblist_txt'] = 'Макс. брой spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Макс. брой spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Макс. брой spamfilter policys';
+$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
 $wb['default_mailserver_txt'] = 'Пощенски сървър по подразбиране';
 $wb['company_name_txt'] = 'Компания';
 $wb['contact_firstname_txt'] = 'Contact firstname';

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

@@ -94,6 +94,7 @@ $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['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';