Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
f63b7309
Commit
f63b7309
authored
Aug 21, 2014
by
Sergio
Browse files
fix edit custom transports with :, such as relay:[IP]
parent
96cdd0a5
Changes
1
Hide whitespace changes
Inline
Side-by-side
interface/web/mail/mail_transport_edit.php
View file @
f63b7309
...
...
@@ -70,6 +70,7 @@ class page_action extends tform_actions {
function
onShowEnd
()
{
global
$app
,
$conf
;
$types
=
array
(
'smtp'
=>
'smtp'
,
'uucp'
=>
'uucp'
,
'slow'
=>
'slow'
,
'error'
=>
'error'
,
'custom'
=>
'custom'
,
''
=>
'null'
);
$tmp_parts
=
explode
(
":"
,
$this
->
dataRecord
[
"transport"
]);
if
(
!
empty
(
$this
->
id
)
&&
!
stristr
(
$this
->
dataRecord
[
"transport"
],
':'
))
{
$rec
[
"type"
]
=
'custom'
;
...
...
@@ -77,10 +78,12 @@ class page_action extends tform_actions {
if
(
empty
(
$this
->
id
)
&&
empty
(
$tmp_parts
[
0
]))
{
$rec
[
"type"
]
=
'smtp'
;
}
else
{
$rec
[
"type"
]
=
$tmp_parts
[
0
];
$rec
[
"type"
]
=
$types
[
$tmp_parts
[
0
]
]
?
$tmp_parts
[
0
]
:
'custom'
;
}
}
if
(
!
empty
(
$tmp_parts
[
2
]))
{
if
(
$rec
[
"type"
]
==
'custom'
)
{
$dest
=
$this
->
dataRecord
[
"transport"
];
}
elseif
(
!
empty
(
$tmp_parts
[
2
]))
{
$dest
=
@
$tmp_parts
[
1
]
.
':'
.
@
$tmp_parts
[
2
];
}
elseif
(
!
empty
(
$tmp_parts
[
1
])
||
$this
->
dataRecord
[
"transport"
]
==
":"
)
{
$dest
=
$tmp_parts
[
1
];
...
...
@@ -95,7 +98,6 @@ class page_action extends tform_actions {
$rec
[
"destination"
]
=
@
$dest
;
}
$types
=
array
(
'smtp'
=>
'smtp'
,
'uucp'
=>
'uucp'
,
'slow'
=>
'slow'
,
'error'
=>
'error'
,
'custom'
=>
'custom'
,
''
=>
'null'
);
$type_select
=
''
;
if
(
is_array
(
$types
))
{
foreach
(
$types
as
$key
=>
$val
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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