Commit ef73cc67 authored by Marius Burkard's avatar Marius Burkard
Browse files

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

Limit email backup tab through client limits (#5732)

Closes #5732

See merge request !1250
parents 17045361 456db475
Pipeline #9422 passed with stage
in 15 seconds
-- 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;
......
......@@ -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,
......
......@@ -938,6 +938,13 @@ $form["tabs"]['limits'] = array (
'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',
......
......@@ -354,6 +354,13 @@ $form["tabs"]['limits'] = array (
'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',
......
......@@ -936,6 +936,12 @@ $form["tabs"]['limits'] = array (
'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',
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -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';
......
......@@ -12,6 +12,7 @@ $wb['limit_mailquota_txt'] = 'Квота на пощенската кутия';
$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 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';
......
......@@ -14,7 +14,8 @@ $wb['limit_mailquota_txt'] = 'Cota da conta de email';
$wb['limit_spamfilter_wblist_txt'] = 'Limite de filtros anti-spam "lista de permissões/bloqueio"';
$wb['limit_spamfilter_user_txt'] = 'Limite de filtros anti-spam por conta de email';
$wb['limit_spamfilter_policy_txt'] = 'Limite de políticas anti-spam';
$wb['default_mailserver_txt'] = 'Servidor de email padrão';
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
$wb['default_mailserver_txt'] = 'Servidor de e-mail padrão';
$wb['company_name_txt'] = 'Empresa';
$wb['contact_firstname_txt'] = 'Nome do contato';
$wb['contact_name_txt'] = 'Contato';
......
......@@ -3,6 +3,7 @@ $wb['ssh_chroot_notempty'] = 'Nenhuma opção chroot SSH selecionada. Selecione
$wb['template_type_txt'] = 'Tipo de gabarito';
$wb['template_name_txt'] = 'Nome do gabarito';
$wb['limit_client_error_notint'] = 'Limite de cliente não é um número.';
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
$wb['default_mailserver_txt'] = 'Servidor de email padrão';
$wb['limit_maildomain_txt'] = 'Limite de domínios de email';
$wb['limit_mailbox_txt'] = 'Limite de contas de email';
......
......@@ -14,7 +14,8 @@ $wb['limit_mailquota_txt'] = 'Cota de contas de email';
$wb['limit_spamfilter_wblist_txt'] = 'Limite de filtros anti-spam "lista de permissões/bloqueio"';
$wb['limit_spamfilter_user_txt'] = 'Limite de filtros anti-spam por usuário';
$wb['limit_spamfilter_policy_txt'] = 'Limite de políticas anti-spam';
$wb['default_mailserver_txt'] = 'Servidor de email padrão';
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
$wb['default_mailserver_txt'] = 'Servidor de e-mail padrão';
$wb['company_name_txt'] = 'Empresa';
$wb['contact_firstname_txt'] = 'Contato';
$wb['contact_name_txt'] = 'Nome do contato';
......
......@@ -12,6 +12,7 @@ $wb['limit_mailquota_txt'] = 'Quota des boites courriel';
$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d\'email';
$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre antispam';
$wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
$wb['default_mailserver_txt'] = 'Serveur mail par défaut';
$wb['company_name_txt'] = 'Nom de l\'entreprise';
$wb['contact_name_txt'] = 'Nom de contact';
......
......@@ -93,6 +93,7 @@ $wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre.';
$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';
......
......@@ -12,6 +12,7 @@ $wb['limit_mailquota_txt'] = 'Quota des boites courriel';
$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d\'emails';
$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre antispam';
$wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
$wb['default_mailserver_txt'] = 'Serveur mail par défaut';
$wb['company_name_txt'] = 'Nom de l\'entreprise';
$wb['contact_name_txt'] = 'Nom de contact';
......
......@@ -13,6 +13,7 @@ $wb['limit_mailquota_txt'] = 'Kvóta e-mailové schránky';
$wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů';
$wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
$wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
$wb['default_mailserver_txt'] = 'Výchozí e-mailový server';
$wb['company_name_txt'] = 'Název společnosti';
$wb['contact_name_txt'] = 'Název kontaktu';
......
......@@ -93,6 +93,7 @@ $wb['limit_aps_txt'] = 'Max. počet APS instalací';
$wb['limit_aps_error_notint'] = 'Limit pro APS instalace musí být číslo.';
$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
$wb['client_limits_txt'] = 'Klientské limity';
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
$wb['default_mailserver_txt'] = 'Výchozí E-mailový server';
$wb['default_webserver_txt'] = 'Výchozí webový server';
$wb['default_dnsserver_txt'] = 'Výchozí DNS server';
......
......@@ -12,6 +12,7 @@ $wb['limit_mailquota_txt'] = 'Kvóta e-mailové schránky';
$wb['limit_spamfilter_wblist_txt'] = 'Max. počet spamfiltrových bílých / černých listinových filtrů';
$wb['limit_spamfilter_user_txt'] = 'Max. počet spamflitrových uživatelů';
$wb['limit_spamfilter_policy_txt'] = 'Max. počet spamfiltrových politik';
$wb['limit_mail_backup_txt'] = 'E-mail backup function available';
$wb['default_mailserver_txt'] = 'Výchozí e-mailový server';
$wb['company_name_txt'] = 'Název společnosti';
$wb['contact_name_txt'] = 'Název kontaktu';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment