Commit f63b7309 authored by Sergio's avatar Sergio

fix edit custom transports with :, such as relay:[IP]

parent 96cdd0a5
...@@ -70,6 +70,7 @@ class page_action extends tform_actions { ...@@ -70,6 +70,7 @@ class page_action extends tform_actions {
function onShowEnd() { function onShowEnd() {
global $app, $conf; global $app, $conf;
$types = array('smtp' => 'smtp', 'uucp' => 'uucp', 'slow' => 'slow', 'error' => 'error', 'custom' => 'custom', '' => 'null');
$tmp_parts = explode(":", $this->dataRecord["transport"]); $tmp_parts = explode(":", $this->dataRecord["transport"]);
if(!empty($this->id) && !stristr($this->dataRecord["transport"], ':')) { if(!empty($this->id) && !stristr($this->dataRecord["transport"], ':')) {
$rec["type"] = 'custom'; $rec["type"] = 'custom';
...@@ -77,10 +78,12 @@ class page_action extends tform_actions { ...@@ -77,10 +78,12 @@ class page_action extends tform_actions {
if(empty($this->id) && empty($tmp_parts[0])) { if(empty($this->id) && empty($tmp_parts[0])) {
$rec["type"] = 'smtp'; $rec["type"] = 'smtp';
} else { } 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]; $dest = @$tmp_parts[1].':'.@$tmp_parts[2];
} elseif(!empty($tmp_parts[1]) || $this->dataRecord["transport"] == ":") { } elseif(!empty($tmp_parts[1]) || $this->dataRecord["transport"] == ":") {
$dest = $tmp_parts[1]; $dest = $tmp_parts[1];
...@@ -95,7 +98,6 @@ class page_action extends tform_actions { ...@@ -95,7 +98,6 @@ class page_action extends tform_actions {
$rec["destination"] = @$dest; $rec["destination"] = @$dest;
} }
$types = array('smtp' => 'smtp', 'uucp' => 'uucp', 'slow' => 'slow', 'error' => 'error', 'custom' => 'custom', '' => 'null');
$type_select = ''; $type_select = '';
if(is_array($types)) { if(is_array($types)) {
foreach( $types as $key => $val) { foreach( $types as $key => $val) {
......
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