From efbdeaec0000a15b0f6a994f92143357337d7797 Mon Sep 17 00:00:00 2001
From: moglia <moglia@ispconfig3>
Date: Wed, 14 Jul 2010 11:28:55 +0000
Subject: [PATCH] BugFix: FS#1234 - CLIENTNAME value when in reseller account -
 fixed with suggestion from Ciaran Johnston (cj). I make initial test and this
 worked fine but, need check if this fix impact affect any another part of
 ispconfig.

---
 interface/web/sites/tools.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/interface/web/sites/tools.inc.php b/interface/web/sites/tools.inc.php
index 1e87ef9f90..1f707ab066 100644
--- a/interface/web/sites/tools.inc.php
+++ b/interface/web/sites/tools.inc.php
@@ -55,8 +55,9 @@ function replacePrefix($name, $dataRecord) {
 
 function getClientName($dataRecord) {
     global $app, $conf;
-
-    if($_SESSION["s"]["user"]["typ"] != 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+    /* FS#1234 - CLIENTNAME value when in reseller account - need check this workarround impact */
+    //if($_SESSION["s"]["user"]["typ"] != 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
+    if($_SESSION["s"]["user"]["typ"] != 'admin' && ! $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
     	// Get the group-id of the user
     	$client_group_id = $_SESSION["s"]["user"]["default_group"];
     } else {
-- 
GitLab