From a7f96ca5a97506e5a14265876660a5b25e9ed025 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 22 Aug 2014 02:28:36 -0400
Subject: [PATCH] Merge branch 'custom_tranport_fix' into 'master'
---
interface/web/mail/mail_transport_edit.php | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/interface/web/mail/mail_transport_edit.php b/interface/web/mail/mail_transport_edit.php
index d9ce8e8..b47869d 100644
--- a/interface/web/mail/mail_transport_edit.php
+++ b/interface/web/mail/mail_transport_edit.php
@@ -70,6 +70,7 @@
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 @@
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])) {
+ } elseif(!empty($tmp_parts[1]) || $this->dataRecord["transport"] == ":") {
$dest = $tmp_parts[1];
} else {
$dest = $this->dataRecord["transport"];
@@ -95,7 +98,6 @@
$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) {
--
Gitblit v1.9.1