From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/mail/mail_transport_edit.php | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/interface/web/mail/mail_transport_edit.php b/interface/web/mail/mail_transport_edit.php
index 58b06dc..c33970e 100644
--- a/interface/web/mail/mail_transport_edit.php
+++ b/interface/web/mail/mail_transport_edit.php
@@ -71,15 +71,21 @@
global $app, $conf;
$tmp_parts = explode(":",$this->dataRecord["transport"]);
- if(empty($this->id) && empty($tmp_parts[0])) {
- $rec["type"] = 'smtp';
+ if(!empty($this->id) && !stristr($this->dataRecord["transport"],':')) {
+ $rec["type"] = 'custom';
} else {
- $rec["type"] = $tmp_parts[0];
+ if(empty($this->id) && empty($tmp_parts[0])) {
+ $rec["type"] = 'smtp';
+ } else {
+ $rec["type"] = $tmp_parts[0];
+ }
}
- if(@$tmp_parts[2] != '') {
+ if(!empty($tmp_parts[2])) {
$dest = @$tmp_parts[1].':'.@$tmp_parts[2];
- } else {
+ } elseif(!empty($tmp_parts[1])) {
$dest = $tmp_parts[1];
+ } else {
+ $dest = $this->dataRecord["transport"];
}
if(@substr($dest,0,1) == '[') {
$rec["mx"] = 'checked="CHECKED"';
@@ -89,7 +95,7 @@
$rec["destination"] = @$dest;
}
- $types = array('smtp' => 'smtp','uucp' => 'uucp','slow' => 'slow', 'error' => 'error', '' => 'null');
+ $types = array('smtp' => 'smtp','uucp' => 'uucp','slow' => 'slow', 'error' => 'error', 'custom' => 'custom','' => 'null');
$type_select = '';
if(is_array($types)) {
foreach( $types as $key => $val) {
@@ -151,7 +157,13 @@
} else {
$transport = $this->dataRecord["destination"];
}
- $this->dataRecord["transport"] = $this->dataRecord["type"].':'.$transport;
+
+ if($this->dataRecord["type"] == 'custom') {
+ $this->dataRecord["transport"] = $transport;
+ } else {
+ $this->dataRecord["transport"] = $this->dataRecord["type"].':'.$transport;
+ }
+
unset($this->dataRecord["type"]);
unset($this->dataRecord["mx"]);
unset($this->dataRecord["destination"]);
--
Gitblit v1.9.1