From 1aece9b8d53b51f3ce02241d96d7a1b2f38455db Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 28 Feb 2014 10:36:34 -0500
Subject: [PATCH] Fixed problem with new "multiple servers for clients" feature
---
interface/web/client/client_edit.php | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 33408d2..f731cca 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -300,7 +300,7 @@
$tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE db_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
$default_dbserver = $app->functions->intval($tmp['server_id']);
- $sql = "UPDATE client SET default_mailserver = $default_mailserver, default_webserver = $default_webserver, default_dnsserver = $default_dnsserver, default_slave_dnsserver = $default_dnsserver, default_dbserver = $default_dbserver WHERE client_id = ".$this->id;
+ $sql = "UPDATE client SET mail_servers = $default_mailserver, web_servers = $default_webserver, dns_servers = $default_dnsserver, default_slave_dnsserver = $default_dnsserver, db_servers = $default_dbserver WHERE client_id = ".$this->id;
$app->db->query($sql);
if(isset($this->dataRecord['template_master'])) {
@@ -334,6 +334,48 @@
}
}
}
+
+ //* Send welcome email
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $sql = "SELECT * FROM client_message_template WHERE template_type = 'welcome' AND sys_groupid = ".$client_group_id;
+ $email_template = $app->db->queryOneRecord($sql);
+ $client = $app->tform->getDataRecord($this->id);
+
+ if(is_array($email_template) && $client['email'] != '') {
+ //* Parse client details into message
+ $message = $email_template['message'];
+ $subject = $email_template['subject'];
+ foreach($client as $key => $val) {
+ switch ($key) {
+ case 'password':
+ $message = str_replace('{password}', $this->dataRecord['password'], $message);
+ $subject = str_replace('{password}', $this->dataRecord['password'], $subject);
+ break;
+ case 'gender':
+ $message = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $message);
+ $subject = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $subject);
+ break;
+ default:
+ $message = str_replace('{'.$key.'}', $val, $message);
+ $subject = str_replace('{'.$key.'}', $val, $subject);
+ }
+ }
+
+ //* Get sender address
+ if($app->auth->is_admin()) {
+ $app->uses('getconf');
+ $system_config = $app->getconf->get_global_config();
+ $from = $system_config['admin_mail'];
+ } else {
+ $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
+ $reseller = $app->db->queryOneRecord("SELECT client.email FROM sys_group,client WHERE client.client_id = sys_group.client_id and sys_group.groupid = ".$client_group_id);
+ $from = $reseller["email"];
+ }
+
+ //* Send the email
+ $app->functions->mail($client['email'], $subject, $message, $from);
+ }
+
parent::onAfterInsert();
}
--
Gitblit v1.9.1