From 513152e4cc7a8520f8b9e940d151aac007d221c9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Apr 2012 10:05:46 -0400
Subject: [PATCH] Fixed: FS#2154 - Client ID is incorrect in "PHP open_basedir" field of Website -> Options [tab]
---
interface/web/sites/web_domain_edit.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 3f1d0fa..e3d5ed6 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -569,10 +569,14 @@
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = $client_group_id");
$client_id = intval($client["client_id"]);
- } else {
- //$client_id = intval(@$web_rec["client_group_id"]);
+ } elseif (isset($this->dataRecord["client_group_id"])) {
+ $client_group_id = $this->dataRecord["client_group_id"];
$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval(@$this->dataRecord["client_group_id"]));
$client_id = intval($client["client_id"]);
+ } else {
+ $client_group_id = $web_rec['sys_groupid'];
+ $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($client_group_id));
+ $client_id = intval($client["client_id"]);
}
if(($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) && isset($this->dataRecord["client_group_id"]) && $this->dataRecord["client_group_id"] != $this->oldDataRecord["sys_groupid"]) {
--
Gitblit v1.9.1