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 | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/interface/web/mail/mail_transport_edit.php b/interface/web/mail/mail_transport_edit.php
index 9b6c4e3..c33970e 100644
--- a/interface/web/mail/mail_transport_edit.php
+++ b/interface/web/mail/mail_transport_edit.php
@@ -56,17 +56,11 @@
// we will check only users, not admins
if($_SESSION["s"]["user"]["typ"] == 'user') {
-
- // Get the limits of the client
- $client_group_id = $_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");
-
- // Check if the user may add another transport.
- if($client["limit_mailrouting"] >= 0) {
- $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->error($app->tform->wordbook["limit_mailrouting_txt"]);
- }
+ if(!$app->tform->checkClientLimit('limit_mailrouting')) {
+ $app->error($app->tform->wordbook["limit_mailrouting_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_mailrouting')) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_mailrouting_txt"]);
}
}
@@ -77,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"';
@@ -95,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) {
@@ -110,7 +110,23 @@
parent::onShowEnd();
}
-
+
+ function onBeforeUpdate() {
+ global $app, $conf;
+
+ //* Check if the server has been changed
+ // We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
+ if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+ $rec = $app->db->queryOneRecord("SELECT server_id from mail_transport WHERE transport_id = ".$this->id);
+ if($rec['server_id'] != $this->dataRecord["server_id"]) {
+ //* Add a error message and switch back to old server
+ $app->tform->errorMessage .= $app->lng('The Server can not be changed.');
+ $this->dataRecord["server_id"] = $rec['server_id'];
+ }
+ unset($rec);
+ }
+ }
+
function onSubmit() {
global $app, $conf;
@@ -141,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