From 0c05d995aabb86d6acbfa5776d5dbd55335e4c35 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sat, 25 Sep 2010 12:52:24 -0400
Subject: [PATCH] Added missing $conf setting.
---
interface/lib/classes/remoting.inc.php | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 9cd0510..7ded1df 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -1922,7 +1922,14 @@
$app->remoting_lib->loadFormDef($formdef_file);
//* load the user profile of the client
- $app->remoting_lib->loadUserProfile($reseller_id);
+ $app->remoting_lib->loadUserProfile($reseller_id);
+
+ //* load the client template
+ if(isset($params['template_master']) and $params['template_master'] > 0)
+ {
+ $template=$app->db->queryOneRecord("SELECT * FROM client_template WHERE template_id=".intval($params['template_master']));
+ $params=array_merge($params,$template);
+ }
//* Get the SQL query
$sql = $app->remoting_lib->getSQL($params,'INSERT',0);
@@ -2141,7 +2148,7 @@
$new_group[] = intval( $group_id);
}
$group_list = implode(',', $new_group);
- $sql ="SELECT domain, domain_id, document_root FROM web_domain WHERE ( (sys_userid = $sys_userid AND sys_perm_user LIKE '%r%') OR (sys_groupid IN ($group_list) AND sys_perm_group LIKE '%r%') OR sys_perm_other LIKE '%r%') AND type = 'vhost'";
+ $sql ="SELECT domain, domain_id, document_root, active FROM web_domain WHERE ( (sys_userid = $sys_userid AND sys_perm_user LIKE '%r%') OR (sys_groupid IN ($group_list) AND sys_perm_group LIKE '%r%') OR sys_perm_other LIKE '%r%') AND type = 'vhost'";
$result = $app->db->queryAllRecords($sql);
if(isset($result)) {
return $result;
@@ -2365,7 +2372,7 @@
} else {
$status = 'n';
}
- $sql = "UPDATE mail_domain SET active = '$status' WHERE id = ".intval($primary_id);
+ $sql = "UPDATE mail_domain SET active = '$status' WHERE domain_id = ".intval($primary_id);
$app->db->query($sql);
$result = $app->db->affectedRows();
return $result;
--
Gitblit v1.9.1