Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Zvonimir
ISPConfig 3
Commits
a7f96ca5
Commit
a7f96ca5
authored
Aug 22, 2014
by
Marius Cramer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'custom_tranport_fix' into 'master'
Custom tranport fix See merge request !121
parents
a9e6315b
f63b7309
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
interface/web/mail/mail_transport_edit.php
interface/web/mail/mail_transport_edit.php
+6
-4
No files found.
interface/web/mail/mail_transport_edit.php
View file @
a7f96ca5
...
...
@@ -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,12 +78,14 @@ class page_action extends tform_actions {
if
(
empty
(
$this
->
id
)
&&
empty
(
$tmp_parts
[
0
]))
{
$rec
[
"type"
]
=
'smtp'
;
}
else
{
$rec
[
"type"
]
=
$t
mp_parts
[
0
]
;
$rec
[
"type"
]
=
$t
ypes
[
$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
]))
{
}
elseif
(
!
empty
(
$tmp_parts
[
1
])
||
$this
->
dataRecord
[
"transport"
]
==
":"
)
{
$dest
=
$tmp_parts
[
1
];
}
else
{
$dest
=
$this
->
dataRecord
[
"transport"
];
...
...
@@ -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
Markdown
is supported
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