Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
b6698e08
Commit
b6698e08
authored
Aug 19, 2021
by
Jesse Norell
Browse files
mail_forwarding source must be unique
parent
95f8fb7f
Changes
52
Hide whitespace changes
Inline
Side-by-side
install/sql/incremental/upd_dev_collection.sql
View file @
b6698e08
-- default spamfilter_users.policy_id to 0
ALTER
TABLE
`spamfilter_users`
ALTER
`policy_id`
SET
DEFAULT
0
;
-- mail_forwarding.source must be unique
ALTER
TABLE
`mail_forwarding`
DROP
KEY
`server_id`
;
ALTER
TABLE
`mail_forwarding`
ADD
UNIQUE
KEY
`server_id`
(
`server_id`
,
`source`
);
install/sql/ispconfig3.sql
View file @
b6698e08
...
...
@@ -916,7 +916,7 @@ CREATE TABLE `mail_forwarding` (
`allow_send_as`
ENUM
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
,
`greylisting`
enum
(
'n'
,
'y'
)
NOT
NULL
DEFAULT
'n'
,
PRIMARY
KEY
(
`forwarding_id`
),
KEY
`server_id`
(
`server_id`
,
`source`
),
UNIQUE
KEY
`server_id`
(
`server_id`
,
`source`
),
KEY
`type`
(
`type`
)
)
DEFAULT
CHARSET
=
utf8
AUTO_INCREMENT
=
1
;
...
...
interface/web/mail/form/mail_alias.tform.php
View file @
b6698e08
...
...
@@ -83,6 +83,8 @@ $form["tabs"]['alias'] = array (
),
'validators'
=>
array
(
0
=>
array
(
'type'
=>
'ISEMAIL'
,
'errmsg'
=>
'email_error_isemail'
),
1
=>
array
(
'type'
=>
'UNIQUE'
,
'errmsg'
=>
'email_error_unique'
),
),
'default'
=>
''
,
'value'
=>
''
,
...
...
interface/web/mail/form/mail_forward.tform.php
View file @
b6698e08
...
...
@@ -83,6 +83,8 @@ $form["tabs"]['forward'] = array (
),
'validators'
=>
array
(
0
=>
array
(
'type'
=>
'ISEMAIL'
,
'errmsg'
=>
'email_error_isemail'
),
1
=>
array
(
'type'
=>
'UNIQUE'
,
'errmsg'
=>
'email_error_unique'
),
),
'default'
=>
''
,
'value'
=>
''
,
...
...
interface/web/mail/lib/lang/ar_mail_alias.lng
View file @
b6698e08
...
...
@@ -14,4 +14,3 @@ $wb['source_txt'] = 'Alias';
$wb
[
'greylisting_txt'
]
=
'Enable greylisting'
;
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this alias as origin'
;
?>
interface/web/mail/lib/lang/ar_mail_forward.lng
View file @
b6698e08
...
...
@@ -10,6 +10,6 @@ $wb['greylisting_txt'] = 'Enable greylisting';
$wb
[
'destination_error_empty'
]
=
'The destination must not be empty.'
;
$wb
[
'destination_error_isemail'
]
=
'The destination contains at least one invalid email address.'
;
$wb
[
'email_error_isemail'
]
=
'Please enter a valid email address.'
;
$wb
[
'email_error_unique'
]
=
'Duplicate Emailaddress.'
;
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this address as origin (if target is internal)'
;
?>
interface/web/mail/lib/lang/bg_mail_alias.lng
View file @
b6698e08
...
...
@@ -14,4 +14,3 @@ $wb['source_txt'] = 'Alias';
$wb
[
'greylisting_txt'
]
=
'Enable greylisting'
;
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this alias as origin'
;
?>
interface/web/mail/lib/lang/bg_mail_forward.lng
View file @
b6698e08
...
...
@@ -10,6 +10,6 @@ $wb['greylisting_txt'] = 'Enable greylisting';
$wb
[
'destination_error_empty'
]
=
'The destination must not be empty.'
;
$wb
[
'destination_error_isemail'
]
=
'The destination contains at least one invalid email address.'
;
$wb
[
'email_error_isemail'
]
=
'Please enter a valid email address.'
;
$wb
[
'email_error_unique'
]
=
'Duplicate Emailaddress.'
;
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this address as origin (if target is internal)'
;
?>
interface/web/mail/lib/lang/br_mail_forward.lng
View file @
b6698e08
...
...
@@ -9,6 +9,7 @@ $wb['source_txt'] = 'Endereço de email de origem';
$wb
[
'destination_error_empty'
]
=
'O endereço de email de destino não pode ficar vazio.'
;
$wb
[
'destination_error_isemail'
]
=
'O endereço de email de destino é inválido.'
;
$wb
[
'email_error_isemail'
]
=
'Por favor informe um endereço de email válido.'
;
$wb
[
'email_error_unique'
]
=
'Endereço de email duplicado.'
;
$wb
[
'send_as_txt'
]
=
'Enviar como'
;
$wb
[
'send_as_exp'
]
=
'Permitir o destino enviar emails usando este endereço como origem (se o destino for interno)'
;
$wb
[
'greylisting_txt'
]
=
'Habilitar greylist'
;
interface/web/mail/lib/lang/ca_mail_alias.lng
View file @
b6698e08
...
...
@@ -14,4 +14,3 @@ $wb['source_txt'] = 'Alias';
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this alias as origin'
;
$wb
[
'greylisting_txt'
]
=
'Enable greylisting'
;
?>
interface/web/mail/lib/lang/ca_mail_forward.lng
View file @
b6698e08
...
...
@@ -9,7 +9,7 @@ $wb['source_txt'] = 'Source courriel';
$wb
[
'destination_error_empty'
]
=
'The destination must not be empty.'
;
$wb
[
'destination_error_isemail'
]
=
'The destination contains at least one invalid email address.'
;
$wb
[
'email_error_isemail'
]
=
'Please enter a valid email address.'
;
$wb
[
'email_error_unique'
]
=
'Dupliquer l\'adresse courriel.'
;
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this address as origin (if target is internal)'
;
$wb
[
'greylisting_txt'
]
=
'Enable greylisting'
;
?>
interface/web/mail/lib/lang/cz_mail_forward.lng
View file @
b6698e08
...
...
@@ -9,6 +9,7 @@ $wb['source_txt'] = 'Zdrojový e-mail';
$wb
[
'destination_error_empty'
]
=
'The destination must not be empty.'
;
$wb
[
'destination_error_isemail'
]
=
'The destination contains at least one invalid email address.'
;
$wb
[
'email_error_isemail'
]
=
'Zadejte prosím platnou e-mailovou adresu.'
;
$wb
[
'email_error_unique'
]
=
'Duplikování e-mailové adresy.'
;
$wb
[
'send_as_txt'
]
=
'Odeslat jako'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this address as origin (if target is internal)'
;
$wb
[
'greylisting_txt'
]
=
'Povolit greylisting'
;
interface/web/mail/lib/lang/de_mail_alias.lng
View file @
b6698e08
...
...
@@ -14,4 +14,3 @@ $wb['source_txt'] = 'Alias';
$wb
[
'send_as_txt'
]
=
'Senden als'
;
$wb
[
'send_as_exp'
]
=
'Ziel erlauben, den Alias als Absender zu benutzen'
;
$wb
[
'greylisting_txt'
]
=
'Aktiviere Greylisting'
;
?>
interface/web/mail/lib/lang/de_mail_forward.lng
View file @
b6698e08
...
...
@@ -9,7 +9,7 @@ $wb['source_txt'] = 'Quell E-Mail Adresse';
$wb
[
'destination_error_empty'
]
=
'Das Weiterleitungsziel darf nicht leer sein.'
;
$wb
[
'destination_error_isemail'
]
=
'Das Weiterleitungsziel enthält mindestens eine ungültige E-Mail-Adresse.'
;
$wb
[
'email_error_isemail'
]
=
'Bitte geben Sie eine gültige E-Mail Adresse an.'
;
$wb
[
'email_error_unique'
]
=
'Doppelte E-Mail Adresse.'
;
$wb
[
'send_as_txt'
]
=
'Senden als'
;
$wb
[
'send_as_exp'
]
=
'Ziel erlauben, die Adresse als Absender zu nutzen (Nur, falls das Ziel intern ist)'
;
$wb
[
'greylisting_txt'
]
=
'Aktiviere greylisting'
;
?>
interface/web/mail/lib/lang/dk_mail_alias.lng
View file @
b6698e08
...
...
@@ -14,4 +14,3 @@ $wb['source_txt'] = 'Alias';
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this alias as origin'
;
$wb
[
'greylisting_txt'
]
=
'Enable greylisting'
;
?>
interface/web/mail/lib/lang/dk_mail_forward.lng
View file @
b6698e08
...
...
@@ -9,7 +9,7 @@ $wb['source_txt'] = 'Kilde E-mail';
$wb
[
'destination_error_empty'
]
=
'The destination must not be empty.'
;
$wb
[
'destination_error_isemail'
]
=
'The destination contains at least one invalid email address.'
;
$wb
[
'email_error_isemail'
]
=
'Please enter a valid email address.'
;
$wb
[
'email_error_unique'
]
=
'Dupliker E-mailadresse.'
;
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this address as origin (if target is internal)'
;
$wb
[
'greylisting_txt'
]
=
'Enable greylisting'
;
?>
interface/web/mail/lib/lang/el_mail_alias.lng
View file @
b6698e08
...
...
@@ -14,4 +14,3 @@ $wb['source_txt'] = 'Alias';
$wb
[
'greylisting_txt'
]
=
'Enable greylisting'
;
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this alias as origin'
;
?>
interface/web/mail/lib/lang/el_mail_forward.lng
View file @
b6698e08
...
...
@@ -10,6 +10,6 @@ $wb['greylisting_txt'] = 'Enable greylisting';
$wb
[
'destination_error_empty'
]
=
'The destination must not be empty.'
;
$wb
[
'destination_error_isemail'
]
=
'The destination contains at least one invalid email address.'
;
$wb
[
'email_error_isemail'
]
=
'Please enter a valid email address.'
;
$wb
[
'email_error_unique'
]
=
'Διπλή διεύθυνση Email.'
;
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this address as origin (if target is internal)'
;
?>
interface/web/mail/lib/lang/en_mail_alias.lng
View file @
b6698e08
...
...
@@ -14,4 +14,3 @@ $wb['source_txt'] = 'Alias';
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this alias as origin'
;
$wb
[
'greylisting_txt'
]
=
'Enable greylisting'
;
?>
interface/web/mail/lib/lang/en_mail_forward.lng
View file @
b6698e08
...
...
@@ -9,7 +9,7 @@ $wb['source_txt'] = 'Source Email';
$wb
[
'destination_error_empty'
]
=
'The destination must not be empty.'
;
$wb
[
'destination_error_isemail'
]
=
'The destination contains at least one invalid email address.'
;
$wb
[
'email_error_isemail'
]
=
'Please enter a valid email address.'
;
$wb
[
'email_error_unique'
]
=
'Duplicate Emailaddress.'
;
$wb
[
'send_as_txt'
]
=
'Send as'
;
$wb
[
'send_as_exp'
]
=
'Allow target to send mail using this address as origin (if target is internal)'
;
$wb
[
'greylisting_txt'
]
=
'Enable greylisting'
;
?>
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment