Skip to content

Commit 3e5ff9a

Browse files
jnorelljnorell
committed
mail_user.disabledeliver has a checkbox and controls if local delivery is performed. fixed #5011
1 parent 036575e commit 3e5ff9a

Some content is hidden

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

58 files changed

+193
-38
lines changed

‎install/tpl/mysql-virtual_email2email.cf.master‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
44
hosts = {mysql_server_ip}
5-
query = select email from mail_user where email = '%s' and postfix = 'y' and disabledeliver = 'n' and server_id = {server_id}
6-
union
7-
select cc as email from mail_user where email = '%s' and postfix = 'y' and disabledeliver = 'y' and server_id = {server_id}
5+
query = SELECT email FROM mail_user WHERE email = '%s' AND postfix = 'y' AND disabledeliver = 'n' AND server_id = {server_id}
6+
UNION
7+
SELECT cc AS email FROM mail_user WHERE email = '%s' AND postfix = 'y' AND disabledeliver = 'y' AND server_id = {server_id}

‎install/tpl/mysql-virtual_policy_greylist.cf.master‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
44
hosts = {mysql_server_ip}
55
query = SELECT 'greylisting' FROM
6-
(SELECT `greylisting`, 1 as `prio` FROM `mail_user` WHERE `server_id` = {server_id} AND `email` = '%s'
7-
UNION SELECT `greylisting`, 2 as `prio` FROM `mail_forwarding` WHERE `server_id` = {server_id} AND `source` = '%s'
8-
UNION SELECT `greylisting`, 3 as `prio` FROM `mail_forwarding` WHERE `server_id` = {server_id} AND `source` = '@%d' ORDER BY `prio` ASC LIMIT 1) as rules
6+
(
7+
SELECT `greylisting`, 1 as `prio` FROM `mail_user` WHERE `server_id` = {server_id} AND `email` = '%s'
8+
UNION
9+
SELECT `greylisting`, 2 as `prio` FROM `mail_forwarding` WHERE `server_id` = {server_id} AND `source` = '%s'
10+
UNION
11+
SELECT `greylisting`, 3 as `prio` FROM `mail_forwarding` WHERE `server_id` = {server_id} AND `source` = '@%d' ORDER BY `prio` ASC LIMIT 1
12+
) AS rules
913
WHERE rules.greylisting = 'y'

‎install/tpl/mysql-virtual_sender_login_maps.cf.master‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
44
hosts = {mysql_server_ip}
5-
query = SELECT destination FROM mail_forwarding WHERE source = '%s' AND active = 'y' AND allow_send_as = 'y' AND server_id = {server_id} UNION SELECT email FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND server_id = {server_id};
5+
query = SELECT destination FROM mail_forwarding WHERE source = '%s' AND active = 'y' AND allow_send_as = 'y' AND server_id = {server_id}
6+
UNION
7+
SELECT email FROM mail_user WHERE email = '%s' AND disablesmtp = 'n' AND server_id = {server_id};

‎interface/web/mail/form/mail_user.tform.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,12 @@
292292
'default' => 'n',
293293
'value' => array(1 => 'y', 0 => 'n')
294294
),
295+
'disabledeliver' => array (
296+
'datatype' => 'VARCHAR',
297+
'formtype' => 'CHECKBOX',
298+
'default' => 'n',
299+
'value' => array(1 => 'y', 0 => 'n')
300+
),
295301
'disableimap' => array (
296302
'datatype' => 'VARCHAR',
297303
'formtype' => 'CHECKBOX',

‎interface/web/mail/lib/lang/ar_mail_user.lng‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ $wb['server_id_txt'] = 'Aerver_id';
2020
$wb['password_txt'] = 'Password';
2121
$wb['maildir_txt'] = 'Maildir';
2222
$wb['postfix_txt'] = 'Enable Receiving';
23+
$wb['tooltip_postfix_txt'] = 'Allows incoming mail to this address.';
2324
$wb['greylisting_txt'] = 'Enable greylisting';
2425
$wb['access_txt'] = 'Enable Access';
2526
$wb['policy_txt'] = 'Spamfilter';
@@ -56,7 +57,10 @@ $wb['weekly_backup_txt'] = 'Weekly';
5657
$wb['monthly_backup_txt'] = 'Monthly';
5758
$wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
5859
$wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
59-
$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
60+
$wb['disablesmtp_txt'] = 'Disable sending';
61+
$wb['tooltip_disablesmtp_txt'] = 'Disables mail submission from this mail account.';
62+
$wb['disabledeliver_txt'] = 'Disable (local) delivering';
63+
$wb['tooltip_disabledeliver_txt'] = 'Disables delivery to INBOX, and processing by mail filters and sieve scripts. Mail forwards to \'Send copy to\' address.';
6064
$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
6165
$wb['sender_cc_txt'] = 'Send outgoing BCC to';
6266
$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';

‎interface/web/mail/lib/lang/ar_mail_user_list.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $wb['name_txt'] = 'Realname';
77
$wb['login_txt'] = 'Login';
88
$wb['postfix_txt'] = 'Receiving';
99
$wb['disablesmtp_txt'] = 'SMTP (sending)';
10+
$wb['disabledeliver_txt'] = 'INBOX';
1011
$wb['disableimap_txt'] = 'IMAP';
1112
$wb['disablepop3_txt'] = 'POP3';
1213
?>

‎interface/web/mail/lib/lang/bg_mail_user.lng‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ $wb['server_id_txt'] = 'server_id';
1616
$wb['password_txt'] = 'парола';
1717
$wb['maildir_txt'] = 'maildir';
1818
$wb['postfix_txt'] = 'Разреши получаване';
19+
$wb['tooltip_postfix_txt'] = 'Allows incoming mail to this address.';
1920
$wb['greylisting_txt'] = 'Enable greylisting';
2021
$wb['access_txt'] = 'Разреши достъп';
2122
$wb['policy_txt'] = 'Спам филтър';
@@ -50,7 +51,10 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.';
5051
$wb['password_match_txt'] = 'The passwords do match.';
5152
$wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
5253
$wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
53-
$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
54+
$wb['disablesmtp_txt'] = 'Disable sending';
55+
$wb['tooltip_disablesmtp_txt'] = 'Disables mail submission from this mail account.';
56+
$wb['disabledeliver_txt'] = 'Disable (local) delivering';
57+
$wb['tooltip_disabledeliver_txt'] = 'Disables delivery to INBOX, and processing by mail filters and sieve scripts. Mail forwards to \'Send copy to\' address.';
5458
$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
5559
$wb['sender_cc_txt'] = 'Send outgoing BCC to';
5660
$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';

‎interface/web/mail/lib/lang/bg_mail_user_list.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $wb['name_txt'] = 'Истинско име';
77
$wb['login_txt'] = 'Вход';
88
$wb['postfix_txt'] = 'Receiving';
99
$wb['disablesmtp_txt'] = 'SMTP (sending)';
10+
$wb['disabledeliver_txt'] = 'INBOX';
1011
$wb['disableimap_txt'] = 'IMAP';
1112
$wb['disablepop3_txt'] = 'POP3';
1213
?>

‎interface/web/mail/lib/lang/br_mail_user.lng‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,17 @@ $wb['password_txt'] = 'Senha';
2424
$wb['password_click_to_set_txt'] = 'Clique para configurar';
2525
$wb['maildir_txt'] = 'Maildir';
2626
$wb['postfix_txt'] = 'Habilitar recebimento';
27+
$wb['tooltip_postfix_txt'] = 'Allows incoming mail to this address.';
2728
$wb['greylisting_txt'] = 'Habilitar greylist';
2829
$wb['access_txt'] = 'Habilitar acesso';
2930
$wb['policy_txt'] = 'Filtros anti-spam';
3031
$wb['inherit_policy'] = '- Inherit domain setting -';
3132
$wb['limit_mailbox_txt'] = 'O limite de contas de e-mail para esta conta foi alcançado.';
3233
$wb['limit_mailquota_txt'] = 'O limite de tamanho para as contas de e-mails foi alcançado. O espaço disponível em MB é';
3334
$wb['disablesmtp_txt'] = 'Desabilitar SMTP (envio)';
35+
$wb['tooltip_disablesmtp_txt'] = 'Disables mail submission from this mail account.';
36+
$wb['disabledeliver_txt'] = 'Disable (local) delivering';
37+
$wb['tooltip_disabledeliver_txt'] = 'Disables delivery to INBOX, and processing by mail filters and sieve scripts. Mail forwards to \'Send copy to\' address.';
3438
$wb['disableimap_txt'] = 'Desabilitar IMAP';
3539
$wb['disablepop3_txt'] = 'Desabilitar POP3';
3640
$wb['duplicate_alias_or_forward_txt'] = 'Já existe um alias ou encaminhamento para este endereço de e-mail.';

‎interface/web/mail/lib/lang/br_mail_user_list.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $wb['name_txt'] = 'Nome real';
77
$wb['login_txt'] = 'acesso';
88
$wb['postfix_txt'] = 'Recebendo';
99
$wb['disablesmtp_txt'] = 'SMTP (envio)';
10+
$wb['disabledeliver_txt'] = 'INBOX';
1011
$wb['disableimap_txt'] = 'IMAP';
1112
$wb['disablepop3_txt'] = 'POP3';
1213
?>

0 commit comments

Comments
 (0)