From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/mail/mail_transport_edit.php | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/interface/web/mail/mail_transport_edit.php b/interface/web/mail/mail_transport_edit.php
index d9ce8e8..9707d2f 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) {
@@ -134,11 +136,11 @@
if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin
// Get the limits of the client
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT limit_mailrouting FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client = $app->db->queryOneRecord("SELECT limit_mailrouting FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
// Check if the user may add another transport.
if($this->id == 0 && $client["limit_mailrouting"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT count(transport_id) as number FROM mail_transport WHERE sys_groupid = $client_group_id");
+ $tmp = $app->db->queryOneRecord("SELECT count(transport_id) as number FROM mail_transport WHERE sys_groupid = ?", $client_group_id);
if($tmp["number"] >= $client["limit_mailrouting"]) {
$app->tform->errorMessage .= $app->tform->wordbook["limit_mailrouting_txt"]."<br>";
}
--
Gitblit v1.9.1