Commit 66aab00b authored by Jesse Norell's avatar Jesse Norell
Browse files

add mailbox option to forward in lda vs postfix

parent aa39c6aa
......@@ -76,3 +76,7 @@ ALTER TABLE `dns_soa` CHANGE `dnssec_algo` `dnssec_algo` SET('NSEC3RSASHA1','ECD
ALTER TABLE `client_template` CHANGE `ssh_chroot` `ssh_chroot` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
ALTER TABLE `client_template` CHANGE `web_php_options` `web_php_options` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
-- add option to forward in lda, default to forward in mta except for existing forwards
ALTER TABLE `mail_user` ADD `forward_in_lda` enum('n','y') NOT NULL default 'n' AFTER `cc`;
UPDATE `mail_user` set `forward_in_lda` = 'y' where `cc` != '';
......@@ -1041,6 +1041,7 @@ CREATE TABLE `mail_user` (
`maildir_format` varchar(255) NOT NULL default 'maildir',
`quota` bigint(20) NOT NULL default '-1',
`cc` text NOT NULL default '',
`forward_in_lda` enum('n','y') NOT NULL default 'n',
`sender_cc` varchar(255) NOT NULL default '',
`homedir` varchar(255) NOT NULL default '',
`autoresponder` enum('n','y') NOT NULL default 'n',
......
......@@ -2,4 +2,4 @@ user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password}
dbname = {mysql_server_database}
hosts = {mysql_server_ip}
query = SELECT cc AS email FROM mail_user WHERE cc != '' AND email = '%s' AND postfix = 'y' AND disabledeliver = 'y' AND server_id = {server_id}
query = SELECT cc AS email FROM mail_user WHERE email = '%s' AND cc != '' AND (forward_in_lda = 'n' OR disabledeliver = 'y') AND postfix = 'y' AND server_id = {server_id}
......@@ -189,6 +189,12 @@ $form["tabs"]['mailuser'] = array(
'width' => '30',
'maxlength' => '65535'
),
'forward_in_lda' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
'default' => 'n',
'value' => array(0 => 'n', 1 => 'y')
),
'sender_cc' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
......
......@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Optional)';
$wb['autoresponder_active'] = 'Enable the autoresponder';
$wb['cc_txt'] = 'Send copy to';
$wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Domain';
$wb['now_txt'] = 'Now';
$wb['login_error_unique'] = 'Login is already taken.';
......
......@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(По желание)';
$wb['autoresponder_active'] = 'Разреши автоматичен отговор';
$wb['cc_txt'] = 'Изпрати копие до:';
$wb['cc_error_isemail'] = 'Полето с Изпрати копие до: не съдържа валиден емайл адрес';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Домейн';
$wb['now_txt'] = 'Сега';
$wb['login_error_unique'] = 'Login is already taken.';
......
......@@ -46,8 +46,10 @@ $wb['name_txt'] = 'Nome';
$wb['name_optional_txt'] = '(Opcional)';
$wb['autoresponder_active'] = 'Habilitar auto-resposta';
$wb['cc_txt'] = 'Enviar cópia para';
$wb['sender_cc_txt'] = 'Enviar cópia oculta (BCC) para';
$wb['cc_error_isemail'] = 'O campo "Enviar cópia para" contém um endereço de e-mail inválido.';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['sender_cc_txt'] = 'Enviar cópia oculta (BCC) para';
$wb['sender_cc_error_isemail'] = 'O campo "Enviar cópia oculta para" contém um endereço de e-mail inválido.';
$wb['domain_txt'] = 'Domínio';
$wb['now_txt'] = 'Agora';
......
......@@ -39,6 +39,8 @@ $wb['name_optional_txt'] = '(Optionnel)';
$wb['autoresponder_active'] = 'Activer le répondeur automatique';
$wb['cc_txt'] = 'Envoyer une copie à';
$wb['cc_error_isemail'] = 'Le champ Envoyer une copie ne contient pas une adresse courriel valide';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Domaine';
$wb['now_txt'] = 'Maintenant';
$wb['login_error_unique'] = 'Ce nom d\'utilisateur est déjà pris.';
......
......@@ -39,6 +39,8 @@ $wb['name_optional_txt'] = '(volitelné)';
$wb['autoresponder_active'] = 'Povolit automatický odpovídač';
$wb['cc_txt'] = 'Odeslat příchozí kopii na';
$wb['cc_error_isemail'] = 'Adresa uvedená v poli zaslat kopii na je neplatná';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Doména';
$wb['now_txt'] = 'Nyní';
$wb['login_error_unique'] = 'Přihlášovací jméno je již obsazeno.';
......
......@@ -46,6 +46,8 @@ $wb['name_optional_txt'] = '(optional)';
$wb['autoresponder_active'] = 'Autoresponder aktivieren';
$wb['cc_txt'] = 'Eingehende Mails in Kopie senden an';
$wb['cc_error_isemail'] = 'Das Feld "Kopie senden an" enthält keine gültige E-Mail Adresse';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['login_error_unique'] = 'Benutzername wird bereits verwendet.';
$wb['login_error_regex'] = 'Zulässige Zeichen sind A-Z, a-z, 0-9, ., _ und -.';
$wb['login_txt'] = 'Anmelden';
......
......@@ -45,6 +45,8 @@ $wb['name_optional_txt'] = '(Valgfri)';
$wb['autoresponder_active'] = 'Aktiver autosvarer';
$wb['cc_txt'] = 'Send kopi til';
$wb['cc_error_isemail'] = '-Send kopi til- felt indeholder ikke en gyldig e-mail adresse';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Domæne';
$wb['now_txt'] = 'Nu';
$wb['login_error_unique'] = 'Log ind er allerede taget.';
......
......@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Προαιρετικό)';
$wb['autoresponder_active'] = 'Ενεργοποίηση αυτόματης απάντησης';
$wb['cc_txt'] = 'Αποστολή αντιγράφου σε ';
$wb['cc_error_isemail'] = 'Προς';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Domain';
$wb['now_txt'] = 'Τώρα';
$wb['login_error_unique'] = 'Το όνομα χρησιμοποιείται ήδη';
......
......@@ -46,8 +46,10 @@ $wb["name_txt"] = 'Name';
$wb["name_optional_txt"] = '(Optional)';
$wb['autoresponder_active'] = 'Enable the autoresponder';
$wb['cc_txt'] = 'Send copy to';
$wb['sender_cc_txt'] = 'Send outgoing BCC to';
$wb['cc_error_isemail'] = 'The -Send copy to- field does not contain a valid email address';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['sender_cc_txt'] = 'Send outgoing BCC to';
$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
$wb['domain_txt'] = 'Domain';
$wb['now_txt']='Now';
......
......@@ -12,9 +12,11 @@ $wb['autoresponder_text_txt'] = 'Texto';
$wb['autoresponder_txt'] = 'Habilitado';
$wb['backup_copies_txt'] = 'Número de copias de seguridad';
$wb['backup_interval_txt'] = 'Intervalo de copias de seguridad';
$wb['cc_error_isemail'] = 'El campo -Enviar copia a- no contiene una dirección de correo válida.';
$wb['cc_note_txt'] = '(Separe múltiples cuentas de correo con comas)';
$wb['cc_txt'] = 'Enviar copia a';
$wb['cc_error_isemail'] = 'El campo -Enviar copia a- no contiene una dirección de correo válida.';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['cryptpwd_txt'] = 'Contraseña';
$wb['custom_mailfilter_txt'] = 'Filtro de correo personalizado';
$wb['daily_backup_txt'] = 'Diariamente';
......
......@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Valinnainen)';
$wb['autoresponder_active'] = 'Ota lomavastaaja käyttöön';
$wb['cc_txt'] = 'Send copy to';
$wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Domain';
$wb['now_txt'] = 'Now';
$wb['login_error_unique'] = 'Login is already taken.';
......
......@@ -39,6 +39,8 @@ $wb['name_optional_txt'] = '(Optionnel)';
$wb['autoresponder_active'] = 'Activer le répondeur automatique';
$wb['cc_txt'] = 'Envoyer une copie à';
$wb['cc_error_isemail'] = 'Le champ Envoyer une copie ne contient pas une adresse e-mail valide';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Domaine';
$wb['now_txt'] = 'Maintenant';
$wb['login_error_unique'] = 'Ce nom d’utilisateur est déjà pris.';
......
......@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Optional)';
$wb['autoresponder_active'] = 'Enable the autoresponder';
$wb['cc_txt'] = 'Send copy to';
$wb['cc_error_isemail'] = 'The -Send copy to- field does not conatin a valid email address';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Domena';
$wb['now_txt'] = 'Now';
$wb['login_error_unique'] = 'Login is already taken.';
......
......@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Opcionális)';
$wb['autoresponder_active'] = 'Automatikus válasz engedélyezése';
$wb['cc_txt'] = 'Másolat küldése';
$wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Domain';
$wb['now_txt'] = 'Now';
$wb['login_error_unique'] = 'Login is already taken.';
......
......@@ -41,6 +41,8 @@ $wb['name_optional_txt'] = '(Opsional)';
$wb['autoresponder_active'] = 'Aktifkan Penjawab Otomatis';
$wb['cc_txt'] = 'Kirim salinan ke';
$wb['cc_error_isemail'] = 'Kolom Kirim salinan ke tidak berisi alamat email yang valid';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Domain';
$wb['now_txt'] = 'Now';
$wb['login_error_unique'] = 'Login is already taken.';
......
......@@ -40,6 +40,8 @@ $wb['name_optional_txt'] = '(Opzionale)';
$wb['autoresponder_active'] = 'Abilita autorisponditore';
$wb['cc_txt'] = 'Trasmetti copia a';
$wb['cc_error_isemail'] = 'Il campo trasmetti copia a non contiene un indirizzo email valido';
$wb['forward_in_lda_txt'] = 'Copy during delivery';
$wb['tooltip_forward_in_lda_txt'] = 'Controls if mail copy is forwarded before or during delivery to mailbox.';
$wb['domain_txt'] = 'Dominio';
$wb['now_txt'] = 'Ora';
$wb['login_error_unique'] = 'Questo Login è già occupato.';
......
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